nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix basename(3) and dirname(3) returning incorrect strings.

This commit is contained in:
Jonas 'Sortie' Termansen 2014-03-08 22:21:04 +01:00
parent 2e855f4095
commit 00a3579940
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/libgen/basename.cpp
View File

@ -36,7 +36,7 @@ extern "C" char* basename(char* path)
path[--path_len] = '\0';
if ( strcmp(path, "/") == 0 )
return path;
char* last_slash = strchr(path, '/');
char* last_slash = strrchr(path, '/');
if ( !last_slash )
return path;
return last_slash + 1;

12
libc/libgen/dirname.cpp
View File

@ -36,9 +36,13 @@ extern "C" char* dirname(char* path)
path[--path_len] = '\0';
if ( strcmp(path, "/") == 0 )
return path;
char* last_slash = strchr(path, '/');
if ( !last_slash )
return dirname(NULL);
*last_slash = '\0';
if ( !strchr(path, '/') )
return (char*) current_directory;
while ( 1 <= path_len && path[path_len-1] != '/' )
path[--path_len] = '\0';
while ( 1 <= path_len && path[path_len-1] == '/' )
path[--path_len] = '\0';
if ( !path[0] )
strcpy(path, "/");
return path;
}