diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-01-12 07:57:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-12 18:40:27 (GMT) |
| commit | 61725be349b44f15b0239182c859553d5c547ba0 (patch) | |
| tree | f85a67129159f2f0288ab7d6c21594ee6a9a91be | |
| parent | 2f36eed936f70105e80681aafac645ff34acc667 (diff) | |
| download | git-61725be349b44f15b0239182c859553d5c547ba0.zip git-61725be349b44f15b0239182c859553d5c547ba0.tar.gz git-61725be349b44f15b0239182c859553d5c547ba0.tar.bz2 | |
compat/basename: make basename() conform to POSIX
According to POSIX, basename("/path/") should return "path", not
"path/". Likewise, basename(NULL) and basename("") should both
return "." to conform.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/basename.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/compat/basename.c b/compat/basename.c index 9f00421..0f1b0b0 100644 --- a/compat/basename.c +++ b/compat/basename.c @@ -4,10 +4,24 @@ char *gitbasename (char *path) { const char *base; - skip_dos_drive_prefix(&path); + + if (path) + skip_dos_drive_prefix(&path); + + if (!path || !*path) + return "."; + for (base = path; *path; path++) { - if (is_dir_sep(*path)) - base = path + 1; + if (!is_dir_sep(*path)) + continue; + do { + path++; + } while (is_dir_sep(*path)); + if (*path) + base = path; + else + while (--path != base && is_dir_sep(*path)) + *path = '\0'; } return (char *)base; } |