[PATCH v4 2/4] compat/basename: make basename() conform to POSIX
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 12, 2016, 07:57 UTC
- Message-ID
- <a7375faaba405354b30bc19c6edbdb1ef7c68ab1.1452585382.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1452585382.git.johannes.schindelin@gmx.de>
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> --- compat/basename.c | 20 +++++++++++++++++--- 1 file 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; }
-- 2.6.3.windows.1.300.g1c25e49