Apply vodz' last_patch52

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

diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index 6b93340becedbb8be1849ce854bfb1dff7b4ade4..8917f470f7daefc67f75fe23f5317e62934dfa24 100644 (file)
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -2,9 +2,7 @@
 /*
  * 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.
+ * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
  *
  * 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
@@ -19,22 +17,15 @@
  * 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.
- *
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <dirent.h>
 #include <sys/stat.h>
+#include <stdlib.h>    /* free() */
 #include "libbb.h"
 
-/* same conditions as recursive_action */
-#define bb_need_name_too_long
-#define BB_DECLARE_EXTERN
-#include "../messages.c"
-
 #undef DEBUG_RECURS_ACTION
 
 
@@ -62,7 +53,7 @@ int recursive_action(const char *fileName,
        struct stat statbuf;
        struct dirent *next;
 
-       if (followLinks == TRUE)
+       if (followLinks)
                status = stat(fileName, &statbuf);
        else
                status = lstat(fileName, &statbuf);
@@ -77,14 +68,14 @@ int recursive_action(const char *fileName,
                return FALSE;
        }
 
-       if ((followLinks == FALSE) && (S_ISLNK(statbuf.st_mode))) {
+       if (! followLinks && (S_ISLNK(statbuf.st_mode))) {
                if (fileAction == NULL)
                        return TRUE;
                else
                        return fileAction(fileName, &statbuf, userData);
        }
 
-       if (recurse == FALSE) {
+       if (! recurse) {
                if (S_ISDIR(statbuf.st_mode)) {
                        if (dirAction != NULL)
                                return (dirAction(fileName, &statbuf, userData));
@@ -96,9 +87,9 @@ int recursive_action(const char *fileName,
        if (S_ISDIR(statbuf.st_mode)) {
                DIR *dir;
 
-               if (dirAction != NULL && depthFirst == FALSE) {
+               if (dirAction != NULL && ! depthFirst) {
                        status = dirAction(fileName, &statbuf, userData);
-                       if (status == FALSE) {
+                       if (! status) {
                                perror_msg("%s", fileName);
                                return FALSE;
                        } else if (status == SKIP)
@@ -111,34 +102,27 @@ int recursive_action(const char *fileName,
                }
                status = TRUE;
                while ((next = readdir(dir)) != NULL) {
-                       char nextFile[PATH_MAX];
+                       char *nextFile;
 
                        if ((strcmp(next->d_name, "..") == 0)
                                        || (strcmp(next->d_name, ".") == 0)) {
                                continue;
                        }
-                       if (strlen(fileName) + strlen(next->d_name) + 1 > PATH_MAX) {
-                               error_msg(name_too_long);
-                               return FALSE;
-                       }
-                       memset(nextFile, 0, sizeof(nextFile));
-                       if (fileName[strlen(fileName)-1] == '/')
-                               sprintf(nextFile, "%s%s", fileName, next->d_name);
-                       else
-                               sprintf(nextFile, "%s/%s", fileName, next->d_name);
-                       if (recursive_action(nextFile, TRUE, followLinks, depthFirst,
-                                               fileAction, dirAction, userData) == FALSE) {
+                       nextFile = concat_path_file(fileName, next->d_name);
+                       if (! recursive_action(nextFile, TRUE, followLinks, depthFirst,
+                                               fileAction, dirAction, userData)) {
                                status = FALSE;
                        }
+                       free(nextFile);
                }
                closedir(dir);
-               if (dirAction != NULL && depthFirst == TRUE) {
-                       if (dirAction(fileName, &statbuf, userData) == FALSE) {
+               if (dirAction != NULL && depthFirst) {
+                       if (! dirAction(fileName, &statbuf, userData)) {
                                perror_msg("%s", fileName);
                                return FALSE;
                        }
                }
-               if (status == FALSE)
+               if (! status)
                        return FALSE;
        } else {
                if (fileAction == NULL)