From cf8af6baf9710a33cfacb885c0fed7229c0d69ba Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 16 Aug 2015 11:35:39 -0700 Subject: [PATCH] use find_last --- main.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/main.cc b/main.cc index 26e4784..f890823 100644 --- a/main.cc +++ b/main.cc @@ -218,11 +218,13 @@ static void ob_rule_cmd(cscript::CsState &, const char *tgt, const char *dep, int main(int argc, char **argv) { ObState os; - const char *lslash = strrchr(argv[0], '/'); - if (lslash) - os.progname = lslash + 1; - else - os.progname = argv[0]; + ostd::ConstCharRange pn = argv[0]; + ostd::ConstCharRange lslash = ostd::find_last(pn, '/'); + if (!lslash.empty()) { + lslash.pop_front(); + os.progname = lslash; + } else + os.progname = pn; cscript::init_lib_base(os.cs); cscript::init_lib_io(os.cs);