emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tomasz Motylewski reported that the 'which' applet does not find

Browse Source 
files when the full file PATH is specified.

This patch from Arthur Othieno fixes it.
This commit is contained in:
Eric Andersen 2003-10-22 10:38:22 +00:00
parent 7f6295f516
commit 514633bf3f
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
debianutils/which.c
View File

@ -26,10 +26,19 @@
#include <stdlib.h> #include <stdlib.h>
#include "busybox.h" #include "busybox.h"
static int file_exists(char *file)
{
struct stat filestat;
if (stat(file, &filestat) == 0 && filestat.st_mode & S_IXUSR)
return 1;
else
return 0;
}
extern int which_main(int argc, char **argv) extern int which_main(int argc, char **argv)
{ {
char *path_list, *path_n; char *path_list, *path_n;
struct stat filestat;
int i, count=1, found, status = EXIT_SUCCESS; int i, count=1, found, status = EXIT_SUCCESS;
if (argc <= 1 || **(argv + 1) == '-') if (argc <= 1 || **(argv + 1) == '-')
@ -52,18 +61,27 @@ extern int which_main(int argc, char **argv)
path_n = path_list; path_n = path_list;
argv++; argv++;
found = 0; found = 0;
for (i = 0; i < count; i++) { char *buf;
char *buf;
buf = concat_path_file(path_n, *argv); /*
if (stat (buf, &filestat) == 0 * Check if we were given the full path, first.
&& filestat.st_mode & S_IXUSR) * Otherwise see if the file exists in our $PATH.
{ */
puts(buf); buf = *argv;
found = 1; if (file_exists(buf)) {
break; puts(buf);
found = 1;
} else {
for (i = 0; i < count; i++) {
buf = concat_path_file(path_n, *argv);
if (file_exists(buf)) {
puts(buf);
found = 1;
break;
}
free(buf);
path_n += (strlen(path_n) + 1);
} }
free(buf);
path_n += (strlen(path_n) + 1);
} }
if (!found) if (!found)
status = EXIT_FAILURE; status = EXIT_FAILURE;