X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=launcher.c;h=67598139b9c78f9f3dc52e04cf1f3ce93687b5ce;hp=f229469740bf506fd8ae1e046a3a8ad7da8f0dcd;hb=8aa7920c7abe393c89180034875a72a1a14a8d3d;hpb=f4665fd53d5c0e352e36326efee27e6ce6edce1d

diff --git a/launcher.c b/launcher.c
index f229469..6759813 100644
--- a/launcher.c
+++ b/launcher.c
@@ -26,14 +26,12 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <dbus/dbus-glib.h>
 
 #ifdef FREMANTLE
-#include <signal.h>
-#include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus.h>
-#include <sys/inotify.h>
-#include <poll.h>
 #endif
 
 #include "browser-switchboard.h"
@@ -107,6 +105,20 @@ static DBusHandlerResult check_microb_finished(DBusConnection *connection,
 }
 #endif
 
+/* Close stdin/stdout/stderr and replace with /dev/null */
+static int close_stdio(void) {
+	int fd;
+
+	if ((fd = open("/dev/null", O_RDWR)) == -1)
+		return -1;
+
+	if (dup2(fd, 0) == -1 || dup2(fd, 1) == -1 || dup2(fd, 2) == -1)
+		return -1;
+
+	close(fd);
+	return 0;
+}
+
 static void launch_tear(struct swb_context *ctx, char *uri) {
 	int status;
 	static DBusGProxy *tear_proxy = NULL;
@@ -143,6 +155,7 @@ static void launch_tear(struct swb_context *ctx, char *uri) {
 			}
 			/* Child process */
 			setsid();
+			close_stdio();
 		}
 		execl("/usr/bin/tear", "/usr/bin/tear", uri, (char *)NULL);
 	}
@@ -166,13 +179,13 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 	printf("launch_microb with uri '%s'\n", uri);
 
 	/* Launch browserd if it's not running */
-	status = system("pidof /usr/sbin/browserd > /dev/null");
+	status = system("pidof browserd > /dev/null");
 	if (WIFEXITED(status) && WEXITSTATUS(status)) {
 		kill_browserd = 1;
 #ifdef FREMANTLE
-		system("/usr/sbin/browserd -d -b");
+		system("/usr/sbin/browserd -d -b > /dev/null 2>&1");
 #else
-		system("/usr/sbin/browserd -d");
+		system("/usr/sbin/browserd -d > /dev/null 2>&1");
 #endif
 	}
 
@@ -362,6 +375,8 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 		g_object_unref(g_proxy);
 	} else {
 		/* Child process */
+		close_stdio();
+
 		/* exec maemo-invoker directly instead of relying on the
 		   /usr/bin/browser symlink, since /usr/bin/browser may have
 		   been replaced with a shell script calling us via D-Bus */
@@ -376,6 +391,8 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 		waitpid(pid, &status, 0);
 	} else {
 		/* Child process */
+		close_stdio();
+
 		/* exec maemo-invoker directly instead of relying on the
 		   /usr/bin/browser symlink, since /usr/bin/browser may have
 		   been replaced with a shell script calling us via D-Bus */
@@ -391,7 +408,7 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 
 	/* Kill off browserd if we started it */
 	if (kill_browserd)
-		system("kill `pidof /usr/sbin/browserd`");
+		system("kill `pidof browserd`");
 
 	if (!ctx || !ctx->continuous_mode) 
 		exit(0);
@@ -471,6 +488,7 @@ static void launch_other_browser(struct swb_context *ctx, char *uri) {
 		}
 		/* Child process */
 		setsid();
+		close_stdio();
 	}
 	execl("/bin/sh", "/bin/sh", "-c", command, (char *)NULL);
 }