*
*/
-#include "busybox.h"
+/* getopt not needed */
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include "busybox.h"
extern int which_main(int argc, char **argv)
{
int i, count=1, found, status = EXIT_SUCCESS;
if (argc <= 1 || **(argv + 1) == '-')
- usage(which_usage);
+ show_usage();
argc--;
path_list = getenv("PATH");
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)