From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- .../src/router/busybox/libbb/recursive_action.c | 225 ++++++++++----------- 1 file changed, 111 insertions(+), 114 deletions(-) (limited to 'release/src/router/busybox/libbb/recursive_action.c') diff --git a/release/src/router/busybox/libbb/recursive_action.c b/release/src/router/busybox/libbb/recursive_action.c index 6672db17..3ec596a3 100644 --- a/release/src/router/busybox/libbb/recursive_action.c +++ b/release/src/router/busybox/libbb/recursive_action.c @@ -2,149 +2,146 @@ /* * Utility routines. * - * Copyright (C) tons of folks. Tracking down who wrote what - * isn't something I'm going to worry about... If you wrote something - * here, please feel free to acknowledge your work. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Based in part on code from sash, Copyright (c) 1999 by David I. Bell - * Permission has been granted to redistribute this code under the GPL. + * Copyright (C) 1999-2004 by Erik Andersen * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include -#include -#include -#include /* free() */ #include "libbb.h" #undef DEBUG_RECURS_ACTION - /* - * Walk down all the directories under the specified + * Walk down all the directories under the specified * location, and do something (something specified * by the fileAction and dirAction function pointers). * - * Unfortunately, while nftw(3) could replace this and reduce - * code size a bit, nftw() wasn't supported before GNU libc 2.1, + * Unfortunately, while nftw(3) could replace this and reduce + * code size a bit, nftw() wasn't supported before GNU libc 2.1, * and so isn't sufficiently portable to take over since glibc2.1 * is so stinking huge. */ -int recursive_action(const char *fileName, - int recurse, int followLinks, int depthFirst, - int (*fileAction) (const char *fileName, - struct stat * statbuf, - void* userData), - int (*dirAction) (const char *fileName, - struct stat * statbuf, - void* userData), - void* userData) + +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; +} + +/* 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) + * + * followLinks=0/1 differs mainly in 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 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, + unsigned depth) { - int status; struct stat statbuf; + int status; + DIR *dir; struct dirent *next; - if (followLinks == TRUE) - status = stat(fileName, &statbuf); - else - status = lstat(fileName, &statbuf); + if (!fileAction) fileAction = true_action; + if (!dirAction) dirAction = true_action; + status = ACTION_FOLLOWLINKS; /* hijack a variable for bitmask... */ + if (!depth) + status = ACTION_FOLLOWLINKS | ACTION_FOLLOWLINKS_L0; + status = ((flags & status) ? stat : lstat)(fileName, &statbuf); if (status < 0) { #ifdef DEBUG_RECURS_ACTION - fprintf(stderr, - "status=%d followLinks=%d TRUE=%d\n", - status, followLinks, TRUE); + bb_error_msg("status=%d flags=%x", status, flags); #endif - perror_msg("%s", fileName); - return FALSE; + goto done_nak_warn; } - if ((followLinks == FALSE) && (S_ISLNK(statbuf.st_mode))) { - if (fileAction == NULL) - return TRUE; - else - return fileAction(fileName, &statbuf, userData); + /* 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 ( /* (!(flags & ACTION_FOLLOWLINKS) && S_ISLNK(statbuf.st_mode)) || */ + !S_ISDIR(statbuf.st_mode) + ) { + return fileAction(fileName, &statbuf, userData, depth); } - if (recurse == FALSE) { - if (S_ISDIR(statbuf.st_mode)) { - if (dirAction != NULL) - return (dirAction(fileName, &statbuf, userData)); - else - return TRUE; - } + /* It's a directory (or a link to one, and followLinks is set) */ + + if (!(flags & ACTION_RECURSE)) { + return dirAction(fileName, &statbuf, userData, depth); } - if (S_ISDIR(statbuf.st_mode)) { - DIR *dir; - - if (dirAction != NULL && depthFirst == FALSE) { - status = dirAction(fileName, &statbuf, userData); - if (status == FALSE) { - perror_msg("%s", fileName); - return FALSE; - } else if (status == SKIP) - return TRUE; - } - dir = opendir(fileName); - if (!dir) { - perror_msg("%s", fileName); - return FALSE; - } - status = TRUE; - while ((next = readdir(dir)) != NULL) { - char *nextFile; - - if ((strcmp(next->d_name, "..") == 0) - || (strcmp(next->d_name, ".") == 0)) { - continue; - } - nextFile = concat_path_file(fileName, next->d_name); - if (recursive_action(nextFile, TRUE, followLinks, depthFirst, - fileAction, dirAction, userData) == FALSE) { - status = FALSE; - } - free(nextFile); - } - closedir(dir); - if (dirAction != NULL && depthFirst == TRUE) { - if (dirAction(fileName, &statbuf, userData) == FALSE) { - perror_msg("%s", fileName); - return FALSE; - } - } - if (status == FALSE) - return FALSE; - } else { - if (fileAction == NULL) + if (!(flags & ACTION_DEPTHFIRST)) { + status = dirAction(fileName, &statbuf, userData, depth); + if (!status) + goto done_nak_warn; + if (status == SKIP) return TRUE; - else - return fileAction(fileName, &statbuf, userData); } - return TRUE; -} + dir = opendir(fileName); + if (!dir) { + /* 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) { + char *nextFile; -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ + nextFile = concat_subpath_file(fileName, next->d_name); + if (nextFile == NULL) + continue; + /* 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 (flags & ACTION_DEPTHFIRST) { + if (!dirAction(fileName, &statbuf, userData, depth)) + goto done_nak_warn; + } + + return status; + + done_nak_warn: + if (!(flags & ACTION_QUIET)) + bb_simple_perror_msg(fileName); + return FALSE; +} -- cgit v1.2.3-54-g00ecf