fix incorrect base name offset from nftw when pathname ends in slash(es)

the rightmost '/' character is not necessarily the delimiter before
the basename; it could be a spurious trailing character on the
directory name.

this change does not introduce any normalization of pathnames or
stripping of trailing slashes, contrary to at least glibc and perhaps
other implementations; it jusst prevents their presence from breaking
things. whether further changes should be made is an open question
that may depend on conformance and/or application compatibility
considerations.

based loosely on patch by Joakim Sindholt.
This commit is contained in:
Rich Felker
2017-10-13 23:08:21 -04:00
parent c1e27367a9
commit 5b5eb527c5
+9 -3
View File
@@ -28,7 +28,6 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
int type;
int r;
struct FTW lev;
char *name;
if ((flags & FTW_PHYS) ? lstat(path, &st) : stat(path, &st) < 0) {
if (!(flags & FTW_PHYS) && errno==ENOENT && !lstat(path, &st))
@@ -53,10 +52,17 @@ static int do_nftw(char *path, int (*fn)(const char *, const struct stat *, int,
new.dev = st.st_dev;
new.ino = st.st_ino;
new.level = h ? h->level+1 : 0;
new.base = l+1;
new.base = j+1;
lev.level = new.level;
lev.base = h ? h->base : (name=strrchr(path, '/')) ? name-path : 0;
if (h) {
lev.base = h->base;
} else {
size_t k;
for (k=j; k && path[k]=='/'; k--);
for (; k && path[k-1]!='/'; k--);
lev.base = k;
}
if (!(flags & FTW_DEPTH) && (r=fn(path, &st, type, &lev)))
return r;