midfavila
/
sbase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix comparison >= 0 is always true in basename(1)

This commit is contained in:
sin 2014-12-08 12:14:13 +00:00
parent e14e0becce
commit 1059782af8
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
basename.c
View File

@ -17,8 +17,8 @@ usage(void)
int
main(int argc, char *argv[])
{
char *s, *p;
size_t d;
char *p;
size_t off;
ARGBEGIN {
default:
@ -28,15 +28,14 @@ main(int argc, char *argv[])
if (argc < 1)
usage();
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';
p = strlen(argv[0]) ? basename(argv[0]) : ".";
if (argc == 2 && *p != '/') {
if (strlen(argv[1]) < strlen(p)) {
off = strlen(p) - strlen(argv[1]);
if (strcmp(&p[off], argv[1]) == 0)
p[off] = '\0';
}
}
puts(s);
puts(p);
return 0;
}