summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/misc/dirname.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/misc/dirname.c b/src/misc/dirname.c
index 8f70dbb1..dd570883 100644
--- a/src/misc/dirname.c
+++ b/src/misc/dirname.c
@@ -4,12 +4,11 @@
char *dirname(char *s)
{
size_t i;
- if (!s || !*s || !strchr(s, '/')) return ".";
+ if (!s || !*s) return ".";
i = strlen(s)-1;
- for (; i&&s[i]=='/'; i--);
- for (; i&&s[i-1]!='/'; i--);
- for (; i&&s[i-1]=='/'; i--);
- if (!i && *s=='/') i++;
- s[i] = 0;
+ for (; s[i]=='/'; i--) if (!i) return "/";
+ for (; s[i]!='/'; i--) if (!i) return ".";
+ for (; s[i]=='/'; i--) if (!i) return "/";
+ s[i+1] = 0;
return s;
}