Fix from Matt Kraai so basename / will work as expected.

diff --git a/utility.c b/utility.c
index 879677726e1c6ef6e2d029ee574d384a52056a42..0e170d1c182e69321b05114ac4ab583776ff4455 100644 (file)
--- a/utility.c
+++ b/utility.c
@@ -1731,14 +1731,16 @@ char *get_last_path_component(char *path)
        char *s=path+strlen(path)-1;
 
        /* strip trailing slashes */
-       while (s && *s == '/') {
+       while (s != path && *s == '/') {
                *s-- = '\0';
        }
 
        /* find last component */
        s = strrchr(path, '/');
-       if (s==NULL) return path;
-       else return s+1;
+       if (s == NULL || s[1] == '\0')
+               return path;
+       else
+               return s+1;
 }
 #endif