diff options
| -rw-r--r-- | findutils/Config.in | 16 | ||||
| -rw-r--r-- | findutils/find.c | 44 | ||||
| -rw-r--r-- | include/usage.h | 4 |
3 files changed, 64 insertions, 0 deletions
diff --git a/findutils/Config.in b/findutils/Config.in index 09a5bb3cb..a32e98922 100644 --- a/findutils/Config.in +++ b/findutils/Config.in @@ -135,6 +135,22 @@ config FEATURE_FIND_PRUNE If the file is a directory, dont descend into it. Useful for exclusion .svn and CVS directories. +config FEATURE_FIND_DELETE + bool "Enable -delete option allowing to delete files" + default n + depends on FIND && FEATURE_FIND_DEPTH + help + Support the 'find -delete' option for deleting files and direcotries. + WARNING: This option can do much harm if used wrong. Busybox will not + try to protect the user from doing stupid things. Use with care. + +config FEATURE_FIND_PATH + bool "Enable -path option allowing to match pathname patterns" + default y + depends on FIND + help + The -path option matches whole pathnames instead of just filenames. + config GREP bool "grep" default n diff --git a/findutils/find.c b/findutils/find.c index b77d36dc3..aec22a5bc 100644 --- a/findutils/find.c +++ b/findutils/find.c @@ -79,6 +79,8 @@ USE_FEATURE_FIND_GROUP( ACTS(group, gid_t gid;)) USE_FEATURE_FIND_PAREN( ACTS(paren, action ***subexpr;)) USE_FEATURE_FIND_SIZE( ACTS(size, off_t size;)) USE_FEATURE_FIND_PRUNE( ACTS(prune)) +USE_FEATURE_FIND_DELETE(ACTS(delete)) +USE_FEATURE_FIND_PATH( ACTS(path, const char *pattern;)) static action ***actions; static bool need_print = 1; @@ -305,6 +307,28 @@ ACTF(prune) } #endif +#if ENABLE_FEATURE_FIND_DELETE +ACTF(delete) +{ + int rc; + if (S_ISDIR(statbuf->st_mode)) { + rc = rmdir(fileName); + } else { + rc = unlink(fileName); + } + if (rc < 0) + bb_perror_msg("%s", fileName); + return TRUE; +} +#endif + +#if ENABLE_FEATURE_FIND_PATH +ACTF(path) +{ + return fnmatch(ap->pattern, fileName, 0) == 0; +} +#endif + #if ENABLE_FEATURE_FIND_SIZE ACTF(size) { @@ -393,6 +417,8 @@ static action*** parse_params(char **argv) USE_FEATURE_FIND_PAREN( PARM_char_brace,) USE_FEATURE_FIND_SIZE( PARM_size ,) USE_FEATURE_FIND_PRUNE( PARM_prune ,) + USE_FEATURE_FIND_DELETE(PARM_delete ,) + USE_FEATURE_FIND_PATH( PARM_path ,) #if ENABLE_DESKTOP PARM_and , PARM_or , @@ -420,6 +446,8 @@ static action*** parse_params(char **argv) USE_FEATURE_FIND_PAREN( "(" ,) USE_FEATURE_FIND_SIZE( "-size" ,) USE_FEATURE_FIND_PRUNE( "-prune" ,) + USE_FEATURE_FIND_DELETE("-delete",) + USE_FEATURE_FIND_PATH( "-path" ,) #if ENABLE_DESKTOP "-and" , "-or" , @@ -656,6 +684,22 @@ static action*** parse_params(char **argv) (void) ALLOC_ACTION(prune); } #endif +#if ENABLE_FEATURE_FIND_DELETE + else if (parm == PARM_delete) { + need_print = 0; + recurse_flags |= ACTION_DEPTHFIRST; + (void) ALLOC_ACTION(delete); + } +#endif +#if ENABLE_FEATURE_FIND_PATH + else if (parm == PARM_path) { + action_path *ap; + if (!*++argv) + bb_error_msg_and_die(bb_msg_requires_arg, arg); + ap = ALLOC_ACTION(path); + ap->pattern = arg1; + } +#endif #if ENABLE_FEATURE_FIND_SIZE else if (parm == PARM_size) { action_size *ap; diff --git a/include/usage.h b/include/usage.h index d196afcbf..2fb8112b0 100644 --- a/include/usage.h +++ b/include/usage.h @@ -968,6 +968,10 @@ "\n -size N File size is N" \ ) USE_FEATURE_FIND_PRUNE( \ "\n -prune Stop traversing current subtree" \ + ) USE_FEATURE_FIND_DELETE( \ + "\n -delete Delete files; Turns on -depth option" \ + ) USE_FEATURE_FIND_PATH( \ + "\n -path Path matches PATTERN" \ ) USE_FEATURE_FIND_PAREN( \ "\n (EXPR) Group an expression" \ ) |