From cad533365168c418fbf4ac0984f7fa5893ef07e2 Mon Sep 17 00:00:00 2001 From: Glenn Washburn Date: Thu, 8 Nov 2018 13:52:33 -0600 Subject: Have appimage handling be the same with or with out special -- argument. --- src/firejail/main.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/firejail/main.c b/src/firejail/main.c index 23d9a1d51..4cb87aaa6 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c @@ -2244,21 +2244,18 @@ int main(int argc, char **argv) { return 1; } } - else if (strcmp(argv[i], "--") == 0) { + else { // double dash - positional params to follow - arg_doubledash = 1; - i++; - if (i >= argc) { - fprintf(stderr, "Error: program name not found\n"); - exit(1); + if (strcmp(argv[i], "--") == 0) { + arg_doubledash = 1; + i++; + if (i >= argc) { + fprintf(stderr, "Error: program name not found\n"); + exit(1); + } } - extract_command_name(i, argv); - prog_index = i; - break; - } - else { // is this an invalid option? - if (*argv[i] == '-') { + else if (*argv[i] == '-') { fprintf(stderr, "Error: invalid %s command line option\n", argv[i]); return 1; } -- cgit v1.2.3-54-g00ecf