- 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 a4a4a7be3058268744ab4555022d119c3d8edfe4..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.
  */
@@ -103,11 +103,9 @@ int recursive_action(const char *fileName,
                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;