From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 26 Sep 2012 04:56:07 +0000 (-0400)
Subject: fix dirname to handle input of form "foo/" correctly
X-Git-Tag: v0.9.7~85
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=507faa63cb12571c14d66eb37dedbe6adbbf40a8;p=oweals%2Fmusl.git

fix dirname to handle input of form "foo/" correctly

also optimized a bit.
---

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