OSDN Git Service

Didn't check in all my local basename_r->getbasename changes. (Oops.)
authorRob Landley <rob@landley.net>
Sun, 10 Apr 2016 19:35:51 +0000 (14:35 -0500)
committerRob Landley <rob@landley.net>
Sun, 10 Apr 2016 19:35:51 +0000 (14:35 -0500)
lib/lib.c
main.c

index 0380c13..0df45bf 100644 (file)
--- 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 cf82872..9c70c96 100644 (file)
--- 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()