+2003-05-17 Colin Walters <walters@gnu.org>
+
+ * tools/dbus-send.c: Don't exit with an error code if --help was
+ passed. Default to using the session bus instead of the system
+ one.
+
+ * tools/dbus-launch.c: Ditto.
+
+ * tools/dbus-monitor.c: Ditto.
+
+ * tools/dbus-send.1: Update with new arguments.
+
+ * tools/dbus-launch.c: Emit code to export variables. New
+ arguments -s and -c to specify shell syntax, and a bit of code to
+ autodetect syntax. Also, allow specifying a program to run.
+
+ * tools/dbus-launch.1: Update with new arguments.
+
+ * tools/dbus-send.1: Ditto.
+
+ * tools/dbus-monitor.1: Ditto.
+
2003-05-17 Havoc Pennington <hp@pobox.com>
* bus/config-parser.c (merge_included): merge in policies from
dbus-launch \- Utility to start a message bus from a shell script
.SH SYNOPSIS
.PP
-.B dbus-launch [\-\-version] [\-\-exit-with-session]
+.B dbus-launch [\-\-version] [\-\-sh-syntax] [\-\-csh-syntax] [\-\-auto-syntax] [\-\-exit-with-session] [PROGRAM] [ARGS...]
.SH DESCRIPTION
from a shell script. It would normally be called from a user's login
scripts. Unlike the daemon itself, \fIdbus-launch\fP exits, so
backticks or the $() construct can be used to read information from
-\fIdbus-launch\fP. \fIdbus-launch\fP prints information about the
-launched daemon in KEY=VALUE format.
+\fIdbus-launch\fP.
+
+With no arguments, \fIdbus-launch\fP will simply print the values of
+DBUS_SESSION_BUS_ADDRESS and DBUS_SESSION_BUS_PID.
+
+You may specify a program to be run; in this case, \fIdbus-launch\fP
+will then set the appropriate environment variables and execute the
+specified program, with the specified arguments. See below for
+examples.
+
+Finally, you may use the \-\-auto-syntax command to cause
+\fIdbus-launch\fP to emit shell code to set up the environment. This
+is useful in shell scripts. With this option, \fIdbus-launch\fP looks
+at the value of the SHELL environment variable to determine which
+shell syntax should be used. If SHELL ends in "csh", then
+csh-compatible code is emitted; otherwise Bourne shell code is
+emitted. Instead of passing \-\-auto-syntax, you may explicity
+specify a particular one by using \-\-sh-syntax for Bourne syntax, or
+\-\-csh-syntax for csh syntax.
.PP
See http://www.freedesktop.org/software/dbus/ for more information
## test for an existing bus daemon, just to be safe
if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
## if not found, launch a new one
- eval `dbus-launch --exit-with-session`
+ eval `dbus-launch --auto-syntax --exit-with-session`
echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
- export DBUS_SESSION_BUS_ADDRESS
fi
.fi
You might run something like that in your login scripts.
+.PP
+Another way to use \fIdbus-launch\fP is to run your main session
+program, like so:
+.nf
+
+dbus-launch gnome-session
+
+.fi
+The above would likely be appropriate for ~/.xsession.
+
.SH OPTIONS
The following options are supported:
.TP
+.I "--auto-syntax"
+Attempt to detect the shell in use, and emit compatible code.
+
+.TP
+.I "--csh-syntax"
+Emit csh compatible code.
+
+.TP
.I "--exit-with-session"
If this option is provided, a persistent "babysitter" process will be
created that watches stdin for HUP and tries to connect to the X
it kills the message bus daemon.
.TP
+.I "--sh-syntax"
+Emit Bourne-shell compatible code.
+
+.TP
.I "--version"
Print the version of dbus-launch
}
static void
-usage (void)
+usage (int ecode)
{
- fprintf (stderr, "dbus-launch [--version] [--exit-with-session]\n");
- exit (1);
+ fprintf (stderr, "dbus-launch [--version] [--help] [--sh-syntax] [--csh-syntax] [--auto-syntax] [--exit-with-session]\n");
+ exit (ecode);
}
static void
exit (0);
}
+static char *
+xstrdup (const char *str)
+{
+ int len;
+ char *copy;
+
+ if (str == NULL)
+ return NULL;
+
+ len = strlen (str);
+
+ copy = malloc (len + 1);
+ if (copy == NULL)
+ return NULL;
+
+ memcpy (copy, str, len + 1);
+
+ return copy;
+}
+
typedef enum
{
READ_STATUS_OK, /**< Read succeeded */
{
verbose ("X IO error\n");
kill_bus_and_exit ();
+ return 0;
}
#endif
main (int argc, char **argv)
{
const char *prev_arg;
+ const char *shname;
+ const char *runprog = NULL;
+ int remaining_args = 0;
int exit_with_session;
+ int c_shell_syntax = FALSE;
+ int bourne_shell_syntax = FALSE;
+ int auto_shell_syntax = FALSE;
int i;
int ret;
int bus_pid_to_launcher_pipe[2];
if (strcmp (arg, "--help") == 0 ||
strcmp (arg, "-h") == 0 ||
strcmp (arg, "-?") == 0)
- usage ();
+ usage (0);
+ else if (strcmp (arg, "--auto-syntax") == 0)
+ auto_shell_syntax = TRUE;
+ else if (strcmp (arg, "-c") == 0 ||
+ strcmp (arg, "--csh-syntax") == 0)
+ c_shell_syntax = TRUE;
+ else if (strcmp (arg, "-s") == 0 ||
+ strcmp (arg, "--sh-syntax") == 0)
+ bourne_shell_syntax = TRUE;
else if (strcmp (arg, "--version") == 0)
version ();
else if (strcmp (arg, "--exit-with-session") == 0)
exit_with_session = TRUE;
+ else if (runprog)
+ usage (1);
else
- usage ();
+ {
+ runprog = arg;
+ remaining_args = i+1;
+ break;
+ }
prev_arg = arg;
++i;
}
- verbose ("--exit-with-session provided\n");
+ if (exit_with_session)
+ verbose ("--exit-with-session enabled\n");
+
+ if (auto_shell_syntax)
+ {
+ if ((shname = getenv ("SHELL")) != NULL)
+ {
+ if (!strncmp (shname + strlen (shname) - 3, "csh", 3))
+ c_shell_syntax = TRUE;
+ else
+ bourne_shell_syntax = TRUE;
+ }
+ else
+ bourne_shell_syntax = TRUE;
+ }
if (pipe (bus_pid_to_launcher_pipe) < 0 ||
pipe (bus_address_to_launcher_pipe) < 0)
}
close (bus_pid_to_launcher_pipe[READ_END]);
-
- printf ("DBUS_SESSION_BUS_ADDRESS='%s'\n",
- bus_address);
-
- printf ("DBUS_SESSION_BUS_PID=%ld\n",
- (long) bus_pid);
-
+
+ if (runprog)
+ {
+ char *envvar;
+ char **args;
+
+ envvar = malloc (strlen ("DBUS_SESSION_BUS_ADDRESS=") + strlen (bus_address) + 1);
+ args = malloc (sizeof (char *) * ((argc-remaining_args)+2));
+
+ if (envvar == NULL || args == NULL)
+ goto oom;
+
+ args[0] = xstrdup (runprog);
+ if (!args[0])
+ goto oom;
+ for (i = 1; i <= (argc-remaining_args); i++)
+ {
+ size_t len = strlen (argv[remaining_args+i-1])+1;
+ args[i] = malloc (len);
+ if (!args[i])
+ goto oom;
+ strncpy (args[i], argv[remaining_args+i-1], len);
+ }
+ args[i] = NULL;
+
+ strcpy (envvar, "DBUS_SESSION_BUS_ADDRESS=");
+ strcat (envvar, bus_address);
+ putenv (envvar);
+
+ execvp (runprog, args);
+ fprintf (stderr, "Couldn't exec %s: %s\n", runprog, strerror (errno));
+ exit (1);
+ }
+ else
+ {
+ if (c_shell_syntax)
+ printf ("setenv DBUS_SESSION_BUS_ADDRESS '%s'\n", bus_address);
+ else
+ {
+ printf ("DBUS_SESSION_BUS_ADDRESS='%s'\n", bus_address);
+ if (bourne_shell_syntax)
+ printf ("export DBUS_SESSION_BUS_ADDRESS\n");
+ }
+ if (c_shell_syntax)
+ printf ("set DBUS_SESSION_BUS_PID=%ld\n", (long) bus_pid);
+ else
+ printf ("DBUS_SESSION_BUS_PID=%ld\n", (long) bus_pid);
+ }
+
verbose ("dbus-launch exiting\n");
exit (0);
}
return 0;
+ oom:
+ fprintf (stderr, "Out of memory!");
+ exit (1);
}
.SH SYNOPSIS
.PP
.B dbus-monitor
-[\-\-session]
+[\-\-system]
.SH DESCRIPTION
There are two well-known message buses: the systemwide message bus
(installed on many systems as the "messagebus" service) and the
per-user-login-session message bus (started each time a user logs in).
-\fIdbus-monitor\fP by default monitors the systemwide bus; to monitor the
-session bus, specify \-\-session.
+\fIdbus-monitor\fP by default monitors the session bus; to monitor the
+system bus, specify \-\-system.
.PP
The message bus configuration may keep \fIdbus-monitor\fP from seeing
all messages, especially if you run the monitor as a non-root user.
.SH OPTIONS
-No options are currently supported.
+.TP
+.I "--system"
+Use the system message bus instead of the session bus.
.SH AUTHOR
dbus-monitor was written by Philip Blundell.
static void
usage (char *name, int ecode)
{
- fprintf (stderr, "Usage: %s [--session]\n", name);
+ fprintf (stderr, "Usage: %s [--system]\n", name);
exit (ecode);
}
{
DBusConnection *connection;
DBusError error;
- DBusBusType type = DBUS_BUS_SYSTEM;
+ DBusBusType type = DBUS_BUS_SESSION;
DBusMessageHandler *handler;
GMainLoop *loop;
int i;
char *arg = argv[i];
if (!strcmp (arg, "--session"))
- type = DBUS_BUS_SESSION;
+ type = DBUS_BUS_SYSTEM;
else if (!strcmp (arg, "--help"))
usage (argv[0], 0);
else if (!strcmp (arg, "--"))
.SH SYNOPSIS
.PP
.B dbus-send
-[\-\-session] [\-\-dest=SERVICE] [\-\-print-reply] <message name> [contents ...]
+[\-\-system] [\-\-dest=SERVICE] [\-\-print-reply] <message name> [contents ...]
.SH DESCRIPTION
There are two well-known message buses: the systemwide message bus
(installed on many systems as the "messagebus" service) and the
per-user-login-session message bus (started each time a user logs in).
-\fIdbus-send\fP sends messages to the system bus by default, and
-to the per-session bus if you specify \-\-session.
+\fIdbus-send\fP sends messages to the session bus by default, and
+to the system bus if you specify \-\-system.
.PP
Nearly all uses of \fIdbus-send\fP must provide the \-\-dest
.I "--print-reply"
Block for a reply to the message sent, and print any reply received.
.TP
-.I "--session"
-Use the per-login-session message bus instead of the systemwide bus.
+.I "--system"
+Use the system message bus instead of the session bus.
.SH AUTHOR
dbus-send was written by Philip Blundell.
#include "dbus-print-message.h"
static void
-usage (char *name)
+usage (char *name, int ecode)
{
- fprintf (stderr, "Usage: %s [--session] [--dest=SERVICE] [--print-reply] <message type> [contents ...]\n", name);
- exit (1);
+ fprintf (stderr, "Usage: %s [--help] [--session] [--dest=SERVICE] [--print-reply] <message type> [contents ...]\n", name);
+ exit (ecode);
}
int
int print_reply;
DBusMessageIter iter;
int i;
- DBusBusType type = DBUS_BUS_SYSTEM;
+ DBusBusType type = DBUS_BUS_SESSION;
char *dest = DBUS_SERVICE_BROADCAST;
char *name = NULL;
if (argc < 2)
- usage (argv[0]);
+ usage (argv[0], 1);
print_reply = FALSE;
{
char *arg = argv[i];
- if (strcmp (arg, "--session") == 0)
- type = DBUS_BUS_SESSION;
+ if (strcmp (arg, "--system") == 0)
+ type = DBUS_BUS_SYSTEM;
else if (strcmp (arg, "--print-reply") == 0)
print_reply = TRUE;
else if (strstr (arg, "--dest=") == arg)
dest = strchr (arg, '=') + 1;
+ else if (!strcmp(arg, "--help"))
+ usage (argv[0], 0);
else if (arg[0] == '-')
- usage (argv[0]);
+ usage (argv[0], 1);
else
name = arg;
}
if (name == NULL)
- usage (argv[0]);
+ usage (argv[0], 1);
dbus_error_init (&error);
connection = dbus_bus_get (type, &error);
projects / platform / upstream / dbus.git / commitdiff