1
0
Эх сурвалжийг харах

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

also optimized a bit.
Rich Felker 12 жил өмнө
parent
commit
507faa63cb
1 өөрчлөгдсөн 5 нэмэгдсэн , 6 устгасан
  1. 5 6
      src/misc/dirname.c

+ 5 - 6
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;
 }