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

find: fix implicit -print (sometime differed from standard)

Browse Source
This commit is contained in:
Denis Vlasenko 2006-10-31 03:20:13 +00:00
parent 6191a7a007
commit a3b4fed8b3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
findutils/find.c
View File

@ -35,6 +35,14 @@
* file.txt * file.txt
* # find file.txt -name '*f*' -o -name '*z*' * # find file.txt -name '*f*' -o -name '*z*'
* file.txt * file.txt
*
* # find t z -name '*t*' -print -o -name '*z*'
* t
* # find t z t z -name '*t*' -o -name '*z*' -print
* z
* z
* # find t z t z '(' -name '*t*' -o -name '*z*' ')' -o -print
* (no output)
*/ */
#include "busybox.h" #include "busybox.h"
@ -193,7 +201,6 @@ SFUNC(exec)
bb_perror_msg("%s", argv[0]); bb_perror_msg("%s", argv[0]);
for (i = 0; i < ap->exec_argc; i++) for (i = 0; i < ap->exec_argc; i++)
free(argv[i]); free(argv[i]);
need_print = 0;
return rc == 0; /* return 1 if success */ return rc == 0; /* return 1 if success */
} }
#endif #endif
@ -202,7 +209,6 @@ SFUNC(exec)
SFUNC(print0) SFUNC(print0)
{ {
printf("%s%c", fileName, '\0'); printf("%s%c", fileName, '\0');
need_print = 0;
return TRUE; return TRUE;
} }
#endif #endif
@ -210,7 +216,6 @@ SFUNC(print0)
SFUNC(print) SFUNC(print)
{ {
puts(fileName); puts(fileName);
need_print = 0;
return TRUE; return TRUE;
} }
@ -331,10 +336,12 @@ action*** parse_params(char **argv)
/* --- Tests and actions --- */ /* --- Tests and actions --- */
else if (strcmp(arg, "-print") == 0) { else if (strcmp(arg, "-print") == 0) {
need_print = 0;
(void) ALLOC_ACTION(print); (void) ALLOC_ACTION(print);
} }
#if ENABLE_FEATURE_FIND_PRINT0 #if ENABLE_FEATURE_FIND_PRINT0
else if (strcmp(arg, "-print0") == 0) { else if (strcmp(arg, "-print0") == 0) {
need_print = 0;
(void) ALLOC_ACTION(print0); (void) ALLOC_ACTION(print0);
} }
#endif #endif
@ -420,6 +427,7 @@ action*** parse_params(char **argv)
else if (strcmp(arg, "-exec") == 0) { else if (strcmp(arg, "-exec") == 0) {
int i; int i;
action_exec *ap; action_exec *ap;
need_print = 0;
ap = ALLOC_ACTION(exec); ap = ALLOC_ACTION(exec);
ap->exec_argv = ++argv; /* first arg after -exec */ ap->exec_argv = ++argv; /* first arg after -exec */
ap->exec_argc = 0; ap->exec_argc = 0;