projects
/
browser-switch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install the inotify watch for lockfile creation before forking
[browser-switch]
/
launcher.c
diff --git
a/launcher.c
b/launcher.c
index
819977e
..
0e48d42
100644
(file)
--- a/
launcher.c
+++ b/
launcher.c
@@
-204,10
+204,6
@@
void launch_microb(struct swb_context *ctx, char *uri) {
/* Release the osso_browser D-Bus name so that MicroB can take it */
dbus_release_osso_browser_name(ctx);
/* Release the osso_browser D-Bus name so that MicroB can take it */
dbus_release_osso_browser_name(ctx);
- if ((pid = fork()) == -1) {
- perror("fork");
- exit(1);
- }
#ifdef FREMANTLE
/* Put together the path to the MicroB browserd lockfile */
if (!(homedir = getenv("HOME")))
#ifdef FREMANTLE
/* Put together the path to the MicroB browserd lockfile */
if (!(homedir = getenv("HOME")))
@@
-243,6
+239,11
@@
void launch_microb(struct swb_context *ctx, char *uri) {
}
free(microb_profile_dir);
}
free(microb_profile_dir);
+ if ((pid = fork()) == -1) {
+ perror("fork");
+ exit(1);
+ }
+
if (pid > 0) {
/* Parent process */
/* Wait for our child to start the browser UI process and
if (pid > 0) {
/* Parent process */
/* Wait for our child to start the browser UI process and
@@
-477,6
+478,11
@@
void launch_microb(struct swb_context *ctx, char *uri) {
execl("/usr/bin/maemo-invoker", "browser", (char *)NULL);
}
#else /* !FREMANTLE */
execl("/usr/bin/maemo-invoker", "browser", (char *)NULL);
}
#else /* !FREMANTLE */
+ if ((pid = fork()) == -1) {
+ perror("fork");
+ exit(1);
+ }
+
if (pid > 0) {
/* Parent process */
waitpid(pid, &status, 0);
if (pid > 0) {
/* Parent process */
waitpid(pid, &status, 0);