X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fmisc%2Fdirname.c;h=dd570883d8ac672716adaab40dce4bf34be1ddf7;hp=8f70dbb1feb1773fd5ed6325c374b749d2ab5e58;hb=507faa63cb12571c14d66eb37dedbe6adbbf40a8;hpb=82dc1e2e783815e00a90cd3f681436a80d54a314;ds=sidebyside

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;
 }