diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | bus/Makefile.am | 4 | ||||
| -rw-r--r-- | bus/main.c | 10 | ||||
| -rw-r--r-- | dbus/Makefile.am | 5 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 26 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.h | 3 |
6 files changed, 47 insertions, 12 deletions
@@ -1,5 +1,16 @@ 2007-06-15 Havoc Pennington <hp@redhat.com> + * dbus/dbus-sysdeps-unix.c (_dbus_append_session_config_file) + (_dbus_append_system_config_file): new functions + + * bus/main.c (main): use _dbus_append_system_config_file() and + _dbus_append_session_config_file() + + * dbus/Makefile.am (INCLUDES): move DBUS_SYSTEM_CONFIG_FILE and + DBUS_SESSION_CONFIG_FILE into this makefile + +2007-06-15 Havoc Pennington <hp@redhat.com> + * dbus/dbus-sysdeps.c (_dbus_set_errno_to_zero) (_dbus_get_is_errno_nonzero, _dbus_get_is_errno_eintr) (_dbus_strerror_from_errno): family of functions to abstract diff --git a/bus/Makefile.am b/bus/Makefile.am index 0ba5f341..f7fec99a 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -2,9 +2,7 @@ configdir=$(sysconfdir)/dbus-1 INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \ - -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION \ - -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ - -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" + -DDAEMON_NAME=\"dbus-daemon\" -DDBUS_COMPILATION EFENCE= @@ -291,21 +291,15 @@ main (int argc, char **argv) { check_two_config_files (&config_file, "system"); - if (!_dbus_string_append (&config_file, DBUS_SYSTEM_CONFIG_FILE)) + if (!_dbus_append_system_config_file (&config_file)) exit (1); } else if (strcmp (arg, "--session") == 0) { check_two_config_files (&config_file, "session"); -#ifdef DBUS_WIN - if (!_dbus_get_config_file_name (&config_file,"session.conf")) + if (!_dbus_append_session_config_file (&config_file)) exit (1); - /* don't know how to map DBUS_SESSION_CONFIG_FILE to the function above */ -#else - if (!_dbus_string_append (&config_file, DBUS_SESSION_CONFIG_FILE)) - exit (1); -#endif } else if (strstr (arg, "--config-file=") == arg) { diff --git a/dbus/Makefile.am b/dbus/Makefile.am index d27ca6f4..81f90b9b 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -1,7 +1,10 @@ configdir=$(sysconfdir)/dbus-1 -INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" +INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION \ + -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ + -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ + -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" dbusincludedir=$(includedir)/dbus-1.0/dbus dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 1e4cf8dd..ea8abcff 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -2906,6 +2906,32 @@ _dbus_get_standard_session_servicedirs (DBusList **dirs) } /** + * Append the absolute path of the system.conf file + * (there is no system bus on Windows so this can just + * return FALSE and print a warning or something) + * + * @param str the string to append to + * @returns #FALSE if no memory + */ +dbus_bool_t +_dbus_append_system_config_file (DBusString *str) +{ + return _dbus_string_append (str, DBUS_SYSTEM_CONFIG_FILE); +} + +/** + * Append the absolute path of the session.conf file. + * + * @param str the string to append to + * @returns #FALSE if no memory + */ +dbus_bool_t +_dbus_append_session_config_file (DBusString *str) +{ + return _dbus_string_append (str, DBUS_SESSION_CONFIG_FILE); +} + +/** * Called when the bus daemon is signaled to reload its configuration; any * caches should be nuked. Of course any caches that need explicit reload * are probably broken, but c'est la vie. diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 49524e3b..069d9ace 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -261,6 +261,9 @@ dbus_bool_t _dbus_path_is_absolute (const DBusString *filename); dbus_bool_t _dbus_get_standard_session_servicedirs (DBusList **dirs); +dbus_bool_t _dbus_append_system_config_file (DBusString *str); +dbus_bool_t _dbus_append_session_config_file (DBusString *str); + typedef struct { int fd_or_handle; } DBusPipe; |