Whitespace / formatting / bracket cleanup.

[oweals/busybox.git] / utility.c

diff --git a/utility.c b/utility.c
index 0ace3eb341681fa507b379680dd24842304fb5ff..7fd4cad7d8e7caf6d27192278e1f664321e4881c 100644 (file)
--- a/utility.c
+++ b/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)) {
+                                       || (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) {
-                               closedir(dir);
-                               return FALSE;
+                       if (recursive_action(nextFile, TRUE, followLinks, depthFirst,
+                                               fileAction, dirAction, userData) == FALSE) {
+                               status = FALSE;
                        }
                }
-               status = closedir(dir);
-               if (status < 0) {
-                       perror_msg("%s", fileName);
-                       return FALSE;
-               }
+               closedir(dir);
                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;
@@ -1798,7 +1793,7 @@ ssize_t safe_read(int fd, void *buf, size_t count)
 #endif
 
 #ifdef BB_FEATURE_HUMAN_READABLE
-const char *format(unsigned long val, unsigned long hr)
+const char *make_human_readable_str(unsigned long val, unsigned long hr)
 {
        int i=0;
        static char str[10] = "\0";
@@ -1820,7 +1815,7 @@ const char *format(unsigned long val, unsigned long hr)
 }
 #endif
 
-#if defined(BB_GREP) || defined(BB_HOSTNAME) || defined(BB_SED) || defined(BB_TAR) || defined(BB_WGET) || defined(BB_XARGS)
+#if defined(BB_GREP) || defined(BB_HOSTNAME) || defined(BB_SED) || defined(BB_TAR) || defined(BB_WGET) || defined(BB_XARGS) || defined(BB_SH)
 void chomp(char *s)
 {
        size_t len = strlen(s);