X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=libbb%2Frecursive_action.c;h=b5cf7c0ab4c365b543be36b84730dcf6fff58662;hb=5f7c82b32f548b5a1d6a4186630e8ef496a9d5e6;hp=ddaf9b896579fcaa5db9875f4789a4014eacae24;hpb=8c35d65c43216bb840326ac7476a180e2ae36fe9;p=oweals%2Fbusybox.git diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index ddaf9b896..b5cf7c0ab 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c @@ -4,7 +4,7 @@ * * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ #include "libbb.h" @@ -22,25 +22,46 @@ * is so stinking huge. */ -static int true_action(const char *fileName, struct stat *statbuf, void* userData, int depth) +static int FAST_FUNC true_action(const char *fileName UNUSED_PARAM, + struct stat *statbuf UNUSED_PARAM, + void* userData UNUSED_PARAM, + int depth UNUSED_PARAM) { return TRUE; } -/* - * followLinks=0/1 differs mainly in handling of links to dirs. +/* fileAction return value of 0 on any file in directory will make + * recursive_action() return 0, but it doesn't stop directory traversal + * (fileAction/dirAction will be called on each file). + * + * If !ACTION_RECURSE, dirAction is called on the directory and its + * return value is returned from recursive_action(). No recursion. + * + * If ACTION_RECURSE, recursive_action() is called on each directory. + * If any one of these calls returns 0, current recursive_action() returns 0. + * + * If ACTION_DEPTHFIRST, dirAction is called after recurse. + * If it returns 0, the warning is printed and recursive_action() returns 0. + * + * If !ACTION_DEPTHFIRST, dirAction is called before we recurse. + * Return value of 0 (FALSE) or 2 (SKIP) prevents recursion + * into that directory, instead recursive_action() returns 0 (if FALSE) + * or 1 (if SKIP) + * + * ACTION_FOLLOWLINKS mainly controls handling of links to dirs. * 0: lstat(statbuf). Calls fileAction on link name even if points to dir. * 1: stat(statbuf). Calls dirAction and optionally recurse on link to dir. */ -int recursive_action(const char *fileName, - int recurse, int followLinks, int depthFirst, - int (*fileAction)(const char *fileName, struct stat *statbuf, void* userData, int depth), - int (*dirAction)(const char *fileName, struct stat *statbuf, void* userData, int depth), +int FAST_FUNC recursive_action(const char *fileName, + unsigned flags, + int FAST_FUNC (*fileAction)(const char *fileName, struct stat *statbuf, void* userData, int depth), + int FAST_FUNC (*dirAction)(const char *fileName, struct stat *statbuf, void* userData, int depth), void* userData, - int depth) + unsigned depth) { struct stat statbuf; + unsigned follow; int status; DIR *dir; struct dirent *next; @@ -48,21 +69,29 @@ int recursive_action(const char *fileName, if (!fileAction) fileAction = true_action; if (!dirAction) dirAction = true_action; - status = (followLinks ? stat : lstat)(fileName, &statbuf); - + follow = ACTION_FOLLOWLINKS; + if (depth == 0) + follow = ACTION_FOLLOWLINKS | ACTION_FOLLOWLINKS_L0; + follow &= flags; + status = (follow ? stat : lstat)(fileName, &statbuf); if (status < 0) { #ifdef DEBUG_RECURS_ACTION - bb_error_msg("status=%d followLinks=%d TRUE=%d", - status, followLinks, TRUE); + bb_error_msg("status=%d flags=%x", status, flags); #endif - bb_perror_msg("%s", fileName); - return FALSE; + if ((flags & ACTION_DANGLING_OK) + && errno == ENOENT + && lstat(fileName, &statbuf) == 0 + ) { + /* Dangling link */ + return fileAction(fileName, &statbuf, userData, depth); + } + goto done_nak_warn; } /* If S_ISLNK(m), then we know that !S_ISDIR(m). * Then we can skip checking first part: if it is true, then * (!dir) is also true! */ - if ( /* (!followLinks && S_ISLNK(statbuf.st_mode)) || */ + if ( /* (!(flags & ACTION_FOLLOWLINKS) && S_ISLNK(statbuf.st_mode)) || */ !S_ISDIR(statbuf.st_mode) ) { return fileAction(fileName, &statbuf, userData, depth); @@ -70,23 +99,24 @@ int recursive_action(const char *fileName, /* It's a directory (or a link to one, and followLinks is set) */ - if (!recurse) { + if (!(flags & ACTION_RECURSE)) { return dirAction(fileName, &statbuf, userData, depth); } - if (!depthFirst) { + if (!(flags & ACTION_DEPTHFIRST)) { status = dirAction(fileName, &statbuf, userData, depth); - if (!status) { - bb_perror_msg("%s", fileName); - return FALSE; - } + if (!status) + goto done_nak_warn; if (status == SKIP) return TRUE; } dir = opendir(fileName); if (!dir) { - return FALSE; + /* findutils-4.1.20 reports this */ + /* (i.e. it doesn't silently return with exit code 1) */ + /* To trigger: "find -exec rm -rf {} \;" */ + goto done_nak_warn; } status = TRUE; while ((next = readdir(dir)) != NULL) { @@ -95,21 +125,32 @@ int recursive_action(const char *fileName, nextFile = concat_subpath_file(fileName, next->d_name); if (nextFile == NULL) continue; - if (!recursive_action(nextFile, TRUE, followLinks, depthFirst, - fileAction, dirAction, userData, depth+1)) { + /* process every file (NB: ACTION_RECURSE is set in flags) */ + if (!recursive_action(nextFile, flags, fileAction, dirAction, + userData, depth + 1)) status = FALSE; - } +// s = recursive_action(nextFile, flags, fileAction, dirAction, +// userData, depth + 1); free(nextFile); +//#define RECURSE_RESULT_ABORT 3 +// if (s == RECURSE_RESULT_ABORT) { +// closedir(dir); +// return s; +// } +// if (s == FALSE) +// status = FALSE; } closedir(dir); - if (depthFirst) { - if (!dirAction(fileName, &statbuf, userData, depth)) { - bb_perror_msg("%s", fileName); - return FALSE; - } + + if (flags & ACTION_DEPTHFIRST) { + if (!dirAction(fileName, &statbuf, userData, depth)) + goto done_nak_warn; } - if (!status) - return FALSE; - return TRUE; + return status; + + done_nak_warn: + if (!(flags & ACTION_QUIET)) + bb_simple_perror_msg(fileName); + return FALSE; }