Commit f280c171 authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge branch 'mr/233'

parents 2d0a7f2e 558aaf1c

changes/argument_parse

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor features (command-line interface):

    - When parsing command-line flags that take an optional argument,

      treat the argument as absent if it would start with a '-' character.

      Arguments in that form are not intelligible for any of our

      optional-argument flags.  Closes ticket 40223.

src/app/config/config.c

+4 −1
Original line number Diff line number Diff line
@@ -2601,8 +2601,11 @@ config_parse_commandline(int argc, char **argv, int ignore_errors) 
        parsed_cmdline_free(result);

        return NULL;

      }

    } else if (want_arg == ARGUMENT_OPTIONAL && is_last) {

    } else if (want_arg == ARGUMENT_OPTIONAL &&

               /* optional arguments may never start with '-'. */

               (is_last || argv[i+1][0] == '-')) {

      arg = tor_strdup("");

      want_arg = ARGUMENT_NONE; // prevent skipping the next flag.

    } else {

      arg = (want_arg != ARGUMENT_NONE) ? tor_strdup(argv[i+1]) :

                                              tor_strdup("");