Fix xargs option parsing

[oweals/busybox.git] / find.c

diff --git a/find.c b/find.c
index 1fb219496ec0942f5026e92136f0cf098f8e7ebc..1c209aea124eee25caf6642dd6fbeb8746240a02 100644 (file)
--- a/find.c
+++ b/find.c
@@ -1,7 +1,10 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini find implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * 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
  * it under the terms of the GNU General Public License as published by
@@ -19,107 +22,86 @@
  *
  */
 
+#include "internal.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
-#include "internal.h"
-
-
-static char* pattern=NULL;
-static char* directory=NULL;
-static int dereferenceFlag=FALSE;
 
-static const char find_usage[] = "find [path...] [expression]\n"
-"default path is the current directory; default expression is -print\n"
-"expression may consist of:\n";
 
+static char *pattern = NULL;
+static char *directory = ".";
+static int dereferenceFlag = FALSE;
 
-
-static int fileAction(const char *fileName, struct stat* statbuf)
-{
-    if (pattern==NULL)
-       fprintf(stdout, "%s\n", fileName);
-    else if (match(fileName, pattern) == TRUE)
-       fprintf(stdout, "%s\n", fileName);
-    return( TRUE);
-}
-
-static int dirAction(const char *fileName, struct stat* statbuf)
+static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {
-    DIR *dir;
-    struct dirent *entry;
-    
-    if (pattern==NULL)
-       fprintf(stdout, "%s\n", fileName);
-    else if (match(fileName, pattern) == TRUE)
-       fprintf(stdout, "%s\n", fileName);
+       if (pattern == NULL)
+               fprintf(stdout, "%s\n", fileName);
+       else {
+               char *tmp = strrchr(fileName, '/');
 
-    dir = opendir( fileName);
-    if (!dir) {
-       perror("Can't open directory");
-       exit(FALSE);
-    }
-    while ((entry = readdir(dir)) != NULL) {
-       char dirName[NAME_MAX];
-       sprintf(dirName, "%s/%s", fileName, entry->d_name);
-       recursiveAction( dirName, TRUE, dereferenceFlag, FALSE, fileAction, dirAction);
-    }
-    return( TRUE);
+               if (tmp == NULL)
+                       tmp = (char *) fileName;
+               else
+                       tmp++;
+               if (check_wildcard_match(tmp, pattern) == TRUE)
+                       fprintf(stdout, "%s\n", fileName);
+       }
+       return (TRUE);
 }
 
 int find_main(int argc, char **argv)
 {
-    if (argc <= 1) {
-       dirAction( ".", NULL); 
-    }
-
-    /* peel off the "find" */
-    argc--;
-    argv++;
-
-    if (**argv != '-') {
-       directory=*argv;
+       /* peel off the "find" */
        argc--;
        argv++;
-    }
 
-    /* Parse any options */
-    while (**argv == '-') {
-       int stopit=FALSE;
-       while (*++(*argv) && stopit==FALSE) switch (**argv) {
-           case 'f':
-               if (strcmp(*argv, "follow")==0) {
-                   argc--;
-                   argv++;
-                   dereferenceFlag=TRUE;
-               }
-               break;
-           case 'n':
-               if (strcmp(*argv, "name")==0) {
-                   if (argc-- > 1) {
-                       pattern=*(++argv);
-                       stopit=-TRUE;
-                   } else {
-                       fprintf(stderr, "Usage: %s\n", find_usage);
-                       exit( FALSE);
-                   }
-               }
-               break;
-           case '-':
-               /* Ignore all long options */
-               break;
-           default:
-               fprintf(stderr, "Usage: %s\n", find_usage);
-               exit( FALSE);
+       if (argc > 0 && **argv != '-') {
+               directory = *argv;
+               argc--;
+               argv++;
+       }
+
+       /* Parse any options */
+       while (argc > 0 && **argv == '-') {
+               int stopit = FALSE;
+
+               while (*++(*argv) && stopit == FALSE)
+                       switch (**argv) {
+                       case 'f':
+                               if (strcmp(*argv, "follow") == 0) {
+                                       argc--;
+                                       argv++;
+                                       dereferenceFlag = TRUE;
+                               }
+                               break;
+                       case 'n':
+                               if (strcmp(*argv, "name") == 0) {
+                                       if (argc-- > 1) {
+                                               pattern = *(++argv);
+                                               stopit = TRUE;
+                                       } else {
+                                               usage(find_usage);
+                                       }
+                               }
+                               break;
+                       case '-':
+                               /* Ignore all long options */
+                               break;
+                       default:
+                               usage(find_usage);
+                       }
+               if (argc-- > 1)
+                       argv++;
+               if (**argv != '-')
+                       break;
+               else
+                       break;
+       }
+
+       if (recursiveAction(directory, TRUE, FALSE, FALSE,
+                                               fileAction, fileAction, NULL) == FALSE) {
+               exit(FALSE);
        }
-       if (argc-- > 1)
-           argv++;
-           if (**argv != '-')
-               break;
-       else
-           break;
-    }
 
-    dirAction( directory, NULL); 
-    exit(TRUE);
+       return(TRUE);
 }