Attachment 84837 Details for Bug 68610 – Move some sysdeps stuff only used by the dbus-daemon outside libdbus

[patch] Move some sysdeps stuff only used by the dbus-daemon outside libdbus

0001-Move-some-sysdeps-stuff-only-used-by-the-dbus-daemon.patch (text/plain), 21.91 KB, created by Simon McVittie on 2013-08-29 12:17:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-08-29 12:17:46 UTC

Size: 21.91 KB

patch

obsolete

>From 44e33dd038e9a0da5d9ba9c1d79bfe93c3cb59ef Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 29 Aug 2013 13:16:14 +0100
>Subject: [PATCH] Move some sysdeps stuff only used by the dbus-daemon outside
> libdbus
>
>This means we don't need to worry about whether it's thread-safe,
>and makes libdbus a little smaller.
>---
> dbus/dbus-sysdeps-unix.c      | 178 ------------------------------------
> dbus/dbus-sysdeps-util-unix.c | 177 ++++++++++++++++++++++++++++++++++++
> dbus/dbus-sysdeps-util-win.c  | 204 ++++++++++++++++++++++++++++++++++++++++++
> dbus/dbus-sysdeps-win.c       | 204 ------------------------------------------
> 4 files changed, 381 insertions(+), 382 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index 52cf092..1cb4a58 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -3572,9 +3572,6 @@ _dbus_read_local_machine_uuid (DBusGUID   *machine_id,
>   return _dbus_read_uuid_file (&filename, machine_id, FALSE, error);
> }
> 
>-#define DBUS_UNIX_STANDARD_SESSION_SERVICEDIR "/dbus-1/services"
>-#define DBUS_UNIX_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
>-
> /**
>  * quries launchd for a specific env var which holds the socket path.
>  * @param socket_path append the socket path to this DBusString
>@@ -3726,167 +3723,6 @@ _dbus_lookup_session_address (dbus_bool_t *supported,
> }
> 
> /**
>- * Returns the standard directories for a session bus to look for service
>- * activation files
>- *
>- * On UNIX this should be the standard xdg freedesktop.org data directories:
>- *
>- * XDG_DATA_HOME=${XDG_DATA_HOME-$HOME/.local/share}
>- * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share}
>- *
>- * and
>- *
>- * DBUS_DATADIR
>- *
>- * @param dirs the directory list we are returning
>- * @returns #FALSE on OOM
>- */
>-
>-dbus_bool_t
>-_dbus_get_standard_session_servicedirs (DBusList **dirs)
>-{
>-  const char *xdg_data_home;
>-  const char *xdg_data_dirs;
>-  DBusString servicedir_path;
>-
>-  if (!_dbus_string_init (&servicedir_path))
>-    return FALSE;
>-
>-  xdg_data_home = _dbus_getenv ("XDG_DATA_HOME");
>-  xdg_data_dirs = _dbus_getenv ("XDG_DATA_DIRS");
>-
>-  if (xdg_data_home != NULL)
>-    {
>-      if (!_dbus_string_append (&servicedir_path, xdg_data_home))
>-        goto oom;
>-    }
>-  else
>-    {
>-      const DBusString *homedir;
>-      DBusString local_share;
>-
>-      if (!_dbus_homedir_from_current_process (&homedir))
>-        goto oom;
>-
>-      if (!_dbus_string_append (&servicedir_path, _dbus_string_get_const_data (homedir)))
>-        goto oom;
>-
>-      _dbus_string_init_const (&local_share, "/.local/share");
>-      if (!_dbus_concat_dir_and_file (&servicedir_path, &local_share))
>-        goto oom;
>-    }
>-
>-  if (!_dbus_string_append (&servicedir_path, ":"))
>-    goto oom;
>-
>-  if (xdg_data_dirs != NULL)
>-    {
>-      if (!_dbus_string_append (&servicedir_path, xdg_data_dirs))
>-        goto oom;
>-
>-      if (!_dbus_string_append (&servicedir_path, ":"))
>-        goto oom;
>-    }
>-  else
>-    {
>-      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
>-        goto oom;
>-    }
>-
>-  /*
>-   * add configured datadir to defaults
>-   * this may be the same as an xdg dir
>-   * however the config parser should take
>-   * care of duplicates
>-   */
>-  if (!_dbus_string_append (&servicedir_path, DBUS_DATADIR))
>-    goto oom;
>-
>-  if (!_dbus_split_paths_and_append (&servicedir_path,
>-                                     DBUS_UNIX_STANDARD_SESSION_SERVICEDIR,
>-                                     dirs))
>-    goto oom;
>-
>-  _dbus_string_free (&servicedir_path);
>-  return TRUE;
>-
>- oom:
>-  _dbus_string_free (&servicedir_path);
>-  return FALSE;
>-}
>-
>-
>-/**
>- * Returns the standard directories for a system bus to look for service
>- * activation files
>- *
>- * On UNIX this should be the standard xdg freedesktop.org data directories:
>- *
>- * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share}
>- *
>- * and
>- *
>- * DBUS_DATADIR
>- *
>- * On Windows there is no system bus and this function can return nothing.
>- *
>- * @param dirs the directory list we are returning
>- * @returns #FALSE on OOM
>- */
>-
>-dbus_bool_t
>-_dbus_get_standard_system_servicedirs (DBusList **dirs)
>-{
>-  /*
>-   * DBUS_DATADIR may be the same as one of the standard directories. However,
>-   * the config parser should take care of the duplicates.
>-   *
>-   * Also, append /lib as counterpart of /usr/share on the root
>-   * directory (the root directory does not know /share), in order to
>-   * facilitate early boot system bus activation where /usr might not
>-   * be available.
>-   */
>-  static const char standard_search_path[] =
>-    "/usr/local/share:"
>-    "/usr/share:"
>-    DBUS_DATADIR ":"
>-    "/lib";
>-  DBusString servicedir_path;
>-
>-  _dbus_string_init_const (&servicedir_path, standard_search_path);
>-
>-  return _dbus_split_paths_and_append (&servicedir_path,
>-                                       DBUS_UNIX_STANDARD_SYSTEM_SERVICEDIR,
>-                                       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.
>@@ -4065,20 +3901,6 @@ _dbus_socket_can_pass_unix_fd(int fd) {
> #endif
> }
> 
>-
>-/*
>- * replaces the term DBUS_PREFIX in configure_time_path by the
>- * current dbus installation directory. On unix this function is a noop
>- *
>- * @param configure_time_path
>- * @return real path
>- */
>-const char *
>-_dbus_replace_install_prefix (const char *configure_time_path)
>-{
>-  return configure_time_path;
>-}
>-
> /**
>  * Closes all file descriptors except the first three (i.e. stdin,
>  * stdout, stderr).
>diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
>index 9ad63b4..631c199 100644
>--- a/dbus/dbus-sysdeps-util-unix.c
>+++ b/dbus/dbus-sysdeps-util-unix.c
>@@ -1178,3 +1178,180 @@ fail:
>   _dbus_string_free (&path);
>   return FALSE;
> }
>+
>+/*
>+ * replaces the term DBUS_PREFIX in configure_time_path by the
>+ * current dbus installation directory. On unix this function is a noop
>+ *
>+ * @param configure_time_path
>+ * @return real path
>+ */
>+const char *
>+_dbus_replace_install_prefix (const char *configure_time_path)
>+{
>+  return configure_time_path;
>+}
>+
>+#define DBUS_UNIX_STANDARD_SESSION_SERVICEDIR "/dbus-1/services"
>+#define DBUS_UNIX_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
>+
>+/**
>+ * Returns the standard directories for a session bus to look for service
>+ * activation files
>+ *
>+ * On UNIX this should be the standard xdg freedesktop.org data directories:
>+ *
>+ * XDG_DATA_HOME=${XDG_DATA_HOME-$HOME/.local/share}
>+ * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share}
>+ *
>+ * and
>+ *
>+ * DBUS_DATADIR
>+ *
>+ * @param dirs the directory list we are returning
>+ * @returns #FALSE on OOM
>+ */
>+
>+dbus_bool_t
>+_dbus_get_standard_session_servicedirs (DBusList **dirs)
>+{
>+  const char *xdg_data_home;
>+  const char *xdg_data_dirs;
>+  DBusString servicedir_path;
>+
>+  if (!_dbus_string_init (&servicedir_path))
>+    return FALSE;
>+
>+  xdg_data_home = _dbus_getenv ("XDG_DATA_HOME");
>+  xdg_data_dirs = _dbus_getenv ("XDG_DATA_DIRS");
>+
>+  if (xdg_data_home != NULL)
>+    {
>+      if (!_dbus_string_append (&servicedir_path, xdg_data_home))
>+        goto oom;
>+    }
>+  else
>+    {
>+      const DBusString *homedir;
>+      DBusString local_share;
>+
>+      if (!_dbus_homedir_from_current_process (&homedir))
>+        goto oom;
>+
>+      if (!_dbus_string_append (&servicedir_path, _dbus_string_get_const_data (homedir)))
>+        goto oom;
>+
>+      _dbus_string_init_const (&local_share, "/.local/share");
>+      if (!_dbus_concat_dir_and_file (&servicedir_path, &local_share))
>+        goto oom;
>+    }
>+
>+  if (!_dbus_string_append (&servicedir_path, ":"))
>+    goto oom;
>+
>+  if (xdg_data_dirs != NULL)
>+    {
>+      if (!_dbus_string_append (&servicedir_path, xdg_data_dirs))
>+        goto oom;
>+
>+      if (!_dbus_string_append (&servicedir_path, ":"))
>+        goto oom;
>+    }
>+  else
>+    {
>+      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
>+        goto oom;
>+    }
>+
>+  /*
>+   * add configured datadir to defaults
>+   * this may be the same as an xdg dir
>+   * however the config parser should take
>+   * care of duplicates
>+   */
>+  if (!_dbus_string_append (&servicedir_path, DBUS_DATADIR))
>+    goto oom;
>+
>+  if (!_dbus_split_paths_and_append (&servicedir_path,
>+                                     DBUS_UNIX_STANDARD_SESSION_SERVICEDIR,
>+                                     dirs))
>+    goto oom;
>+
>+  _dbus_string_free (&servicedir_path);
>+  return TRUE;
>+
>+ oom:
>+  _dbus_string_free (&servicedir_path);
>+  return FALSE;
>+}
>+
>+
>+/**
>+ * Returns the standard directories for a system bus to look for service
>+ * activation files
>+ *
>+ * On UNIX this should be the standard xdg freedesktop.org data directories:
>+ *
>+ * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share}
>+ *
>+ * and
>+ *
>+ * DBUS_DATADIR
>+ *
>+ * On Windows there is no system bus and this function can return nothing.
>+ *
>+ * @param dirs the directory list we are returning
>+ * @returns #FALSE on OOM
>+ */
>+
>+dbus_bool_t
>+_dbus_get_standard_system_servicedirs (DBusList **dirs)
>+{
>+  /*
>+   * DBUS_DATADIR may be the same as one of the standard directories. However,
>+   * the config parser should take care of the duplicates.
>+   *
>+   * Also, append /lib as counterpart of /usr/share on the root
>+   * directory (the root directory does not know /share), in order to
>+   * facilitate early boot system bus activation where /usr might not
>+   * be available.
>+   */
>+  static const char standard_search_path[] =
>+    "/usr/local/share:"
>+    "/usr/share:"
>+    DBUS_DATADIR ":"
>+    "/lib";
>+  DBusString servicedir_path;
>+
>+  _dbus_string_init_const (&servicedir_path, standard_search_path);
>+
>+  return _dbus_split_paths_and_append (&servicedir_path,
>+                                       DBUS_UNIX_STANDARD_SYSTEM_SERVICEDIR,
>+                                       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);
>+}
>diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
>index 71ed8b7..fe4b1a2 100644
>--- a/dbus/dbus-sysdeps-util-win.c
>+++ b/dbus/dbus-sysdeps-util-win.c
>@@ -1528,3 +1528,207 @@ _dbus_command_for_pid (unsigned long  pid,
>   // FIXME
>   return FALSE;
> }
>+
>+/*
>+ * replaces the term DBUS_PREFIX in configure_time_path by the
>+ * current dbus installation directory. On unix this function is a noop
>+ *
>+ * @param configure_time_path
>+ * @return real path
>+ */
>+const char *
>+_dbus_replace_install_prefix (const char *configure_time_path)
>+{
>+#ifndef DBUS_PREFIX
>+  return configure_time_path;
>+#else
>+  static char retval[1000];
>+  static char runtime_prefix[1000];
>+  int len = 1000;
>+  int i;
>+
>+  if (!configure_time_path)
>+    return NULL;
>+
>+  if ((!_dbus_get_install_root(runtime_prefix, len) ||
>+       strncmp (configure_time_path, DBUS_PREFIX "/",
>+                strlen (DBUS_PREFIX) + 1))) {
>+     strcat (retval, configure_time_path);
>+     return retval;
>+  }
>+
>+  strcpy (retval, runtime_prefix);
>+  strcat (retval, configure_time_path + strlen (DBUS_PREFIX) + 1);
>+
>+  /* Somehow, in some situations, backslashes get collapsed in the string.
>+   * Since windows C library accepts both forward and backslashes as
>+   * path separators, convert all backslashes to forward slashes.
>+   */
>+
>+  for(i = 0; retval[i] != '\0'; i++) {
>+    if(retval[i] == '\\')
>+      retval[i] = '/';
>+  }
>+  return retval;
>+#endif
>+}
>+
>+/**
>+ * return the relocated DATADIR
>+ *
>+ * @returns relocated DATADIR static string
>+ */
>+
>+static const char *
>+_dbus_windows_get_datadir (void)
>+{
>+	return _dbus_replace_install_prefix(DBUS_DATADIR);
>+}
>+
>+#undef DBUS_DATADIR
>+#define DBUS_DATADIR _dbus_windows_get_datadir ()
>+
>+
>+#define DBUS_STANDARD_SESSION_SERVICEDIR "/dbus-1/services"
>+#define DBUS_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
>+
>+/**
>+ * Returns the standard directories for a session bus to look for service
>+ * activation files
>+ *
>+ * On Windows this should be data directories:
>+ *
>+ * %CommonProgramFiles%/dbus
>+ *
>+ * and
>+ *
>+ * relocated DBUS_DATADIR
>+ *
>+ * @param dirs the directory list we are returning
>+ * @returns #FALSE on OOM
>+ */
>+
>+dbus_bool_t
>+_dbus_get_standard_session_servicedirs (DBusList **dirs)
>+{
>+  const char *common_progs;
>+  DBusString servicedir_path;
>+
>+  if (!_dbus_string_init (&servicedir_path))
>+    return FALSE;
>+
>+#ifdef DBUS_WINCE
>+  {
>+    /* On Windows CE, we adjust datadir dynamically to installation location.  */
>+    const char *data_dir = _dbus_getenv ("DBUS_DATADIR");
>+
>+    if (data_dir != NULL)
>+      {
>+        if (!_dbus_string_append (&servicedir_path, data_dir))
>+          goto oom;
>+
>+        if (!_dbus_string_append (&servicedir_path, _DBUS_PATH_SEPARATOR))
>+          goto oom;
>+      }
>+  }
>+#else
>+/*
>+ the code for accessing services requires absolute base pathes
>+ in case DBUS_DATADIR is relative make it absolute
>+*/
>+#ifdef DBUS_WIN
>+  {
>+    DBusString p;
>+
>+    _dbus_string_init_const (&p, DBUS_DATADIR);
>+
>+    if (!_dbus_path_is_absolute (&p))
>+      {
>+        char install_root[1000];
>+        if (_dbus_get_install_root (install_root, sizeof(install_root)))
>+          if (!_dbus_string_append (&servicedir_path, install_root))
>+            goto oom;
>+      }
>+  }
>+#endif
>+  if (!_dbus_string_append (&servicedir_path, DBUS_DATADIR))
>+    goto oom;
>+
>+  if (!_dbus_string_append (&servicedir_path, _DBUS_PATH_SEPARATOR))
>+    goto oom;
>+#endif
>+
>+  common_progs = _dbus_getenv ("CommonProgramFiles");
>+
>+  if (common_progs != NULL)
>+    {
>+      if (!_dbus_string_append (&servicedir_path, common_progs))
>+        goto oom;
>+
>+      if (!_dbus_string_append (&servicedir_path, _DBUS_PATH_SEPARATOR))
>+        goto oom;
>+    }
>+
>+  if (!_dbus_split_paths_and_append (&servicedir_path,
>+                               DBUS_STANDARD_SESSION_SERVICEDIR,
>+                               dirs))
>+    goto oom;
>+
>+  _dbus_string_free (&servicedir_path);
>+  return TRUE;
>+
>+ oom:
>+  _dbus_string_free (&servicedir_path);
>+  return FALSE;
>+}
>+
>+/**
>+ * Returns the standard directories for a system bus to look for service
>+ * activation files
>+ *
>+ * On UNIX this should be the standard xdg freedesktop.org data directories:
>+ *
>+ * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share}
>+ *
>+ * and
>+ *
>+ * DBUS_DATADIR
>+ *
>+ * On Windows there is no system bus and this function can return nothing.
>+ *
>+ * @param dirs the directory list we are returning
>+ * @returns #FALSE on OOM
>+ */
>+
>+dbus_bool_t
>+_dbus_get_standard_system_servicedirs (DBusList **dirs)
>+{
>+  *dirs = NULL;
>+  return TRUE;
>+}
>+
>+/**
>+ * 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_get_config_file_name(str, "system.conf");
>+}
>+
>+/**
>+ * 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_get_config_file_name(str, "session.conf");
>+}
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 68bd3a1..a77e5b5 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -2347,50 +2347,6 @@ _dbus_delete_file (const DBusString *filename,
>     return TRUE;
> }
> 
>-/*
>- * replaces the term DBUS_PREFIX in configure_time_path by the
>- * current dbus installation directory. On unix this function is a noop
>- *
>- * @param configure_time_path
>- * @return real path
>- */
>-const char *
>-_dbus_replace_install_prefix (const char *configure_time_path)
>-{
>-#ifndef DBUS_PREFIX
>-  return configure_time_path;
>-#else
>-  static char retval[1000];
>-  static char runtime_prefix[1000];
>-  int len = 1000;
>-  int i;
>-
>-  if (!configure_time_path)
>-    return NULL;
>-
>-  if ((!_dbus_get_install_root(runtime_prefix, len) ||
>-       strncmp (configure_time_path, DBUS_PREFIX "/",
>-                strlen (DBUS_PREFIX) + 1))) {
>-     strcat (retval, configure_time_path);
>-     return retval;
>-  }
>-
>-  strcpy (retval, runtime_prefix);
>-  strcat (retval, configure_time_path + strlen (DBUS_PREFIX) + 1);
>-
>-  /* Somehow, in some situations, backslashes get collapsed in the string.
>-   * Since windows C library accepts both forward and backslashes as
>-   * path separators, convert all backslashes to forward slashes.
>-   */
>-
>-  for(i = 0; retval[i] != '\0'; i++) {
>-    if(retval[i] == '\\')
>-      retval[i] = '/';
>-  }
>-  return retval;
>-#endif
>-}
>-
> #if !defined (DBUS_DISABLE_ASSERT) || defined(DBUS_ENABLE_EMBEDDED_TESTS)
> 
> #if defined(_MSC_VER) || defined(DBUS_WINCE)
>@@ -3230,140 +3186,6 @@ _dbus_make_file_world_readable(const DBusString *filename,
> }
> 
> /**
>- * return the relocated DATADIR
>- *
>- * @returns relocated DATADIR static string
>- */
>-
>-static const char *
>-_dbus_windows_get_datadir (void)
>-{
>-	return _dbus_replace_install_prefix(DBUS_DATADIR);
>-}
>-
>-#undef DBUS_DATADIR
>-#define DBUS_DATADIR _dbus_windows_get_datadir ()
>-
>-
>-#define DBUS_STANDARD_SESSION_SERVICEDIR "/dbus-1/services"
>-#define DBUS_STANDARD_SYSTEM_SERVICEDIR "/dbus-1/system-services"
>-
>-/**
>- * Returns the standard directories for a session bus to look for service 
>- * activation files 
>- *
>- * On Windows this should be data directories:
>- *
>- * %CommonProgramFiles%/dbus
>- *
>- * and
>- *
>- * relocated DBUS_DATADIR
>- *
>- * @param dirs the directory list we are returning
>- * @returns #FALSE on OOM 
>- */
>-
>-dbus_bool_t 
>-_dbus_get_standard_session_servicedirs (DBusList **dirs)
>-{
>-  const char *common_progs;
>-  DBusString servicedir_path;
>-
>-  if (!_dbus_string_init (&servicedir_path))
>-    return FALSE;
>-
>-#ifdef DBUS_WINCE
>-  {
>-    /* On Windows CE, we adjust datadir dynamically to installation location.  */
>-    const char *data_dir = _dbus_getenv ("DBUS_DATADIR");
>-
>-    if (data_dir != NULL)
>-      {
>-        if (!_dbus_string_append (&servicedir_path, data_dir))
>-          goto oom;
>-        
>-        if (!_dbus_string_append (&servicedir_path, _DBUS_PATH_SEPARATOR))
>-          goto oom;
>-      }
>-  }
>-#else
>-/*
>- the code for accessing services requires absolute base pathes
>- in case DBUS_DATADIR is relative make it absolute
>-*/
>-#ifdef DBUS_WIN
>-  {
>-    DBusString p;
>-
>-    _dbus_string_init_const (&p, DBUS_DATADIR);
>-
>-    if (!_dbus_path_is_absolute (&p))
>-      {
>-        char install_root[1000];
>-        if (_dbus_get_install_root (install_root, sizeof(install_root)))
>-          if (!_dbus_string_append (&servicedir_path, install_root))
>-            goto oom;
>-      }
>-  }
>-#endif
>-  if (!_dbus_string_append (&servicedir_path, DBUS_DATADIR))
>-    goto oom;
>-
>-  if (!_dbus_string_append (&servicedir_path, _DBUS_PATH_SEPARATOR))
>-    goto oom;
>-#endif
>-
>-  common_progs = _dbus_getenv ("CommonProgramFiles");
>-
>-  if (common_progs != NULL)
>-    {
>-      if (!_dbus_string_append (&servicedir_path, common_progs))
>-        goto oom;
>-
>-      if (!_dbus_string_append (&servicedir_path, _DBUS_PATH_SEPARATOR))
>-        goto oom;
>-    }
>-
>-  if (!_dbus_split_paths_and_append (&servicedir_path, 
>-                               DBUS_STANDARD_SESSION_SERVICEDIR, 
>-                               dirs))
>-    goto oom;
>-
>-  _dbus_string_free (&servicedir_path);  
>-  return TRUE;
>-
>- oom:
>-  _dbus_string_free (&servicedir_path);
>-  return FALSE;
>-}
>-
>-/**
>- * Returns the standard directories for a system bus to look for service
>- * activation files
>- *
>- * On UNIX this should be the standard xdg freedesktop.org data directories:
>- *
>- * XDG_DATA_DIRS=${XDG_DATA_DIRS-/usr/local/share:/usr/share}
>- *
>- * and
>- *
>- * DBUS_DATADIR
>- *
>- * On Windows there is no system bus and this function can return nothing.
>- *
>- * @param dirs the directory list we are returning
>- * @returns #FALSE on OOM
>- */
>-
>-dbus_bool_t
>-_dbus_get_standard_system_servicedirs (DBusList **dirs)
>-{
>-  *dirs = NULL;
>-  return TRUE;
>-}
>-
>-/**
>  * Atomically increments an integer
>  *
>  * @param atomic pointer to the integer to increment
>@@ -3550,32 +3372,6 @@ _dbus_get_config_file_name(DBusString *config_file, char *s)
>   return TRUE;
> }    
> 
>-/**
>- * 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_get_config_file_name(str, "system.conf");
>-}
>-
>-/**
>- * 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_get_config_file_name(str, "session.conf");
>-}
>-
> /* See comment in dbus-sysdeps-unix.c */
> dbus_bool_t
> _dbus_lookup_session_address (dbus_bool_t *supported,
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68610: 84714 | 84715 | 84830 | 84831 | 84832 | 84833 | 84834 | 84837 | 85080 | 85113 | 85241

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.