X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Frecursive_action.c;h=25a87b88e451a48b560d2d01d1c7c6bbf96188b8;hb=0aa6ba5d44af32d0bf460c8d92cda686bae64c92;hp=a30addc4fdeb38fbb1c8515520e014408f6a1722;hpb=b1629b1b2abc17a6430e4173d64d7956784118e0;p=oweals%2Fbusybox.git

diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index a30addc4f..25a87b88e 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -7,16 +7,10 @@
  * 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
  * location, and do something (something specified
@@ -27,24 +21,41 @@
  * and so isn't sufficiently portable to take over since glibc2.1
  * is so stinking huge.
  */
+
+static int true_action(const char *fileName, struct stat *statbuf, void* userData, int depth)
+{
+	return TRUE;
+}
+
+/* fileAction return value of 0 on any file in directory will make
+ * recursive_action() return 0, but it doesn't stop directory traversal
+ * (fileAction/dirAction will be called on each file).
+ *
+ * if !depthFirst, dirAction return value of 0 (FALSE) or 2 (SKIP)
+ * prevents recursion 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.
+ * 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.
+ */
+
 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 depth),
+		int (*dirAction)(const char *fileName, struct stat *statbuf, void* userData, int depth),
+		void* userData,
+		int depth)
 {
-	int status;
 	struct stat statbuf;
+	int status;
+	DIR *dir;
 	struct dirent *next;
 
-	if (followLinks)
-		status = stat(fileName, &statbuf);
-	else
-		status = lstat(fileName, &statbuf);
+	if (!fileAction) fileAction = true_action;
+	if (!dirAction) dirAction = true_action;
+
+	status = (followLinks ? stat : lstat)(fileName, &statbuf);
 
 	if (status < 0) {
 #ifdef DEBUG_RECURS_ACTION
@@ -55,64 +66,61 @@ int recursive_action(const char *fileName,
 		return FALSE;
 	}
 
-	if (! followLinks && (S_ISLNK(statbuf.st_mode))) {
-		if (fileAction == NULL)
-			return TRUE;
-		else
-			return fileAction(fileName, &statbuf, userData);
+	/* If S_ISLNK(m), then we know that !S_ISDIR(m).
+	 * Then we can skip checking first part: if it is true, then
+	 * (!dir) is also true! */
+	if ( /* (!followLinks && S_ISLNK(statbuf.st_mode)) || */
+	 !S_ISDIR(statbuf.st_mode)
+	) {
+		return fileAction(fileName, &statbuf, userData, depth);
 	}
 
-	if (! recurse) {
-		if (S_ISDIR(statbuf.st_mode)) {
-			if (dirAction != NULL)
-				return (dirAction(fileName, &statbuf, userData));
-			else
-				return TRUE;
+	/* It's a directory (or a link to one, and followLinks is set) */
+
+	if (!recurse) {
+		return dirAction(fileName, &statbuf, userData, depth);
+	}
+
+	if (!depthFirst) {
+		status = dirAction(fileName, &statbuf, userData, depth);
+		if (!status) {
+			bb_perror_msg("%s", fileName);
+			return FALSE;
 		}
+		if (status == SKIP)
+			return TRUE;
 	}
 
-	if (S_ISDIR(statbuf.st_mode)) {
-		DIR *dir;
+	dir = opendir(fileName);
+	if (!dir) {
+		/* findutils-4.1.20 reports this */
+		/* (i.e. it doesn't silently return with exit code 1) */
+		/* To trigger: "find -exec rm -rf {} \;" */
+		bb_perror_msg("%s", fileName);
+		return FALSE;
+	}
+	status = TRUE;
+	while ((next = readdir(dir)) != NULL) {
+		char *nextFile;
 
-		if (dirAction != NULL && ! depthFirst) {
-			status = dirAction(fileName, &statbuf, userData);
-			if (! status) {
-				bb_perror_msg("%s", fileName);
-				return FALSE;
-			} else if (status == SKIP)
-				return TRUE;
+		nextFile = concat_subpath_file(fileName, next->d_name);
+		if (nextFile == NULL)
+			continue;
+		if (!recursive_action(nextFile, TRUE, followLinks, depthFirst,
+				fileAction, dirAction, userData, depth+1)) {
+			status = FALSE;
 		}
-		dir = bb_opendir(fileName);
-		if (!dir) {
+		free(nextFile);
+	}
+	closedir(dir);
+	if (depthFirst) {
+		if (!dirAction(fileName, &statbuf, userData, depth)) {
+			bb_perror_msg("%s", fileName);
 			return FALSE;
 		}
-		status = TRUE;
-		while ((next = readdir(dir)) != NULL) {
-			char *nextFile;
-
-			nextFile = concat_subpath_file(fileName, next->d_name);
-			if(nextFile == NULL)
-				continue;
-			if (! recursive_action(nextFile, TRUE, followLinks, depthFirst,
-						fileAction, dirAction, userData)) {
-				status = FALSE;
-			}
-			free(nextFile);
-		}
-		closedir(dir);
-		if (dirAction != NULL && depthFirst) {
-			if (! dirAction(fileName, &statbuf, userData)) {
-				bb_perror_msg("%s", fileName);
-				return FALSE;
-			}
-		}
-		if (! status)
-			return FALSE;
-	} else {
-		if (fileAction == NULL)
-			return TRUE;
-		else
-			return fileAction(fileName, &statbuf, userData);
 	}
+
+	if (!status)
+		return FALSE;
 	return TRUE;
 }