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

find: fix a regression introduced with -HLP support

Browse Source 
function                                             old     new   delta
find_main                                            294     342     +48

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2014-01-09 16:07:11 +01:00
parent f0058b1b1f
commit 6eb0cbe07e
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
findutils/find.c
View File

@ -1291,9 +1291,27 @@ int find_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int find_main(int argc UNUSED_PARAM, char **argv) int find_main(int argc UNUSED_PARAM, char **argv)
{ {
int i, firstopt, status = EXIT_SUCCESS; int i, firstopt, status = EXIT_SUCCESS;
char **past_HLP, *saved;
INIT_G(); INIT_G();
/* "find -type f" + getopt("+HLP") => disaster.
* Need to avoid getopt running into a non-HLP option.
* Do this by temporarily storing NULL there:
*/
past_HLP = argv;
for (;;) {
saved = *++past_HLP;
if (!saved)
break;
if (saved[0] != '-')
break;
if (!saved[1])
break; /* it is "-" */
if ((saved+1)[strspn(saved+1, "HLP")] != '\0')
break;
}
*past_HLP = NULL;
/* "+": stop on first non-option */ /* "+": stop on first non-option */
i = getopt32(argv, "+HLP"); i = getopt32(argv, "+HLP");
if (i & (1<<0)) if (i & (1<<0))
@ -1301,7 +1319,8 @@ int find_main(int argc UNUSED_PARAM, char **argv)
if (i & (1<<1)) if (i & (1<<1))
G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK; G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
/* -P is default and is ignored */ /* -P is default and is ignored */
argv += optind; argv = past_HLP; /* same result as "argv += optind;" */
*past_HLP = saved;
for (firstopt = 0; argv[firstopt]; firstopt++) { for (firstopt = 0; argv[firstopt]; firstopt++) {
if (argv[firstopt][0] == '-') if (argv[firstopt][0] == '-')

22
testsuite/find.tests Executable file
View File

@ -0,0 +1,22 @@
#!/bin/sh
# Copyright 2014 by Denys Vlasenko <vda.linux@googlemail.com>
# Licensed under GPLv2, see file LICENSE in this source tree.
. ./testing.sh
# testing "description" "command" "result" "infile" "stdin"
mkdir -p find.tempdir
touch find.tempdir/testfile
testing "find -type f" \
"cd find.tempdir && find -type f 2>&1" \
"./testfile\n" \
"" ""
# testing "description" "command" "result" "infile" "stdin"
rm -rf find.tempdir
exit $FAILCOUNT