OSDN Git Service
(root)
/
android-x86
/
external-toybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5acc6f4
)
Didn't check in all my local basename_r->getbasename changes. (Oops.)
author
Rob Landley
<rob@landley.net>
Sun, 10 Apr 2016 19:35:51 +0000
(14:35 -0500)
committer
Rob Landley
<rob@landley.net>
Sun, 10 Apr 2016 19:35:51 +0000
(14:35 -0500)
lib/lib.c
patch
|
blob
|
history
main.c
patch
|
blob
|
history
diff --git
a/lib/lib.c
b/lib/lib.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()