From c9304c3b82e6dfda53bd57d138acea954fdd8e11 Mon Sep 17 00:00:00 2001
From: Nico Weber <nicolasweber@gmx.de>
Date: Tue, 4 Dec 2007 21:09:31 +0100
Subject: [PATCH] Fix forking infinite loop

---
 src/gui.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/gui.c b/src/gui.c
index 79732fc25f..fceaf11253 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -150,10 +150,17 @@ http://developer.apple.com/documentation/Darwin/Reference/ManPages/man2/fork.2.h
         char ** argv = *_NSGetArgv();
         char * newargv[argc+2];
 
-        for (i = 0; i < argc; i++) {
-            newargv[i] = argv[i];
+        newargv[0] = argv[0];
+
+        /*
+         * make sure "-f" is in front of potential "--remote" flags, else
+         * they would consume it.
+         */
+        newargv[1] = "-f";
+
+        for (i = 1; i < argc; i++) {
+            newargv[i + 1] = argv[i];
         }
-        newargv[argc] = "-f";
         newargv[argc+1] = NULL;
 
         pid = fork();