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

nsenter: stop option parsing on 1st non-option

Browse Source 
"nsenter ls -l" gives: invalid option -- 'l'

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-12 08:44:32 +01:00
parent 030fe31760
commit ef2366cdca
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
findutils/find.c
View File

@ -1522,7 +1522,7 @@ int find_main(int argc UNUSED_PARAM, char **argv)
} }
*past_HLP = NULL; *past_HLP = NULL;
/* "+": stop on first non-option */ /* "+": stop on first non-option */
i = getopt32(argv, "+HLP"); i = getopt32(argv, "+""HLP");
if (i & (1<<0)) if (i & (1<<0))
G.recurse_flags |= ACTION_FOLLOWLINKS_L0 | ACTION_DANGLING_OK; G.recurse_flags |= ACTION_FOLLOWLINKS_L0 | ACTION_DANGLING_OK;
if (i & (1<<1)) if (i & (1<<1))

3
util-linux/nsenter.c
View File

@ -103,8 +103,9 @@ static const struct namespace_descr ns_list[] = {
}; };
/* /*
* Upstream nsenter doesn't support the short option for --preserve-credentials * Upstream nsenter doesn't support the short option for --preserve-credentials
* "+": stop on first non-option
*/ */
static const char opt_str[] ALIGN1 = "U::i::u::n::p::m::""t:+S:+G:+r::w::F"; static const char opt_str[] ALIGN1 = "+""U::i::u::n::p::m::""t:+S:+G:+r::w::F";
#if ENABLE_LONG_OPTS #if ENABLE_LONG_OPTS
static const char nsenter_longopts[] ALIGN1 = static const char nsenter_longopts[] ALIGN1 =