From 32f336d9555f18464d72a5068c290ab82ee92617 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 23 Oct 2020 20:14:45 +0200 Subject: common: Allow building with released libgpg-error. * common/sysutils.c (gnupg_access) [W32]: Fix for older libgpgrt. -- Fixes-commit: c94ee1386e0d5cdac51086c4d5b92de59c09c9b5 Signed-off-by: Werner Koch --- common/sysutils.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'common/sysutils.c') diff --git a/common/sysutils.c b/common/sysutils.c index 25de374a3..45a6d8c80 100644 --- a/common/sysutils.c +++ b/common/sysutils.c @@ -1105,22 +1105,24 @@ gnupg_getcwd (void) gpg_err_code_t gnupg_access (const char *name, int mode) { -#if GPGRT_VERSION_NUMBER < 0x012800 /* 1.39 */ +#if GPGRT_VERSION_NUMBER < 0x012800 /* 1.40 */ # ifdef HAVE_W32_SYSTEM - wchar_t *wfname; + wchar_t *wname; + gpg_err_code_t ec; - wfname = utf8_to_wchar (fname); - if (!wfname) + wname = utf8_to_wchar (name); + if (!wname) ec = gpg_err_code_from_syserror (); else { - ec = _waccess (wfname, mode)? gpg_err_code_from_syserror () : 0; - xfree (wfname); + ec = _waccess (wname, mode)? gpg_err_code_from_syserror () : 0; + xfree (wname); } + return ec; # else return access (name, mode)? gpg_err_code_from_syserror () : 0; # endif -#else +#else /* gpgrt 1.40 or newer. */ return gpgrt_access (name, mode); #endif } -- cgit