From d166f83d74240e49bcc56ece0b709d773c2e8f62 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 5 Jul 2007 00:12:55 +0000 Subject: md5_sha1_sum: fix mishandling when run as /bin/md5sum (with path) chown/chgrp: completely match coreutils 6.8 wrt symlink handling function old new delta recursive_action 411 422 +11 arith 2033 2042 +9 collect_blk 467 474 +7 dhcprelay_main 1122 1125 +3 fsck_main 1909 1911 +2 singlemount 4555 4547 -8 xmalloc_realpath 14 - -14 get_lcm 123 105 -18 ed_main 3111 3084 -27 chown_main 217 183 -34 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 5/4 up/down: 32/-101) Total: -69 bytes text data bss dec hex filename 684132 2744 14000 700876 ab1cc busybox_old 684060 2744 14000 700804 ab184 busybox_unstripped --- libbb/recursive_action.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'libbb/recursive_action.c') diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index be2a700f5..cb3b88d1d 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c @@ -46,7 +46,7 @@ int recursive_action(const char *fileName, int (*fileAction)(const char *fileName, struct stat *statbuf, void* userData, int depth), int (*dirAction)(const char *fileName, struct stat *statbuf, void* userData, int depth), void* userData, - const unsigned depth) + unsigned depth) { struct stat statbuf; int status; @@ -55,12 +55,13 @@ int recursive_action(const char *fileName, if (!fileAction) fileAction = true_action; if (!dirAction) dirAction = true_action; - status = (flags & ACTION_FOLLOWLINKS ? stat : lstat)(fileName, &statbuf); + 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 - bb_error_msg("status=%d followLinks=%d TRUE=%d", - status, flags & ACTION_FOLLOWLINKS, TRUE); + bb_error_msg("status=%d flags=%x", status, flags); #endif goto done_nak_warn; } @@ -82,9 +83,8 @@ int recursive_action(const char *fileName, if (!(flags & ACTION_DEPTHFIRST)) { status = dirAction(fileName, &statbuf, userData, depth); - if (!status) { + if (!status) goto done_nak_warn; - } if (status == SKIP) return TRUE; } @@ -103,23 +103,23 @@ int recursive_action(const char *fileName, nextFile = concat_subpath_file(fileName, next->d_name); if (nextFile == NULL) continue; - /* now descend into it, forcing recursion. */ - if (!recursive_action(nextFile, flags | ACTION_RECURSE, - fileAction, dirAction, userData, depth+1)) { + /* now descend into it (NB: ACTION_RECURSE is set in flags) */ + if (!recursive_action(nextFile, flags, fileAction, dirAction, userData, depth+1)) status = FALSE; - } free(nextFile); } closedir(dir); - if ((flags & ACTION_DEPTHFIRST) && - !dirAction(fileName, &statbuf, userData, depth)) { + + if (flags & ACTION_DEPTHFIRST) { + if (!dirAction(fileName, &statbuf, userData, depth)) goto done_nak_warn; } if (!status) return FALSE; return TRUE; -done_nak_warn: + + done_nak_warn: bb_perror_msg("%s", fileName); return FALSE; } -- cgit v1.2.3