jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
also optimized a bit.
This commit is contained in:
Rich Felker 2012-09-26 00:56:07 -04:00
commit 507faa63cb
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/misc/dirname.c
View file

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