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

also optimized a bit.

fix dirname to handle input of form "foo/" correctly
also optimized a bit.
507faa63 · Rich Felker · 82dc1e2e · 507faa63
隐藏空白更改
内联并排

Showing with 5 addition and 6 deletion

src/misc/dirname.c src/misc/dirname.c +5 -6

未找到文件。
--- 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 (; s[i]=='/'; i--) if (!i) return "/";
-	for (; i&&s[i-1]!='/'; i--);
+	for (; s[i]!='/'; i--) if (!i) return ".";
-	for (; i&&s[i-1]=='/'; i--);
+	for (; s[i]=='/'; i--) if (!i) return "/";
-	if (!i && *s=='/') i++;
+	s[i+1] = 0;
-	s[i] = 0;
 	return s;
 }