diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-09-26 00:56:07 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-09-26 00:56:07 -0400 |
| commit | 507faa63cb12571c14d66eb37dedbe6adbbf40a8 (patch) | |
| tree | e01596e47979931728740b1b2f493d8533577aa1 /src/misc/dirname.c | |
| parent | 82dc1e2e783815e00a90cd3f681436a80d54a314 (diff) | |
| download | musl-507faa63cb12571c14d66eb37dedbe6adbbf40a8.tar.gz musl-507faa63cb12571c14d66eb37dedbe6adbbf40a8.tar.xz musl-507faa63cb12571c14d66eb37dedbe6adbbf40a8.zip | |
fix dirname to handle input of form "foo/" correctly
also optimized a bit.
Diffstat (limited to 'src/misc/dirname.c')
| -rw-r--r-- | src/misc/dirname.c | 11 |
1 files changed, 5 insertions, 6 deletions
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; } |