- add a few basic tests for pidof(8)

[oweals/busybox.git] / libbb / recursive_action.c

diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index 8917f470f7daefc67f75fe23f5317e62934dfa24..d27629829f5f0a1638a2a6d40848bc2692c5cdaf 100644 (file)
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -2,7 +2,7 @@
 /*
  * 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
@@ -30,12 +30,12 @@
 
 
 /*
- * 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.
  */
@@ -60,11 +60,10 @@ int recursive_action(const char *fileName,
 
        if (status < 0) {
 #ifdef DEBUG_RECURS_ACTION
-               fprintf(stderr,
-                               "status=%d followLinks=%d TRUE=%d\n",
+               bb_error_msg("status=%d followLinks=%d TRUE=%d",
                                status, followLinks, TRUE);
 #endif
-               perror_msg("%s", fileName);
+               bb_perror_msg("%s", fileName);
                return FALSE;
        }
 
@@ -90,25 +89,23 @@ int recursive_action(const char *fileName,
                if (dirAction != NULL && ! depthFirst) {
                        status = dirAction(fileName, &statbuf, userData);
                        if (! status) {
-                               perror_msg("%s", fileName);
+                               bb_perror_msg("%s", fileName);
                                return FALSE;
                        } else if (status == SKIP)
                                return TRUE;
                }
                dir = opendir(fileName);
                if (!dir) {
-                       perror_msg("%s", fileName);
+                       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,
                                                fileAction, dirAction, userData)) {
                                status = FALSE;
@@ -118,7 +115,7 @@ int recursive_action(const char *fileName,
                closedir(dir);
                if (dirAction != NULL && depthFirst) {
                        if (! dirAction(fileName, &statbuf, userData)) {
-                               perror_msg("%s", fileName);
+                               bb_perror_msg("%s", fileName);
                                return FALSE;
                        }
                }