diff options
author | Rob Landley <rob@landley.net> | 2019-03-27 13:34:59 -0500 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2019-03-27 13:34:59 -0500 |
commit | 4eb39e1e3c9454635a8512b51931efe4ba2c14ed (patch) | |
tree | cc3693feb3b3a82ae2b29a98cf65925477192e1d /lib/lib.c | |
parent | bcb06e3244808e2ced0de2a39a348a7ddb7c54f2 (diff) | |
download | toybox-4eb39e1e3c9454635a8512b51931efe4ba2c14ed.tar.gz |
Change fileunderdir() to return abspath to file.
Diffstat (limited to 'lib/lib.c')
-rw-r--r-- | lib/lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1059,16 +1059,16 @@ char *getbasename(char *name) return name; } -// Is this file under this directory? -int fileunderdir(char *file, char *dir) +// Return pointer to xabspath(file) if file is under dir, else 0 +char *fileunderdir(char *file, char *dir) { char *s1 = xabspath(dir, 1), *s2 = xabspath(file, -1), *ss = s2; int rc = s1 && s2 && strstart(&ss, s1) && (!s1[1] || s2[strlen(s1)] == '/'); free(s1); - free(s2); + if (!rc) free(s2); - return rc; + return rc ? s2 : 0; } // Execute a callback for each PID that matches a process name from a list. |