aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/lib.c7
-rw-r--r--toys/which.c15
2 files changed, 9 insertions, 13 deletions
diff --git a/lib/lib.c b/lib/lib.c
index 0e3fe020..1aca9c8c 100644
--- a/lib/lib.c
+++ b/lib/lib.c
@@ -364,7 +364,7 @@ void xmkpath(char *path, int mode)
struct string_list *find_in_path(char *path, char *filename)
{
- struct string_list *rlist = NULL;
+ struct string_list *rlist = NULL, **prlist=&rlist;
char *cwd = xgetcwd();
for (;;) {
@@ -386,8 +386,9 @@ struct string_list *find_in_path(char *path, char *filename)
// Confirm it's not a directory.
if (!stat(rnext->str, &st) && S_ISREG(st.st_mode)) {
- rnext->next = rlist;
- rlist = rnext;
+ *prlist = rnext;
+ rnext->next = NULL;
+ prlist = &(rnext->next);
} else free(rnext);
if (!next) break;
diff --git a/toys/which.c b/toys/which.c
index 63e12aa4..13198363 100644
--- a/toys/which.c
+++ b/toys/which.c
@@ -6,7 +6,7 @@
*
* Not in SUSv3.
-USE_WHICH(NEWTOY(which, "a", TOYFLAG_USR|TOYFLAG_BIN))
+USE_WHICH(NEWTOY(which, "<1a", TOYFLAG_USR|TOYFLAG_BIN))
config WHICH
bool "which"
@@ -20,8 +20,6 @@ config WHICH
*/
#include "toys.h"
-#define OPT_a 1
-
// Find an exectuable file either at a path with a slash in it (absolute or
// relative to current directory), or in $PATH. Returns absolute path to file,
// or NULL if not found.
@@ -54,7 +52,7 @@ static int which_in_path(char *filename)
if (!access(list->str, X_OK)) {
puts(list->str);
// If we should stop at one match, do so
- if (toys.optflags & OPT_a) {
+ if (!toys.optflags) {
llist_free(list, NULL);
break;
}
@@ -67,10 +65,7 @@ static int which_in_path(char *filename)
void which_main(void)
{
- if (!*toys.optargs) toys.exitval++;
- else {
- int i;
- for (i=0; toys.optargs[i]; i++)
- toys.exitval |= which_in_path(toys.optargs[i]);
- }
+ int i;
+ for (i=0; toys.optargs[i]; i++)
+ toys.exitval |= which_in_path(toys.optargs[i]);
}