fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add some error checking to util/recurse.c

Browse Source 
Some more stylistic changes and simplification.
This commit is contained in:
sin 2014-06-30 15:58:00 +01:00
parent df1b25a187
commit 75382abbf3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/recurse.c
View File

@ -13,26 +13,26 @@
void void
recurse(const char *path, void (*fn)(const char *)) recurse(const char *path, void (*fn)(const char *))
{ {
char buf[PATH_MAX], *p; char buf[PATH_MAX];
struct dirent *d; struct dirent *d;
struct stat st; struct stat st;
DIR *dp; DIR *dp;
if(lstat(path, &st) == -1 || !S_ISDIR(st.st_mode)) { if (lstat(path, &st) == -1 || S_ISDIR(st.st_mode) == 0)
return; return;
} else if(!(dp = opendir(path))) {
eprintf("opendir %s:", path);
}
while((d = readdir(dp))) { if (!(dp = opendir(path)))
eprintf("opendir %s:", path);
while ((d = readdir(dp))) {
if (strcmp(d->d_name, ".") == 0 || if (strcmp(d->d_name, ".") == 0 ||
strcmp(d->d_name, "..") == 0) strcmp(d->d_name, "..") == 0)
continue; continue;
strlcpy(buf, path, sizeof(buf)); if (strlcpy(buf, path, sizeof(buf)) >= sizeof(buf))
p = strrchr(buf, '\0'); eprintf("path too long\n");
/* remove all trailing slashes */ if (buf[strlen(buf) - 1] != '/')
while (--p >= buf && *p == '/') *p ='\0'; if (strlcat(buf, "/", sizeof(buf)) >= sizeof(buf))
strlcat(buf, "/", sizeof(buf)); eprintf("path too long\n");
if (strlcat(buf, d->d_name, sizeof(buf)) >= sizeof(buf)) if (strlcat(buf, d->d_name, sizeof(buf)) >= sizeof(buf))
eprintf("path too long\n"); eprintf("path too long\n");
fn(buf); fn(buf);