Merge pull request !2 from openeuler-basic/init
This commit is contained in:
openeuler-ci-bot 2019-12-31 19:25:05 +08:00 committed by Gitee
commit 6ee6ae116d

View File

@ -60,7 +60,7 @@ index 9fdb8ef..bd7cc37 100644
--- a/find/ftsfind.c --- a/find/ftsfind.c
+++ b/find/ftsfind.c +++ b/find/ftsfind.c
@@ -479,6 +479,12 @@ consider_visiting (FTS *p, FTSENT *ent) @@ -479,6 +479,12 @@ consider_visiting (FTS *p, FTSENT *ent)
} }
} }
+ if (options.bypass_autofs && + if (options.bypass_autofs &&
@ -89,7 +89,7 @@ index 52a1ef6..995aec3 100644
{ARG_TEST, "writable", parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */ {ARG_TEST, "writable", parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */
PARSE_OPTION ("xdev", xdev), /* POSIX */ PARSE_OPTION ("xdev", xdev), /* POSIX */
+ PARSE_OPTION ("xautofs", xautofs), + PARSE_OPTION ("xautofs", xautofs),
PARSE_TEST ("xtype", xtype), /* GNU */ PARSE_TEST ("xtype", xtype), /* GNU */
#ifdef UNIMPLEMENTED_UNIX #ifdef UNIMPLEMENTED_UNIX
/* It's pretty ugly for find to know about archive formats. /* It's pretty ugly for find to know about archive formats.
@@ -2603,6 +2605,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) @@ -2603,6 +2605,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
@ -129,3 +129,4 @@ index 8577396..4d45f84 100644
if (p->posixly_correct) if (p->posixly_correct)
-- --
1.7.4.4 1.7.4.4