scp fixes

2 files changed, 8 insertions, 1 deletions

diff --git a/README b/README
index a4b963512..29189e751 100644
--- a/README
+++ b/README
@@ -25,6 +25,7 @@ yumkam (https://github.com/yumkam)
         - man page fixes
 Vasya Novikov (https://github.com/vn971)
         - Wesnoth profile
+        - manpage fixes
 mahdi1234 (https://github.com/mahdi1234)
         - cherrytree profile
 jrabe (https://github.com/jrabe)
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 9e0be7bfa..31c58d8ae 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -560,7 +560,6 @@ int main(int argc, char **argv) {
         int highest_errno = errno_highest_nr();
 #endif
 
-
         // drop permissions by default and rise them when required
         EUID_INIT();
         EUID_USER();
@@ -579,6 +578,10 @@ int main(int argc, char **argv) {
                                 found = 1;
                                 break;
                         }
+                        if (strcmp(argv[i], "--") == 0)
+                                break;
+                        if (strncmp(argv[i], "--", 2) != 0)
+                                break;
                 }
                 
                 if (found == 0) {
@@ -1475,6 +1478,9 @@ int main(int argc, char **argv) {
                         if (strstr(argv[i + prog_index], "&&") || strstr(argv[i + prog_index], "||")) {
                                 sprintf(ptr1, "%s ", argv[i + prog_index]);
                         }
+                        else if (arg_command){
+                                sprintf(ptr1, "%s ", argv[i + prog_index]);
+                        }
                         else {
                                 sprintf(ptr1, "\"%s\" ", argv[i + prog_index]);
                         }