Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 01:32:08 +00:00
Code Issues Projects Releases Wiki Activity

Add find -exec support from Rob Sullivan, and convert CONFIG_ to ENABLE_

Browse Source 
while we're in the area.
This commit is contained in:
Rob Landley 2005-10-04 03:34:39 +00:00
parent d128b71820
commit 5d3a0e8ed3
3 changed files with 78 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
findutils/Config.in
View File

@ -57,6 +57,14 @@ config CONFIG_FEATURE_FIND_INUM
help help
Support the 'find -inum' option for searching by inode number. Support the 'find -inum' option for searching by inode number.
config CONFIG_FEATURE_FIND_EXEC
bool " Enable (-exec) option allowing execution of commands"
default y
depends on CONFIG_FIND
help
Support the 'find -exec' option for executing commands based upon
the files matched.
config CONFIG_GREP config CONFIG_GREP
bool "grep" bool "grep"
default n default n

103
findutils/find.c
View File

@ -39,33 +39,39 @@ static const char msg_invalid_arg[] = "invalid argument `%s' to `%s'";
static char *pattern; static char *pattern;
#ifdef CONFIG_FEATURE_FIND_TYPE #if ENABLE_FEATURE_FIND_TYPE
static int type_mask = 0; static int type_mask = 0;
#endif #endif
#ifdef CONFIG_FEATURE_FIND_PERM #if ENABLE_FEATURE_FIND_PERM
static char perm_char = 0; static char perm_char = 0;
static int perm_mask = 0; static int perm_mask = 0;
#endif #endif
#ifdef CONFIG_FEATURE_FIND_MTIME #if ENABLE_FEATURE_FIND_MTIME
static char mtime_char; static char mtime_char;
static int mtime_days; static int mtime_days;
#endif #endif
#ifdef CONFIG_FEATURE_FIND_XDEV #if ENABLE_FEATURE_FIND_XDEV
static dev_t *xdev_dev; static dev_t *xdev_dev;
static int xdev_count = 0; static int xdev_count = 0;
#endif #endif
#ifdef CONFIG_FEATURE_FIND_NEWER #if ENABLE_FEATURE_FIND_NEWER
static time_t newer_mtime; static time_t newer_mtime;
#endif #endif
#ifdef CONFIG_FEATURE_FIND_INUM #if ENABLE_FEATURE_FIND_INUM
static ino_t inode_num; static ino_t inode_num;
#endif #endif
#if ENABLE_FEATURE_FIND_EXEC
static char **exec_str;
static int num_matches;
static int exec_opt;
#endif
static int fileAction(const char *fileName, struct stat *statbuf, void* junk) static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
{ {
if (pattern != NULL) { if (pattern != NULL) {
@ -78,22 +84,17 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
if (!(fnmatch(pattern, tmp, FNM_PERIOD) == 0)) if (!(fnmatch(pattern, tmp, FNM_PERIOD) == 0))
goto no_match; goto no_match;
} }
#ifdef CONFIG_FEATURE_FIND_TYPE if (ENABLE_FEATURE_FIND_TYPE && type_mask != 0) {
if (type_mask != 0) {
if (!((statbuf->st_mode & S_IFMT) == type_mask)) if (!((statbuf->st_mode & S_IFMT) == type_mask))
goto no_match; goto no_match;
} }
#endif if (ENABLE_FEATURE_FIND_PERM && perm_mask != 0) {
#ifdef CONFIG_FEATURE_FIND_PERM
if (perm_mask != 0) {
if (!((isdigit(perm_char) && (statbuf->st_mode & 07777) == perm_mask) || if (!((isdigit(perm_char) && (statbuf->st_mode & 07777) == perm_mask) ||
(perm_char == '-' && (statbuf->st_mode & perm_mask) == perm_mask) || (perm_char == '-' && (statbuf->st_mode & perm_mask) == perm_mask) ||
(perm_char == '+' && (statbuf->st_mode & perm_mask) != 0))) (perm_char == '+' && (statbuf->st_mode & perm_mask) != 0)))
goto no_match; goto no_match;
} }
#endif if (ENABLE_FEATURE_FIND_MTIME && mtime_char != 0) {
#ifdef CONFIG_FEATURE_FIND_MTIME
if (mtime_char != 0) {
time_t file_age = time(NULL) - statbuf->st_mtime; time_t file_age = time(NULL) - statbuf->st_mtime;
time_t mtime_secs = mtime_days * 24 * 60 * 60; time_t mtime_secs = mtime_days * 24 * 60 * 60;
if (!((isdigit(mtime_char) && file_age >= mtime_secs && if (!((isdigit(mtime_char) && file_age >= mtime_secs &&
@ -102,9 +103,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
(mtime_char == '-' && file_age < mtime_secs))) (mtime_char == '-' && file_age < mtime_secs)))
goto no_match; goto no_match;
} }
#endif if (ENABLE_FEATURE_FIND_XDEV && xdev_count) {
#ifdef CONFIG_FEATURE_FIND_XDEV
if (xdev_count) {
int i; int i;
for (i=0; i<xdev_count; i++) { for (i=0; i<xdev_count; i++) {
if (xdev_dev[i] == statbuf-> st_dev) if (xdev_dev[i] == statbuf-> st_dev)
@ -117,26 +116,31 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
goto no_match; goto no_match;
} }
} }
#endif if (ENABLE_FEATURE_FIND_NEWER && newer_mtime != 0) {
#ifdef CONFIG_FEATURE_FIND_NEWER
if (newer_mtime != 0) {
time_t file_age = newer_mtime - statbuf->st_mtime; time_t file_age = newer_mtime - statbuf->st_mtime;
if (file_age >= 0) if (file_age >= 0)
goto no_match; goto no_match;
} }
#endif if (ENABLE_FEATURE_FIND_INUM && inode_num != 0) {
#ifdef CONFIG_FEATURE_FIND_INUM
if (inode_num != 0) {
if (!(statbuf->st_ino == inode_num)) if (!(statbuf->st_ino == inode_num))
goto no_match; goto no_match;
} }
#endif if (ENABLE_FEATURE_FIND_EXEC && exec_opt) {
int i;
char *cmd_string = "";
for (i = 0; i < num_matches; i++)
cmd_string = bb_xasprintf("%s%s%s", cmd_string, exec_str[i], fileName);
cmd_string = bb_xasprintf("%s%s", cmd_string, exec_str[num_matches]);
system(cmd_string);
goto no_match;
}
puts(fileName); puts(fileName);
no_match: no_match:
return (TRUE); return (TRUE);
} }
#ifdef CONFIG_FEATURE_FIND_TYPE #if ENABLE_FEATURE_FIND_TYPE
static int find_type(char *type) static int find_type(char *type)
{ {
int mask = 0; int mask = 0;
@ -193,14 +197,11 @@ int find_main(int argc, char **argv)
if (++i == argc) if (++i == argc)
bb_error_msg_and_die(msg_req_arg, "-name"); bb_error_msg_and_die(msg_req_arg, "-name");
pattern = argv[i]; pattern = argv[i];
#ifdef CONFIG_FEATURE_FIND_TYPE } else if (ENABLE_FEATURE_FIND_TYPE && strcmp(argv[i], "-type") == 0) {
} else if (strcmp(argv[i], "-type") == 0) {
if (++i == argc) if (++i == argc)
bb_error_msg_and_die(msg_req_arg, "-type"); bb_error_msg_and_die(msg_req_arg, "-type");
type_mask = find_type(argv[i]); type_mask = find_type(argv[i]);
#endif } else if (ENABLE_FEATURE_FIND_PERM && strcmp(argv[i], "-perm") == 0) {
#ifdef CONFIG_FEATURE_FIND_PERM
} else if (strcmp(argv[i], "-perm") == 0) {
char *end; char *end;
if (++i == argc) if (++i == argc)
bb_error_msg_and_die(msg_req_arg, "-perm"); bb_error_msg_and_die(msg_req_arg, "-perm");
@ -209,9 +210,7 @@ int find_main(int argc, char **argv)
bb_error_msg_and_die(msg_invalid_arg, argv[i], "-perm"); bb_error_msg_and_die(msg_invalid_arg, argv[i], "-perm");
if ((perm_char = argv[i][0]) == '-') if ((perm_char = argv[i][0]) == '-')
perm_mask = -perm_mask; perm_mask = -perm_mask;
#endif } else if (ENABLE_FEATURE_FIND_MTIME && strcmp(argv[i], "-mtime") == 0) {
#ifdef CONFIG_FEATURE_FIND_MTIME
} else if (strcmp(argv[i], "-mtime") == 0) {
char *end; char *end;
if (++i == argc) if (++i == argc)
bb_error_msg_and_die(msg_req_arg, "-mtime"); bb_error_msg_and_die(msg_req_arg, "-mtime");
@ -220,9 +219,7 @@ int find_main(int argc, char **argv)
bb_error_msg_and_die(msg_invalid_arg, argv[i], "-mtime"); bb_error_msg_and_die(msg_invalid_arg, argv[i], "-mtime");
if ((mtime_char = argv[i][0]) == '-') if ((mtime_char = argv[i][0]) == '-')
mtime_days = -mtime_days; mtime_days = -mtime_days;
#endif } else if (ENABLE_FEATURE_FIND_XDEV && strcmp(argv[i], "-xdev") == 0) {
#ifdef CONFIG_FEATURE_FIND_XDEV
} else if (strcmp(argv[i], "-xdev") == 0) {
struct stat stbuf; struct stat stbuf;
xdev_count = ( firstopt - 1 ) ? ( firstopt - 1 ) : 1; xdev_count = ( firstopt - 1 ) ? ( firstopt - 1 ) : 1;
@ -241,25 +238,45 @@ int find_main(int argc, char **argv)
xdev_dev [i-1] = stbuf. st_dev; xdev_dev [i-1] = stbuf. st_dev;
} }
} }
#endif } else if (ENABLE_FEATURE_FIND_NEWER && strcmp(argv[i], "-newer") == 0) {
#ifdef CONFIG_FEATURE_FIND_NEWER
} else if (strcmp(argv[i], "-newer") == 0) {
struct stat stat_newer; struct stat stat_newer;
if (++i == argc) if (++i == argc)
bb_error_msg_and_die(msg_req_arg, "-newer"); bb_error_msg_and_die(msg_req_arg, "-newer");
if (stat (argv[i], &stat_newer) != 0) if (stat (argv[i], &stat_newer) != 0)
bb_error_msg_and_die("file %s not found", argv[i]); bb_error_msg_and_die("file %s not found", argv[i]);
newer_mtime = stat_newer.st_mtime; newer_mtime = stat_newer.st_mtime;
#endif } else if (ENABLE_FEATURE_FIND_INUM && strcmp(argv[i], "-inum") == 0) {
#ifdef CONFIG_FEATURE_FIND_INUM
} else if (strcmp(argv[i], "-inum") == 0) {
char *end; char *end;
if (++i == argc) if (++i == argc)
bb_error_msg_and_die(msg_req_arg, "-inum"); bb_error_msg_and_die(msg_req_arg, "-inum");
inode_num = strtol(argv[i], &end, 10); inode_num = strtol(argv[i], &end, 10);
if (end[0] != '\0') if (end[0] != '\0')
bb_error_msg_and_die(msg_invalid_arg, argv[i], "-inum"); bb_error_msg_and_die(msg_invalid_arg, argv[i], "-inum");
#endif } else if (ENABLE_FEATURE_FIND_EXEC && strcmp(argv[i], "-exec") == 0) {
int b_pos;
char *cmd_string = "";
while (i++) {
if (i == argc)
bb_error_msg_and_die(msg_req_arg, "-exec");
if (*argv[i] == ';')
break;
cmd_string = bb_xasprintf("%s %s", cmd_string, argv[i]);
}
if (*cmd_string == 0)
bb_error_msg_and_die(msg_req_arg, "-exec");
cmd_string++;
exec_str = xmalloc(sizeof(char *));
while ((b_pos = strstr(cmd_string, "{}") - cmd_string), (b_pos >= 0)) {
num_matches++;
exec_str = xrealloc(exec_str, (num_matches + 1) * sizeof(char *));
exec_str[num_matches - 1] = bb_xstrndup(cmd_string, b_pos);
cmd_string += b_pos + 2;
}
exec_str[num_matches] = bb_xstrdup(cmd_string);
exec_opt = 1;
} else } else
bb_show_usage(); bb_show_usage();
} }

11
include/usage.h
View File

@ -732,6 +732,11 @@
#else #else
# define USAGE_FIND_INUM(a) # define USAGE_FIND_INUM(a)
#endif #endif
#ifdef CONFIG_FEATURE_FIND_EXEC
# define USAGE_FIND_EXEC(a) a
#else
# define USAGE_FIND_EXEC(a)
#endif
#define find_trivial_usage \ #define find_trivial_usage \
"[PATH...] [EXPRESSION]" "[PATH...] [EXPRESSION]"
@ -751,7 +756,11 @@
) USAGE_FIND_NEWER( \ ) USAGE_FIND_NEWER( \
"\n\t-newer FILE\tModified time is more recent than FILE's" \ "\n\t-newer FILE\tModified time is more recent than FILE's" \
) USAGE_FIND_INUM( \ ) USAGE_FIND_INUM( \
"\n\t-inum N\t\tFile has inode number N") "\n\t-inum N\t\tFile has inode number N" \
) USAGE_FIND_EXEC( \
"\n\t-exec CMD\tExecute CMD with all instances of {} replaced by the" \
"\n\t\t\tfiles matching EXPRESSION")
#define find_example_usage \ #define find_example_usage \
"$ find / -name passwd\n" \ "$ find / -name passwd\n" \
"/etc/passwd\n" "/etc/passwd\n"