Aren
/
toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

which: multiple arguments, support -a

This commit is contained in:
K. Lange 2018-10-10 07:15:12 +09:00
parent 9dee25e64a
commit 940a15eccb
1 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
apps/which.c
View File

@ -18,47 +18,61 @@
int main(int argc, char * argv[]) { int main(int argc, char * argv[]) {
if (argc < 2) { int ret_val = 0;
int i = 1;
int print_all = 0;
if (i < argc && !strcmp(argv[i],"-a")) {
print_all = 1;
i++;
}
if (i == argc) {
return 1; return 1;
} }
if (strstr(argv[1], "/")) { for (; i < argc; ++i) {
struct stat t;
if (!stat(argv[1], &t)) {
if ((t.st_mode & 0111)) {
printf("%s\n", argv[1]);
return 0;
}
}
} else {
char * file = argv[1];
char * path = getenv("PATH");
if (!path) {
path = DEFAULT_PATH;
}
char * xpath = strdup(path); if (strstr(argv[i], "/")) {
char * p, * last; struct stat t;
for ((p = strtok_r(xpath, ":", &last)); p; p = strtok_r(NULL, ":", &last)) { if (!stat(argv[i], &t)) {
int r; if ((t.st_mode & 0111)) {
struct stat stat_buf; printf("%s\n", argv[1]);
char * exe = malloc(strlen(p) + strlen(file) + 2); }
strcpy(exe, p); }
strcat(exe, "/"); } else {
strcat(exe, file); char * file = argv[i];
char * path = getenv("PATH");
if (!path) {
path = DEFAULT_PATH;
}
r = stat(exe, &stat_buf); char * xpath = strdup(path);
if (r != 0) { char * p, * last;
continue; int found = 0;
for ((p = strtok_r(xpath, ":", &last)); p; p = strtok_r(NULL, ":", &last)) {
int r;
struct stat stat_buf;
char * exe = malloc(strlen(p) + strlen(file) + 2);
strcpy(exe, p);
strcat(exe, "/");
strcat(exe, file);
r = stat(exe, &stat_buf);
if (r != 0) {
continue;
}
if (!(stat_buf.st_mode & 0111)) {
continue; /* XXX not technically correct; need to test perms */
}
found = 1;
printf("%s\n", exe);
if (print_all) continue;
break;
} }
if (!(stat_buf.st_mode & 0111)) { free(xpath);
continue; /* XXX not technically correct; need to test perms */ if (!found) ret_val = 1;
}
printf("%s\n", exe);
return 0;
} }
free(xpath);
return 1;
} }
return 1; return ret_val;
} }