mirror of
https://github.com/sheumann/hush.git
synced 2024-08-16 09:29:16 +00:00
Applied patch from Vladimir to fix bug where find would stop as soon as it hit
a perms error. Closes bug 1124.
This commit is contained in:
parent
5de909873a
commit
e2c44fc966
27
utility.c
27
utility.c
@ -703,14 +703,15 @@ int recursive_action(const char *fileName,
|
||||
perror_msg("%s", fileName);
|
||||
return FALSE;
|
||||
}
|
||||
status = TRUE;
|
||||
while ((next = readdir(dir)) != NULL) {
|
||||
char nextFile[BUFSIZ + 1];
|
||||
char nextFile[PATH_MAX];
|
||||
|
||||
if ((strcmp(next->d_name, "..") == 0)
|
||||
|| (strcmp(next->d_name, ".") == 0)) {
|
||||
continue;
|
||||
}
|
||||
if (strlen(fileName) + strlen(next->d_name) + 1 > BUFSIZ) {
|
||||
if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) {
|
||||
error_msg(name_too_long);
|
||||
return FALSE;
|
||||
}
|
||||
@ -719,26 +720,20 @@ int recursive_action(const char *fileName,
|
||||
sprintf(nextFile, "%s%s", fileName, next->d_name);
|
||||
else
|
||||
sprintf(nextFile, "%s/%s", fileName, next->d_name);
|
||||
status =
|
||||
recursive_action(nextFile, TRUE, followLinks, depthFirst,
|
||||
fileAction, dirAction, userData);
|
||||
if (status == FALSE) {
|
||||
if (recursive_action(nextFile, TRUE, followLinks, depthFirst,
|
||||
fileAction, dirAction, userData) == FALSE) {
|
||||
status = FALSE;
|
||||
}
|
||||
}
|
||||
closedir(dir);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
status = closedir(dir);
|
||||
if (status < 0) {
|
||||
perror_msg("%s", fileName);
|
||||
return FALSE;
|
||||
}
|
||||
if (dirAction != NULL && depthFirst == TRUE) {
|
||||
status = dirAction(fileName, &statbuf, userData);
|
||||
if (status == FALSE) {
|
||||
if (dirAction(fileName, &statbuf, userData) == FALSE) {
|
||||
perror_msg("%s", fileName);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
if (status == FALSE)
|
||||
return FALSE;
|
||||
} else {
|
||||
if (fileAction == NULL)
|
||||
return TRUE;
|
||||
|
Loading…
Reference in New Issue
Block a user