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

Patch for bug #1183: Added a -xdev option to find (configurable)

Browse Source
This commit is contained in:
Robert Griebl 2002-07-24 00:34:48 +00:00
parent 80cd3cfdbc
commit 41369af3f2
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
findutils/config.in
View File

@ -11,6 +11,7 @@ if [ "$CONFIG_FIND" = "y" ] ; then
bool ' Enable modified time matching (-mtime) option' CONFIG_FEATURE_FIND_MTIME bool ' Enable modified time matching (-mtime) option' CONFIG_FEATURE_FIND_MTIME
bool ' Enable permissions matching (-perm) option' CONFIG_FEATURE_FIND_PERM bool ' Enable permissions matching (-perm) option' CONFIG_FEATURE_FIND_PERM
bool ' Enable filetype matching (-type) option' CONFIG_FEATURE_FIND_TYPE bool ' Enable filetype matching (-type) option' CONFIG_FEATURE_FIND_TYPE
bool ' Enable stay in filesystem (-xdev) option' CONFIG_FEATURE_FIND_XDEV
fi fi
bool 'grep' CONFIG_GREP bool 'grep' CONFIG_GREP
if [ "$CONFIG_GREP" = "y" ] ; then if [ "$CONFIG_GREP" = "y" ] ; then

43
findutils/find.c
View File

@ -51,6 +51,12 @@ static char mtime_char;
static int mtime_days; static int mtime_days;
#endif #endif
#ifdef CONFIG_FEATURE_FIND_XDEV
static dev_t *xdev_dev;
static int xdev_count = 0;
#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) {
@ -88,6 +94,22 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
goto no_match; goto no_match;
} }
#endif #endif
#ifdef CONFIG_FEATURE_FIND_XDEV
if (xdev_count) {
int i;
for (i=0; i<xdev_count; i++) {
if (xdev_dev[i] == statbuf-> st_dev)
break;
}
if (i == xdev_count) {
if(S_ISDIR(statbuf->st_mode))
return SKIP;
else
goto no_match;
}
}
#endif
puts(fileName); puts(fileName);
no_match: no_match:
return (TRUE); return (TRUE);
@ -179,6 +201,27 @@ int find_main(int argc, char **argv)
error_msg_and_die("invalid argument `%s' to `-mtime'", argv[i]); error_msg_and_die("invalid argument `%s' to `-mtime'", argv[i]);
if ((mtime_char = argv[i][0]) == '-') if ((mtime_char = argv[i][0]) == '-')
mtime_days = -mtime_days; mtime_days = -mtime_days;
#endif
#ifdef CONFIG_FEATURE_FIND_XDEV
} else if (strcmp(argv[i], "-xdev") == 0) {
struct stat stbuf;
xdev_count = ( firstopt - 1 ) ? ( firstopt - 1 ) : 1;
xdev_dev = xmalloc ( xdev_count * sizeof( dev_t ));
if ( firstopt == 1 ) {
if ( stat ( ".", &stbuf ) < 0 )
error_msg_and_die("could not stat '.'" );
xdev_dev [0] = stbuf. st_dev;
}
else {
for (i = 1; i < firstopt; i++) {
if ( stat ( argv [i], &stbuf ) < 0 )
error_msg_and_die("could not stat '%s'", argv [i] );
xdev_dev [i-1] = stbuf. st_dev;
}
}
#endif #endif
} else } else
show_usage(); show_usage();