From fd402941a7612b5254a65edfedc074d66da3883a Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 10 Apr 2001 17:53:49 +0000 Subject: Patch from Valdimir to reduce stack usage, since recursive_action is (as the name implies) is recursive, reducing stack memory usage is important to avoid exhausting available stack memory. --- libbb/recursive_action.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'libbb') diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index 8424ca0bf..510080b83 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c @@ -29,8 +29,10 @@ #include #include #include +#include /* free() */ #include "libbb.h" + /* same conditions as recursive_action */ #define bb_need_name_too_long #define BB_DECLARE_EXTERN @@ -112,25 +114,18 @@ 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); + nextFile = concat_path_file(fileName, next->d_name); if (recursive_action(nextFile, TRUE, followLinks, depthFirst, fileAction, dirAction, userData) == FALSE) { status = FALSE; } + free(nextFile); } closedir(dir); if (dirAction != NULL && depthFirst == TRUE) { -- cgit v1.2.3