From eec70e539e44c288068f26f190d52a5718fd3a10 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 21 Aug 2020 21:16:58 +0200 Subject: [PATCH] common: Use gpgrt functions for mkdir and chdir. * common/sysutils.c (gnupg_mkdir): Divert to gpgrt_mkdir. (gnupg_chdir): Divert to gpgrt_chdir --- common/sysutils.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/common/sysutils.c b/common/sysutils.c index 5f541938b..efc2dfe9b 100644 --- a/common/sysutils.c +++ b/common/sysutils.c @@ -795,29 +795,9 @@ modestr_to_mode (const char *modestr) int gnupg_mkdir (const char *name, const char *modestr) { -#ifdef HAVE_W32CE_SYSTEM - wchar_t *wname; - (void)modestr; - - wname = utf8_to_wchar (name); - if (!wname) - return -1; - if (!CreateDirectoryW (wname, NULL)) - { - xfree (wname); - return -1; /* ERRNO is automagically provided by gpg-error.h. */ - } - xfree (wname); - return 0; -#elif MKDIR_TAKES_ONE_ARG - (void)modestr; - /* Note: In the case of W32 we better use CreateDirectory and try to - set appropriate permissions. However using mkdir is easier - because this sets ERRNO. */ - return mkdir (name); -#else - return mkdir (name, modestr_to_mode (modestr)); -#endif + /* Note that gpgrt_mkdir also sets ERRNO in addition to returing an + * gpg-error style error code. */ + return gpgrt_mkdir (name, modestr); } @@ -826,7 +806,9 @@ gnupg_mkdir (const char *name, const char *modestr) int gnupg_chdir (const char *name) { - return chdir (name); + /* Note that gpgrt_chdir also sets ERRNO in addition to returing an + * gpg-error style error code. */ + return gpgrt_chdir (name); }