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>

diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 2940a7d2ae77570f20128917efee529214efd110..7f267928582e1001519abda03b777c8cbf1a74a9 100644 (file)
--- 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)