Remove debugging statement.

[oweals/busybox.git] / which.c

diff --git a/which.c b/which.c
index dc162dca5658585bb15d3ebad8bb292d695dccba..c460ffdd1cc045172d47a15b06a7c903bdd0105b 100644 (file)
--- a/which.c
+++ b/which.c
@@ -2,7 +2,7 @@
 /*
  * Which implementation for busybox
  *
- * Copyright (C) 2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 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
@@ -21,17 +21,20 @@
  *
  */
 
-#include "internal.h"
+/* getopt not needed */
+#include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include "busybox.h"
 
 extern int which_main(int argc, char **argv)
 {
        char *path_list, *path_n;
        struct stat filestat;
-       int i, count=0;
+       int i, count=1, found, status = EXIT_SUCCESS;
 
        if (argc <= 1 || **(argv + 1) == '-')
-               usage(which_usage);
+               show_usage();
        argc--;
 
        path_list = getenv("PATH");
@@ -48,21 +51,24 @@ extern int which_main(int argc, char **argv)
        while(argc-- > 0) { 
                path_n = path_list;
                argv++;
+               found = 0;
                for (i = 0; i < count; i++) {
-                       char buf[strlen(path_n)+1+strlen(*argv)];
-                       strcpy (buf, path_n);
-                       strcat (buf, "/");
-                       strcat (buf, *argv);
+                       char *buf;
+                       buf = concat_path_file(path_n, *argv);
                        if (stat (buf, &filestat) == 0
                            && filestat.st_mode & S_IXUSR)
                        {
-                               printf ("%s\n", buf);
+                               puts(buf);
+                               found = 1;
                                break;
                        }
+                       free(buf);
                        path_n += (strlen(path_n) + 1);
                }
+               if (!found)
+                       status = EXIT_FAILURE;
        }
-       return(TRUE);
+       return status;
 }
 
 /*