Revert "Remove some unnecessary #includes that crept in"

[browser-switch] / launcher.c

diff --git a/launcher.c b/launcher.c
index 93cce2f..f229469 100644 (file)
--- a/launcher.c
+++ b/launcher.c
@@ -26,12 +26,14 @@
 #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"
@@ -105,20 +107,6 @@ 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;
@@ -155,7 +143,6 @@ 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);
        }
@@ -375,8 +362,6 @@ 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 */
@@ -391,8 +376,6 @@ 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 */
@@ -488,7 +471,6 @@ 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);
 }