/*
* 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
* 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
}
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) {