X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Frecursive_action.c;h=6949e34f3e97073a5823e7365038305d28491f76;hb=621204bbf6750f1ba3977b43bb35375ddda6b5ae;hp=a4a4a7be3058268744ab4555022d119c3d8edfe4;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git

diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index a4a4a7be3..6949e34f3 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -2,52 +2,31 @@
 /*
  * Utility routines.
  *
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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
- * 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
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <stdlib.h>	/* 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)
+		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)
 {
 	int status;
 	struct stat statbuf;
@@ -67,14 +46,14 @@ int recursive_action(const char *fileName,
 		return FALSE;
 	}
 
-	if (! followLinks && (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) {
+	if (!recurse) {
 		if (S_ISDIR(statbuf.st_mode)) {
 			if (dirAction != NULL)
 				return (dirAction(fileName, &statbuf, userData));
@@ -86,9 +65,9 @@ int recursive_action(const char *fileName,
 	if (S_ISDIR(statbuf.st_mode)) {
 		DIR *dir;
 
-		if (dirAction != NULL && ! depthFirst) {
+		if (dirAction != NULL && !depthFirst) {
 			status = dirAction(fileName, &statbuf, userData);
-			if (! status) {
+			if (!status) {
 				bb_perror_msg("%s", fileName);
 				return FALSE;
 			} else if (status == SKIP)
@@ -96,19 +75,16 @@ int recursive_action(const char *fileName,
 		}
 		dir = opendir(fileName);
 		if (!dir) {
-			bb_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)) {
+			nextFile = concat_subpath_file(fileName, next->d_name);
+			if(nextFile == NULL)
 				continue;
-			}
-			nextFile = concat_path_file(fileName, next->d_name);
-			if (! recursive_action(nextFile, TRUE, followLinks, depthFirst,
+			if (!recursive_action(nextFile, TRUE, followLinks, depthFirst,
 						fileAction, dirAction, userData)) {
 				status = FALSE;
 			}
@@ -116,12 +92,12 @@ int recursive_action(const char *fileName,
 		}
 		closedir(dir);
 		if (dirAction != NULL && depthFirst) {
-			if (! dirAction(fileName, &statbuf, userData)) {
+			if (!dirAction(fileName, &statbuf, userData)) {
 				bb_perror_msg("%s", fileName);
 				return FALSE;
 			}
 		}
-		if (! status)
+		if (!status)
 			return FALSE;
 	} else {
 		if (fileAction == NULL)
@@ -131,13 +107,3 @@ int recursive_action(const char *fileName,
 	}
 	return TRUE;
 }
-
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/