aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2016-04-10 14:35:51 -0500
committerRob Landley <rob@landley.net>2016-04-10 14:35:51 -0500
commitcb49c305e3c78179b19d6f174ae73309544292b8 (patch)
tree2db86bbd2a9008e823410d705f6f162ee2aa4265
parent5acc6f402a940752822f70d7430f595541417e9f (diff)
downloadtoybox-cb49c305e3c78179b19d6f174ae73309544292b8.tar.gz
Didn't check in all my local basename_r->getbasename changes. (Oops.)
-rw-r--r--lib/lib.c2
-rw-r--r--main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/lib.c b/lib/lib.c
index 0380c13b..0df45bf9 100644
--- a/lib/lib.c
+++ b/lib/lib.c
@@ -948,7 +948,7 @@ void names_to_pid(char **names, int (*callback)(pid_t pid, char *name))
for (curname = names; *curname; curname++)
if (**curname == '/' ? !strcmp(cmd, *curname)
- : !strcmp(basename_r(cmd), basename_r(*curname)))
+ : !strcmp(getbasename(cmd), getbasename(*curname)))
if (callback(u, *curname)) break;
if (*curname) break;
}
diff --git a/main.c b/main.c
index cf82872d..9c70c961 100644
--- a/main.c
+++ b/main.c
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
toys.stacktop = &stack;
}
- *argv = basename_r(*argv);
+ *argv = getbasename(*argv);
// If nommu can't fork, special reentry path.
// Use !stacktop to signal "vfork happened", both before and after xexec()