+2004-09-12 David Zeuthen <david@fubar.dk>
+
+ Patch from Kay Sievers <kay.sievers@vrfy.org>
+
+ * bus/bus.c (bus_context_new):
+ * bus/bus.h:
+ * bus/main.c (usage)
+ (main):
+ Add commandline option --nofork to override configuration file
+ setting.
+
2004-09-09 Olivier Andrieu <oliv__a@users.sourceforge.net>
* dbus/dbus-*.h: remove the ; after DBUS_(BEGIN|END)_DECLS. Some C
BusContext*
bus_context_new (const DBusString *config_file,
- dbus_bool_t force_fork,
+ ForceForkSetting force_fork,
int print_addr_fd,
int print_pid_fd,
DBusError *error)
}
/* Now become a daemon if appropriate */
- if (force_fork || context->fork)
+ if ((force_fork != FORK_NEVER && context->fork) || force_fork == FORK_ALWAYS)
{
DBusString u;
int reply_timeout; /**< How long to wait before timing out a reply */
} BusLimits;
+typedef enum
+{
+ FORK_FOLLOW_CONFIG_FILE,
+ FORK_ALWAYS,
+ FORK_NEVER
+} ForceForkSetting;
+
BusContext* bus_context_new (const DBusString *config_file,
- dbus_bool_t force_fork,
+ ForceForkSetting force_fork,
int print_addr_fd,
int print_pid_fd,
DBusError *error);
static void
usage (void)
{
- fprintf (stderr, "dbus-daemon-1 [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork]\n");
+ fprintf (stderr, "dbus-daemon-1 [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]] [--print-pid[=DESCRIPTOR]] [--fork] [--nofork]\n");
exit (1);
}
int i;
dbus_bool_t print_address;
dbus_bool_t print_pid;
- dbus_bool_t force_fork;
-
+ int force_fork;
+
if (!_dbus_string_init (&config_file))
return 1;
if (!_dbus_string_init (&pid_fd))
return 1;
-
+
print_address = FALSE;
print_pid = FALSE;
- force_fork = FALSE;
-
+ force_fork = FORK_FOLLOW_CONFIG_FILE;
+
prev_arg = NULL;
i = 1;
while (i < argc)
{
const char *arg = argv[i];
-
+
if (strcmp (arg, "--help") == 0 ||
strcmp (arg, "-h") == 0 ||
strcmp (arg, "-?") == 0)
usage ();
else if (strcmp (arg, "--version") == 0)
version ();
+ else if (strcmp (arg, "--nofork") == 0)
+ force_fork = FORK_NEVER;
else if (strcmp (arg, "--fork") == 0)
- force_fork = TRUE;
+ force_fork = FORK_ALWAYS;
else if (strcmp (arg, "--system") == 0)
{
check_two_config_files (&config_file, "system");