Revert "Remove some unnecessary #includes that crept in"

[browser-switch] / launcher.c

diff --git a/launcher.c b/launcher.c
index 8bffd71..f229469 100644 (file)
--- a/launcher.c
+++ b/launcher.c
@@ -26,13 +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 <dbus/dbus.h>
 #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"
@@ -106,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;
@@ -156,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);
        }
@@ -180,13 +166,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 browserd > /dev/null");
+       status = system("pidof /usr/sbin/browserd > /dev/null");
        if (WIFEXITED(status) && WEXITSTATUS(status)) {
                kill_browserd = 1;
 #ifdef FREMANTLE
-               system("/usr/sbin/browserd -d -b > /dev/null 2>&1");
+               system("/usr/sbin/browserd -d -b");
 #else
-               system("/usr/sbin/browserd -d > /dev/null 2>&1");
+               system("/usr/sbin/browserd -d");
 #endif
        }
 
@@ -297,7 +283,6 @@ void launch_microb(struct swb_context *ctx, char *uri) {
                                exit(1);
                        }
                }
-               g_object_unref(g_proxy);
 
                /* Workaround: the browser process we started is going to want
                   to hang around forever, hogging the com.nokia.osso_browser
@@ -361,14 +346,22 @@ void launch_microb(struct swb_context *ctx, char *uri) {
                dbus_connection_close(raw_connection);
                dbus_connection_unref(raw_connection);
 
-               /* Kill off browser UI
-                  XXX: Hope we don't cause data loss here! */
-               printf("Killing MicroB\n");
-               kill(pid, SIGTERM);
+               /* Tell browser UI to exit nicely */
+               printf("Closing MicroB\n");
+               if (!dbus_g_proxy_call(g_proxy, "exit_browser", &gerror,
+                                      G_TYPE_INVALID, G_TYPE_INVALID)) {
+                       /* We don't expect a reply; any other error indicates
+                          a problem */
+                       if (gerror->domain != DBUS_GERROR ||
+                           gerror->code != DBUS_GERROR_NO_REPLY) {
+                               printf("exit_browser failed: %s\n",
+                                      gerror->message);
+                               exit(1);
+                       }
+               }
+               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 */
@@ -383,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 */
@@ -400,7 +391,7 @@ void launch_microb(struct swb_context *ctx, char *uri) {
 
        /* Kill off browserd if we started it */
        if (kill_browserd)
-               system("kill `pidof browserd`");
+               system("kill `pidof /usr/sbin/browserd`");
 
        if (!ctx || !ctx->continuous_mode) 
                exit(0);
@@ -480,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);
 }