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

diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index a30addc4f..6949e34f3 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -7,11 +7,6 @@
  * 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
@@ -28,14 +23,10 @@
  * 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;
@@ -55,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));
@@ -74,15 +65,15 @@ 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)
 				return TRUE;
 		}
-		dir = bb_opendir(fileName);
+		dir = opendir(fileName);
 		if (!dir) {
 			return FALSE;
 		}
@@ -93,7 +84,7 @@ int recursive_action(const char *fileName,
 			nextFile = concat_subpath_file(fileName, next->d_name);
 			if(nextFile == NULL)
 				continue;
-			if (! recursive_action(nextFile, TRUE, followLinks, depthFirst,
+			if (!recursive_action(nextFile, TRUE, followLinks, depthFirst,
 						fileAction, dirAction, userData)) {
 				status = FALSE;
 			}
@@ -101,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)