mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-15 08:56:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

core-util: Add pa_append_to_home_dir()

Browse source
This commit is contained in:
Tanu Kaskinen 2014-06-08 16:32:57 +03:00
parent 71ead4989a
commit 50042da434
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pulsecore/authkey.c
View file

@ -142,14 +142,11 @@ static char *normalize_path(const char *fn) {
#else #else
if (strlen(fn) < 3 || !IsCharAlpha(fn[0]) || fn[1] != ':' || fn[2] != '\\') { if (strlen(fn) < 3 || !IsCharAlpha(fn[0]) || fn[1] != ':' || fn[2] != '\\') {
#endif #endif
char *homedir, *s; char *s;
if (!(homedir = pa_get_home_dir_malloc())) if (pa_append_to_home_dir(fn, &s) < 0)
return NULL; return NULL;
s = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", homedir, fn);
pa_xfree(homedir);
return s; return s;
} }

17
src/pulsecore/core-util.c
View file

@ -1653,6 +1653,23 @@ char *pa_get_home_dir_malloc(void) {
return homedir; return homedir;
} }
int pa_append_to_home_dir(const char *path, char **_r) {
char *home_dir;
pa_assert(path);
pa_assert(_r);
home_dir = pa_get_home_dir_malloc();
if (!home_dir) {
pa_log("Failed to get home directory.");
return -PA_ERR_NOENTITY;
}
*_r = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", home_dir, path);
pa_xfree(home_dir);
return 0;
}
char *pa_get_binary_name_malloc(void) { char *pa_get_binary_name_malloc(void) {
char *t; char *t;
size_t allocated = 128; size_t allocated = 128;

1
src/pulsecore/core-util.h
View file

@ -138,6 +138,7 @@ char* pa_find_config_file(const char *global, const char *local, const char *env
char *pa_get_runtime_dir(void); char *pa_get_runtime_dir(void);
char *pa_get_state_dir(void); char *pa_get_state_dir(void);
char *pa_get_home_dir_malloc(void); char *pa_get_home_dir_malloc(void);
int pa_append_to_home_dir(const char *path, char **_r);
char *pa_get_binary_name_malloc(void); char *pa_get_binary_name_malloc(void);
char *pa_runtime_path(const char *fn); char *pa_runtime_path(const char *fn);
char *pa_state_path(const char *fn, bool prepend_machine_id); char *pa_state_path(const char *fn, bool prepend_machine_id);