diff options
| author | Ian Geiser <geiseri@geekcentral.pub> | 2017-07-13 12:01:07 -0400 |
|---|---|---|
| committer | metalefty <meta@vmeta.jp> | 2017-07-14 20:52:38 +0900 |
| commit | 4b87548b71566e066a3186c5e0258cfd4a1fedf1 (patch) | |
| tree | 77fd0da1350b0d8a1749f9c91ef3e5f593ad918a /common | |
| parent | 59a7e8aedfdac1ebea0b1e6d362601b6040386ef (diff) | |
| download | xrdp-proprietary-4b87548b71566e066a3186c5e0258cfd4a1fedf1.tar.gz xrdp-proprietary-4b87548b71566e066a3186c5e0258cfd4a1fedf1.zip | |
Use g_create_path instead of g_create_dir
Rename g_mk_temp_dir to g_mk_socket_path
Diffstat (limited to 'common')
| -rw-r--r-- | common/os_calls.c | 14 | ||||
| -rw-r--r-- | common/os_calls.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/common/os_calls.c b/common/os_calls.c index 481fd570..8d2b06c7 100644 --- a/common/os_calls.c +++ b/common/os_calls.c @@ -109,17 +109,17 @@ g_rm_temp_dir(void) /*****************************************************************************/ int -g_mk_temp_dir(const char *app_name) +g_mk_socket_path(const char *app_name) { if (!g_directory_exist(XRDP_SOCKET_PATH)) { - if (!g_create_dir(XRDP_SOCKET_PATH)) + if (!g_create_path(XRDP_SOCKET_PATH)) { /* if failed, still check if it got created by someone else */ if (!g_directory_exist(XRDP_SOCKET_PATH)) { log_message(LOG_LEVEL_ERROR, - "g_mk_temp_dir: g_create_dir(%s) failed", + "g_mk_socket_path: g_create_path(%s) failed", XRDP_SOCKET_PATH); return 1; } @@ -153,7 +153,7 @@ g_init(const char *app_name) setlocale(LC_CTYPE, "en_US.UTF-8"); } - g_mk_temp_dir(app_name); + g_mk_socket_path(app_name); } /*****************************************************************************/ @@ -2954,7 +2954,7 @@ g_execvp(const char *p1, char *args[]) g_rm_temp_dir(); rv = execvp(p1, args); - g_mk_temp_dir(0); + g_mk_socket_path(0); return rv; #endif } @@ -2971,7 +2971,7 @@ g_execlp3(const char *a1, const char *a2, const char *a3) g_rm_temp_dir(); rv = execlp(a1, a2, a3, (void *)0); - g_mk_temp_dir(0); + g_mk_socket_path(0); return rv; #endif } @@ -3067,7 +3067,7 @@ g_fork(void) if (rv == 0) /* child */ { - g_mk_temp_dir(0); + g_mk_socket_path(0); } return rv; diff --git a/common/os_calls.h b/common/os_calls.h index 90db706d..98f87b3e 100644 --- a/common/os_calls.h +++ b/common/os_calls.h @@ -38,7 +38,7 @@ #define g_close_wait_obj g_delete_wait_obj int g_rm_temp_dir(void); -int g_mk_temp_dir(const char* app_name); +int g_mk_socket_path(const char* app_name); void g_init(const char* app_name); void g_deinit(void); void* g_malloc(int size, int zero); |