mirror of
https://github.com/sheumann/hush.git
synced 2024-10-03 15:55:01 +00:00
mkdir,rmdir: accept and ignore -v, --verbose
function old new delta static.rmdir_longopts 38 48 +10 mkdir_longopts 18 28 +10 Signed-off-by: Simon B <sburnet@hotmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
8c3439554a
commit
3698ed1ca1
@ -48,6 +48,7 @@ static const char mkdir_longopts[] ALIGN1 =
|
|||||||
#if ENABLE_SELINUX
|
#if ENABLE_SELINUX
|
||||||
"context\0" Required_argument "Z"
|
"context\0" Required_argument "Z"
|
||||||
#endif
|
#endif
|
||||||
|
"verbose\0" No_argument "v"
|
||||||
;
|
;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -66,7 +67,7 @@ int mkdir_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
|
#if ENABLE_FEATURE_MKDIR_LONG_OPTIONS
|
||||||
applet_long_options = mkdir_longopts;
|
applet_long_options = mkdir_longopts;
|
||||||
#endif
|
#endif
|
||||||
opt = getopt32(argv, "m:p" IF_SELINUX("Z:"), &smode IF_SELINUX(,&scontext));
|
opt = getopt32(argv, "m:p" IF_SELINUX("Z:") "v", &smode IF_SELINUX(,&scontext));
|
||||||
if (opt & 1) {
|
if (opt & 1) {
|
||||||
mode_t mmode = 0777;
|
mode_t mmode = 0777;
|
||||||
if (!bb_parse_mode(smode, &mmode)) {
|
if (!bb_parse_mode(smode, &mmode)) {
|
||||||
|
@ -30,8 +30,9 @@
|
|||||||
/* This is a NOFORK applet. Be very careful! */
|
/* This is a NOFORK applet. Be very careful! */
|
||||||
|
|
||||||
|
|
||||||
#define PARENTS 0x01
|
#define PARENTS (1 << 0)
|
||||||
#define IGNORE_NON_EMPTY 0x02
|
//efine VERBOSE (1 << 1) //accepted but ignored
|
||||||
|
#define IGNORE_NON_EMPTY (1 << 2)
|
||||||
|
|
||||||
int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
int rmdir_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int rmdir_main(int argc UNUSED_PARAM, char **argv)
|
int rmdir_main(int argc UNUSED_PARAM, char **argv)
|
||||||
@ -43,13 +44,14 @@ int rmdir_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
|
#if ENABLE_FEATURE_RMDIR_LONG_OPTIONS
|
||||||
static const char rmdir_longopts[] ALIGN1 =
|
static const char rmdir_longopts[] ALIGN1 =
|
||||||
"parents\0" No_argument "p"
|
"parents\0" No_argument "p"
|
||||||
|
"verbose\0" No_argument "v"
|
||||||
/* Debian etch: many packages fail to be purged or installed
|
/* Debian etch: many packages fail to be purged or installed
|
||||||
* because they desperately want this option: */
|
* because they desperately want this option: */
|
||||||
"ignore-fail-on-non-empty\0" No_argument "\xff"
|
"ignore-fail-on-non-empty\0" No_argument "\xff"
|
||||||
;
|
;
|
||||||
applet_long_options = rmdir_longopts;
|
applet_long_options = rmdir_longopts;
|
||||||
#endif
|
#endif
|
||||||
flags = getopt32(argv, "p");
|
flags = getopt32(argv, "pv");
|
||||||
argv += optind;
|
argv += optind;
|
||||||
|
|
||||||
if (!*argv) {
|
if (!*argv) {
|
||||||
|
Loading…
Reference in New Issue
Block a user