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

find: if DESKTOP=y, support -wholename (synonym for -path)

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-05-17 12:25:25 +02:00
parent 4a6a56c778
commit be1cfeea2e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
findutils/find.c
View File

@ -831,6 +831,11 @@ static action*** parse_params(char **argv)
PARM_name , PARM_name ,
PARM_iname , PARM_iname ,
IF_FEATURE_FIND_PATH( PARM_path ,) IF_FEATURE_FIND_PATH( PARM_path ,)
#if ENABLE_DESKTOP
/* -wholename is a synonym for -path */
/* We support it becuase Linux kernel's "make tags" uses it */
IF_FEATURE_FIND_PATH( PARM_wholename ,)
#endif
IF_FEATURE_FIND_PATH( PARM_ipath ,) IF_FEATURE_FIND_PATH( PARM_ipath ,)
IF_FEATURE_FIND_REGEX( PARM_regex ,) IF_FEATURE_FIND_REGEX( PARM_regex ,)
IF_FEATURE_FIND_TYPE( PARM_type ,) IF_FEATURE_FIND_TYPE( PARM_type ,)
@ -869,6 +874,9 @@ static action*** parse_params(char **argv)
"-name\0" "-name\0"
"-iname\0" "-iname\0"
IF_FEATURE_FIND_PATH( "-path\0" ) IF_FEATURE_FIND_PATH( "-path\0" )
#if ENABLE_DESKTOP
IF_FEATURE_FIND_PATH( "-wholename\0")
#endif
IF_FEATURE_FIND_PATH( "-ipath\0" ) IF_FEATURE_FIND_PATH( "-ipath\0" )
IF_FEATURE_FIND_REGEX( "-regex\0" ) IF_FEATURE_FIND_REGEX( "-regex\0" )
IF_FEATURE_FIND_TYPE( "-type\0" ) IF_FEATURE_FIND_TYPE( "-type\0" )
@ -1076,7 +1084,7 @@ static action*** parse_params(char **argv)
ap->iname = (parm == PARM_iname); ap->iname = (parm == PARM_iname);
} }
#if ENABLE_FEATURE_FIND_PATH #if ENABLE_FEATURE_FIND_PATH
else if (parm == PARM_path || parm == PARM_ipath) { else if (parm == PARM_path IF_DESKTOP(|| parm == PARM_wholename) || parm == PARM_ipath) {
action_path *ap; action_path *ap;
dbg("%d", __LINE__); dbg("%d", __LINE__);
ap = ALLOC_ACTION(path); ap = ALLOC_ACTION(path);