diff options
| author | Sami Kerola | 2014-12-07 10:55:08 +0100 |
|---|---|---|
| committer | Sami Kerola | 2014-12-08 21:07:02 +0100 |
| commit | 3aa141879fd9fa48ec7d71b9398f680d2adf90f2 (patch) | |
| tree | 00bfb440a72a820189a0376e797dea3deb7865ba /misc-utils/getopt.c | |
| parent | getopt: change --shell argument parsing function (diff) | |
| download | kernel-qcow2-util-linux-3aa141879fd9fa48ec7d71b9398f680d2adf90f2.tar.gz kernel-qcow2-util-linux-3aa141879fd9fa48ec7d71b9398f680d2adf90f2.tar.xz kernel-qcow2-util-linux-3aa141879fd9fa48ec7d71b9398f680d2adf90f2.zip | |
getopt: avoid re-terminating long_option list at every update
Terminating the ctl->long_options list once when adding options is
completed is enough. This also allows moving ctl->long_options_nr
increment to more appropriate location.
CC: Frodo Looijaard <frodo@frodo.looijaard.name>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'misc-utils/getopt.c')
| -rw-r--r-- | misc-utils/getopt.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c index 2940a7d2a..7f2679285 100644 --- a/misc-utils/getopt.c +++ b/misc-utils/getopt.c @@ -248,20 +248,13 @@ static void add_longopt(struct getopt_control *ctl, const char *name, int has_ar sizeof(struct option) * ctl->long_options_length); } - - ctl->long_options[ctl->long_options_nr].name = NULL; - ctl->long_options[ctl->long_options_nr].has_arg = 0; - ctl->long_options[ctl->long_options_nr].flag = NULL; - ctl->long_options[ctl->long_options_nr].val = 0; - if (name) { /* Not for init! */ - ctl->long_options[ctl->long_options_nr - 1].has_arg = has_arg; - ctl->long_options[ctl->long_options_nr - 1].flag = &flag; - ctl->long_options[ctl->long_options_nr - 1].val = ctl->long_options_nr; - ctl->long_options[ctl->long_options_nr - 1].name = xstrdup(name); + ctl->long_options[ctl->long_options_nr].has_arg = has_arg; + ctl->long_options[ctl->long_options_nr].flag = &flag; + ctl->long_options[ctl->long_options_nr].val = ctl->long_options_nr; + ctl->long_options[ctl->long_options_nr].name = xstrdup(name); } - ctl->long_options_nr++; } @@ -290,9 +283,15 @@ static void add_long_options(struct getopt_control *ctl, char *options) "-l or --long argument")); } add_longopt(ctl, tokptr, arg_opt); + ctl->long_options_nr++; } tokptr = strtok(NULL, ", \t\n"); } + add_longopt(&ctl, NULL, 0); /* ensure long_options[] is not full */ + ctl->long_options[ctl->long_options_nr].name = NULL; + ctl->long_options[ctl->long_options_nr].has_arg = 0; + ctl->long_options[ctl->long_options_nr].flag = NULL; + ctl->long_options[ctl->long_options_nr].val = 0; } static shell_t shell_type(const char *new_shell) |