diff options
Diffstat (limited to 'dbus/dbus-sysdeps-win.c')
-rw-r--r-- | dbus/dbus-sysdeps-win.c | 125 |
1 files changed, 3 insertions, 122 deletions
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 64c2f99d..b86c977b 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -5048,125 +5048,6 @@ _dbus_make_file_world_readable(const DBusString *filename, #define DBUS_STANDARD_SESSION_SERVICEDIR "/dbus-1/services" -// @TODO: this function is duplicated from dbus-sysdeps-unix.c -// and differs only in the path separator, may be we should -// use a dbus path separator variable - -#define _dbus_path_seperator ";" - -static dbus_bool_t -split_paths_and_append (DBusString *dirs, - const char *suffix, - DBusList **dir_list) -{ - int start; - int i; - int len; - char *cpath; - const DBusString file_suffix; - - start = 0; - i = 0; - - _dbus_string_init_const (&file_suffix, suffix); - - len = _dbus_string_get_length (dirs); - - while (_dbus_string_find (dirs, start, _dbus_path_seperator, &i)) - { - DBusString path; - - if (!_dbus_string_init (&path)) - goto oom; - - if (!_dbus_string_copy_len (dirs, - start, - i - start, - &path, - 0)) - { - _dbus_string_free (&path); - goto oom; - } - - _dbus_string_chop_white (&path); - - /* check for an empty path */ - if (_dbus_string_get_length (&path) == 0) - goto next; - - if (!_dbus_concat_dir_and_file (&path, - &file_suffix)) - { - _dbus_string_free (&path); - goto oom; - } - - if (!_dbus_string_copy_data(&path, &cpath)) - { - _dbus_string_free (&path); - goto oom; - } - - if (!_dbus_list_append (dir_list, cpath)) - { - _dbus_string_free (&path); - dbus_free (cpath); - goto oom; - } - - next: - _dbus_string_free (&path); - start = i + 1; - } - - if (start != len) - { - DBusString path; - - if (!_dbus_string_init (&path)) - goto oom; - - if (!_dbus_string_copy_len (dirs, - start, - len - start, - &path, - 0)) - { - _dbus_string_free (&path); - goto oom; - } - - if (!_dbus_concat_dir_and_file (&path, - &file_suffix)) - { - _dbus_string_free (&path); - goto oom; - } - - if (!_dbus_string_copy_data(&path, &cpath)) - { - _dbus_string_free (&path); - goto oom; - } - - if (!_dbus_list_append (dir_list, cpath)) - { - _dbus_string_free (&path); - dbus_free (cpath); - goto oom; - } - - _dbus_string_free (&path); - } - - return TRUE; - - oom: - _dbus_list_foreach (dir_list, (DBusForeachFunction)dbus_free, NULL); - _dbus_list_clear (dir_list); - return FALSE; -} /** * Returns the standard directories for a session bus to look for service @@ -5193,7 +5074,7 @@ _dbus_get_standard_session_servicedirs (DBusList **dirs) if (!_dbus_string_init (&servicedir_path)) return FALSE; - if (!_dbus_string_append (&servicedir_path, DBUS_DATADIR";")) + if (!_dbus_string_append (&servicedir_path, DBUS_DATADIR _DBUS_PATH_SEPARATOR)) goto oom; common_progs = _dbus_getenv ("CommonProgramFiles"); @@ -5203,11 +5084,11 @@ _dbus_get_standard_session_servicedirs (DBusList **dirs) if (!_dbus_string_append (&servicedir_path, common_progs)) goto oom; - if (!_dbus_string_append (&servicedir_path, ";")) + if (!_dbus_string_append (&servicedir_path, _DBUS_PATH_SEPARATOR)) goto oom; } - if (!split_paths_and_append (&servicedir_path, + if (!_dbus_split_paths_and_append (&servicedir_path, DBUS_STANDARD_SESSION_SERVICEDIR, dirs)) goto oom; |