lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / libbb / recursive_action.c

diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index 9b6951f4378e3dbe2d9cf54042df6923422df826..b5cf7c0ab4c365b543be36b84730dcf6fff58662 100644 (file)
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * 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,10 +22,10 @@
  * is so stinking huge.
  */
 
-static int FAST_FUNC true_action(const char *fileName ATTRIBUTE_UNUSED,
-               struct stat *statbuf ATTRIBUTE_UNUSED,
-               void* userData ATTRIBUTE_UNUSED,
-               int depth ATTRIBUTE_UNUSED)
+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;
 }
@@ -48,7 +48,7 @@ static int FAST_FUNC true_action(const char *fileName ATTRIBUTE_UNUSED,
  * 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.
+ * 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.
  */
@@ -61,6 +61,7 @@ int FAST_FUNC recursive_action(const char *fileName,
                unsigned depth)
 {
        struct stat statbuf;
+       unsigned follow;
        int status;
        DIR *dir;
        struct dirent *next;
@@ -68,14 +69,22 @@ int FAST_FUNC recursive_action(const char *fileName,
        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);
+       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 flags=%x", status, flags);
 #endif
+               if ((flags & ACTION_DANGLING_OK)
+                && errno == ENOENT
+                && lstat(fileName, &statbuf) == 0
+               ) {
+                       /* Dangling link */
+                       return fileAction(fileName, &statbuf, userData, depth);
+               }
                goto done_nak_warn;
        }
 
@@ -120,7 +129,16 @@ int FAST_FUNC recursive_action(const char *fileName,
                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);
 
@@ -132,6 +150,7 @@ int FAST_FUNC recursive_action(const char *fileName,
        return status;
 
  done_nak_warn:
-       bb_simple_perror_msg(fileName);
+       if (!(flags & ACTION_QUIET))
+               bb_simple_perror_msg(fileName);
        return FALSE;
 }