diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-01-20 14:42:49 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-01-20 14:42:49 +0000 |
| commit | d1e0f572a5820926777bde561373673bcfab6cea (patch) | |
| tree | 37963a425df66e1b79e606fef485d10d1d1de521 | |
| parent | 57fab1c2196242db8fb452c98550eef0f5f2de18 (diff) | |
| -rw-r--r-- | tools/dbus-launch.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index ce9c7b1c..f21746a6 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -140,7 +140,7 @@ verbose (const char *format, static void usage (int ecode) { - fprintf (stderr, "dbus-launch [--version] [--help] [--sh-syntax] [--csh-syntax] [--auto-syntax] [--exit-with-session]\n"); + fprintf (stderr, "dbus-launch [--version] [--help] [--sh-syntax] [--csh-syntax] [--auto-syntax] [--exit-with-session] [--exit-with-child]\n"); exit (ecode); } @@ -756,6 +756,7 @@ main (int argc, char **argv) const char *runprog = NULL; int remaining_args = 0; int exit_with_session; + int exit_with_child; int binary_syntax = FALSE; int c_shell_syntax = FALSE; int bourne_shell_syntax = FALSE; @@ -771,6 +772,7 @@ main (int argc, char **argv) char *config_file; exit_with_session = FALSE; + exit_with_child = FALSE; config_file = NULL; prev_arg = NULL; @@ -795,6 +797,8 @@ main (int argc, char **argv) binary_syntax = TRUE; else if (strcmp (arg, "--version") == 0) version (); + else if (strcmp (arg, "--exit-with-child") == 0) + exit_with_child = TRUE; else if (strcmp (arg, "--exit-with-session") == 0) exit_with_session = TRUE; else if (strcmp (arg, "--close-stderr") == 0) @@ -908,6 +912,9 @@ main (int argc, char **argv) if (exit_with_session) verbose ("--exit-with-session enabled\n"); + if (exit_with_child) + verbose ("--exit-with-session enabled\n"); + if (autolaunch) { #ifndef DBUS_BUILD_X11 |