Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c

[oweals/busybox.git] / find.c

diff --git a/find.c b/find.c
index 2c1039b5337b8899b886115c0bf6b1754fcb49bd..e18f3c569d19266869fcffcf979bbf82138f921a 100644 (file)
--- a/find.c
+++ b/find.c
@@ -3,7 +3,7 @@
  * Mini find implementation for busybox
  *
  *
- * Copyright (C) 1999 by Lineo, inc.
+ * Copyright (C) 1999,2000 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,6 @@
  */
 
 #include "internal.h"
-#include "regexp.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
@@ -33,16 +32,19 @@ static char *pattern = NULL;
 static char *directory = ".";
 static int dereferenceFlag = FALSE;
 
-static const char find_usage[] = "find [PATH...] [EXPRESSION]\n\n"
-       "Search for files in a directory hierarchy.  The default PATH is\n"
+static const char find_usage[] = "find [PATH...] [EXPRESSION]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nSearch for files in a directory hierarchy.  The default PATH is\n"
        "the current directory; default EXPRESSION is '-print'\n\n"
        "\nEXPRESSION may consist of:\n"
-       "\t-follow\n\t\tDereference symbolic links.\n"
-       "\t-name PATTERN\n\t\tFile name (with leading directories removed) matches PATTERN.\n"
-       "\t-print\n\t\tprint the full file name followed by a newline to stdout.\n";
+       "\t-follow\t\tDereference symbolic links.\n"
+       "\t-name PATTERN\tFile name (leading directories removed) matches PATTERN.\n"
+       "\t-print\t\tprint the full file name followed by a newline to stdout.\n"
+#endif
+       ;
 
 
-static int fileAction(const char *fileName, struct stat *statbuf)
+static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {
        if (pattern == NULL)
                fprintf(stdout, "%s\n", fileName);
@@ -109,9 +111,9 @@ int find_main(int argc, char **argv)
        }
 
        if (recursiveAction(directory, TRUE, FALSE, FALSE,
-                                               fileAction, fileAction) == FALSE) {
+                                               fileAction, fileAction, NULL) == FALSE) {
                exit(FALSE);
        }
 
-       exit(TRUE);
+       return(TRUE);
 }