#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"
}
#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;
}
/* Child process */
setsid();
- close_stdio();
}
execl("/usr/bin/tear", "/usr/bin/tear", uri, (char *)NULL);
}
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
}
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 */
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 */
/* 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);
}
/* Child process */
setsid();
- close_stdio();
}
execl("/bin/sh", "/bin/sh", "-c", command, (char *)NULL);
}