search for: long_options_option

...le changed, 6 insertions(+), 6 deletions(-) diff --git a/copy/main.c b/copy/main.c index f9a714c4f677..bb67e97ff97a 100644 --- a/copy/main.c +++ b/copy/main.c @@ -107,8 +107,8 @@ main (int argc, char *argv[]) { enum { HELP_OPTION = CHAR_MAX + 1, - LONG_OPTIONS, - SHORT_OPTIONS, + LONG_OPTIONS_OPTION, + SHORT_OPTIONS_OPTION, ALLOCATED_OPTION, DESTINATION_IS_ZERO_OPTION, FLUSH_OPTION, @@ -120,7 +120,7 @@ main (int argc, char *argv[]) const char *short_options = "C:pR:S:T:vV"; const struct option long_options[] = { { "help", no_argume...

...--git a/copy/main.c b/copy/main.c > index f9a714c4f677..bb67e97ff97a 100644 > --- a/copy/main.c > +++ b/copy/main.c > @@ -107,8 +107,8 @@ main (int argc, char *argv[]) > { > enum { > HELP_OPTION = CHAR_MAX + 1, > - LONG_OPTIONS, > - SHORT_OPTIONS, > + LONG_OPTIONS_OPTION, > + SHORT_OPTIONS_OPTION, > ALLOCATED_OPTION, > DESTINATION_IS_ZERO_OPTION, > FLUSH_OPTION, > @@ -120,7 +120,7 @@ main (int argc, char *argv[]) > const char *short_options = "C:pR:S:T:vV"; > const struct option long_options[] = { > { &...

...62 ++++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/copy/main.c b/copy/main.c index bb67e97ff97a..8055b3a656ba 100644 --- a/copy/main.c +++ b/copy/main.c @@ -106,34 +106,34 @@ int main (int argc, char *argv[]) { enum { - HELP_OPTION = CHAR_MAX + 1, - LONG_OPTIONS_OPTION, - SHORT_OPTIONS_OPTION, - ALLOCATED_OPTION, - DESTINATION_IS_ZERO_OPTION, - FLUSH_OPTION, - NO_EXTENTS_OPTION, - QUEUE_SIZE_OPTION, - REQUEST_SIZE_OPTION, - SYNCHRONOUS_OPTION, + OPT_HELP = CHAR_MAX + 1, + OPT_LONG_OPTIONS, + OPT_SHORT_OPTIONS, + OPT_ALLOCATED,...

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2172516 I figured I'd work on the libnbd line wrapping in shorter waves than how long the nbdkit patch series was. Laszlo Laszlo Ersek (4): copy: rename (LONG|SHORT)_OPTIONS to (LONG|SHORT)_OPTIONS_OPTION copy: rename <purpose>_OPTION to OPT_<purpose> copy: fix layout of "long_options" table copy: rewrap

...t; index f9a714c4f677..bb67e97ff97a 100644 >> --- a/copy/main.c >> +++ b/copy/main.c >> @@ -107,8 +107,8 @@ main (int argc, char *argv[]) >> { >> enum { >> HELP_OPTION = CHAR_MAX + 1, >> - LONG_OPTIONS, >> - SHORT_OPTIONS, >> + LONG_OPTIONS_OPTION, >> + SHORT_OPTIONS_OPTION, >> ALLOCATED_OPTION, >> DESTINATION_IS_ZERO_OPTION, >> FLUSH_OPTION, >> @@ -120,7 +120,7 @@ main (int argc, char *argv[]) >> const char *short_options = "C:pR:S:T:vV"; >> const struct option long...

...o log_to; +extern unsigned mask_handshake; extern bool newstyle; extern bool no_sr; extern const char *port; diff --git a/server/options.h b/server/options.h index a69f413a..c74e0b8b 100644 --- a/server/options.h +++ b/server/options.h @@ -46,6 +46,7 @@ enum { FILTER_OPTION, LOG_OPTION, LONG_OPTIONS_OPTION, + MASK_HANDSHAKE_OPTION, NO_SR_OPTION, RUN_OPTION, SELINUX_LABEL_OPTION, @@ -74,6 +75,7 @@ static const struct option long_options[] = { { "ipaddr", required_argument, NULL, 'i' }, { "log", required_argument, NULL, LOG_OPTION },...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-November/msg00147.html v2: - Use stdbool for booleans. - Use __attribute__((format(printf))). - Don't abort on invalid options, exit with failure instead. - Preserve long/short option choices in the output. - Add '=' in long option output, ie. always use --longopt=arg. - Add "--" parameter

This is similar to the recent --no-sr option - it's a change that is unlikely to ever be used except by someone testing whether a client is compliant to the protocol, but in that niche case, it can be quite handy (it's a lot nicer to be able to purposefully cripple a server from the command line than from a one-off compile, when testing if a client's fallback for a spec-compliant but

v1 was here: https://www.redhat.com/archives/libguestfs/2018-November/msg00147.html v2 was here: https://www.redhat.com/archives/libguestfs/2018-November/msg00152.html v3: - Use optarg != NULL as a sentinel for has_arg. - Moved some variable decls into the inner loop. - Make nbdkit wrapper depend on config.status, so if srcdir or builddir changes then we rebuild the wrapper. It

This patch series solves the FreeBSD shebang problem in a completely different way, and a few other things besides. I propose that we replace ./nbdkit with a C program. The C program is a straightforward translation of the shell script. Some advantages of this approach are: - We can parse options in exactly the same way as the real program. - Use the more accurate ‘is_short_name’ test for

...nbdkit - * Copyright (C) 2013-2018 Red Hat Inc. + * Copyright (C) 2013-2019 Red Hat Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -46,6 +46,7 @@ enum { FILTER_OPTION, LOG_OPTION, LONG_OPTIONS_OPTION, + NO_SR_OPTION, RUN_OPTION, SELINUX_LABEL_OPTION, SHORT_OPTIONS_OPTION, @@ -75,6 +76,7 @@ static const struct option long_options[] = { { "long-options", no_argument, NULL, LONG_OPTIONS_OPTION }, { "new-style", no_argument, NULL, 'n...