ctfw.c: Avoid trailing forward slash
Otherwise, this would generate strings such as "directory//resource" if dirpath contained a trailing slash, which could be problematic for users relying on ctfw.
This commit is contained in:
parent
6adf1c44ad
commit
6e9ce3a25b
3
cftw.c
3
cftw.c
|
@ -29,12 +29,13 @@ int cftw(const char *const dirpath, int (*const fn)(const char *,
|
|||
if (!strcmp(path, ".") || !strcmp(path, ".."))
|
||||
continue;
|
||||
|
||||
const char *const sep = dirpath[strlen(dirpath) - 1] == '/' ? "" : "/";
|
||||
struct stat sb;
|
||||
struct dynstr d;
|
||||
|
||||
dynstr_init(&d);
|
||||
|
||||
if (dynstr_append(&d, "%s/%s", dirpath, path))
|
||||
if (dynstr_append(&d, "%s%s%s", dirpath, sep, path))
|
||||
{
|
||||
fprintf(stderr, "%s: dynstr_append failed\n", __func__);
|
||||
return -1;
|
||||
|
|
Loading…
Reference in New Issue