diff options
| author | Rob Landley <rob@landley.net> | 2016-04-08 18:25:59 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2016-04-08 18:25:59 -0500 |
| commit | 1c028ca33dc059a9d8f18daafcd77b5950268f41 (patch) | |
| tree | f1a6ac81fdecd28b72a864d20c5e65f18b302ee3 /toys | |
| parent | 9b93dd397b4a00063073fdbd59b181a508470e70 (diff) | |
| download | toybox-1c028ca33dc059a9d8f18daafcd77b5950268f41.tar.gz | |
Redefining basename_r to mean something random seems popular (bionic and freebsd
both did it) so use getbasename instead.
Diffstat (limited to 'toys')
| -rw-r--r-- | toys/pending/modprobe.c | 2 | ||||
| -rw-r--r-- | toys/pending/netstat.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toys/pending/modprobe.c b/toys/pending/modprobe.c index 6813dec3..7a35c186 100644 --- a/toys/pending/modprobe.c +++ b/toys/pending/modprobe.c @@ -70,7 +70,7 @@ static char *path2mod(char *file, char *mod) if (!file) return NULL; if (!mod) mod = xmalloc(MODNAME_LEN); - from = basename_r(file); + from = getbasename(file); for (i = 0; i < (MODNAME_LEN-1) && from[i] && from[i] != '.'; i++) mod[i] = (from[i] == '-') ? '_' : from[i]; diff --git a/toys/pending/netstat.c b/toys/pending/netstat.c index d6acd7a3..02ab4fc2 100644 --- a/toys/pending/netstat.c +++ b/toys/pending/netstat.c @@ -440,7 +440,7 @@ static void scan_pid(int pid) if ((p = strchr(line, ' '))) *p = 0; // "/bin/netstat -ntp" -> "/bin/netstat" snprintf(TT.current_name, sizeof(TT.current_name), "%d/%s", - pid, basename_r(line)); // "584/netstat" + pid, getbasename(line)); // "584/netstat" free(line); fd_dir = xmprintf("/proc/%d/fd", pid); |