From 68b9c1382593fabc0e58862a45b4d010e8bb2256 Mon Sep 17 00:00:00 2001 From: Aleksey Manevich Date: Tue, 12 Jul 2016 05:22:47 +0300 Subject: Another command line quoting fix 1. Arguments passed to shell should always be quoted by single quotes. 2. Arguments passed directly to program (--shell=none) should never be quoted. --- src/firejail/main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/firejail/main.c b/src/firejail/main.c index 232a57499..366b41f88 100644 --- a/src/firejail/main.c +++ b/src/firejail/main.c @@ -2022,11 +2022,7 @@ int main(int argc, char **argv) { char *ptr1 = cfg.command_line; char *ptr2 = cfg.window_title; for (i = 0; i < argcnt; i++) { - // detect bash commands - if (strstr(argv[i + prog_index], "&&") || strstr(argv[i + prog_index], "||")) { - sprintf(ptr1, "%s ", argv[i + prog_index]); - } - else if (arg_command){ + if (arg_shell_none){ sprintf(ptr1, "%s ", argv[i + prog_index]); } else { -- cgit v1.2.3-70-g09d2