sbase

suckless unix tools
git clone git://git.2f30.org/sbase.git
Log | Files | Refs | README | LICENSE

commit 757cf0651aed57015b508861aeeaf72f93b3950e
parent f141da6190abb23de31b433ca82d2e290c4f69d8
Author: Brandon Mulcahy <brandon@jangler.info>
Date:   Wed Dec  3 18:37:34 -0500

Fix basename suffix treatment

Explicitly use "." instead of the result of basename(3) when argv[0] is
an empty string in order to avoid a segfault.

Skip suffix treatment if the result of basename(3) is "/", per POSIX.

Fix the suffix check, which was previously checking for a match at any
location in the string.

Diffstat:
basename.c | 14+++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/basename.c b/basename.c @@ -18,6 +18,7 @@ int main(int argc, char *argv[]) { char *s, *p; + size_t d; ARGBEGIN { default: @@ -27,11 +28,14 @@ main(int argc, char *argv[]) if (argc < 1) usage(); - s = basename(argv[0]); - if (argc == 2) { - p = strstr(s, argv[1]); - if (p && p[strlen(p)] == '\0') - *p = '\0'; + s = strlen(argv[0]) ? basename(argv[0]) : "."; + if (argc == 2 && *s != '/') { + d = strlen(s) - strlen(argv[1]); + if (d >= 0) { + p = s + d; + if (strcmp(p, argv[1]) == 0) + *p = '\0'; + } } puts(s); return 0;