From 8c7c4faf3de28ca70a60e6b15f51c1b206e0ddd9 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 20 Oct 2016 16:45:18 +0200 Subject: common,w32: Fix setting environment variables on Windows. * common/sysutils.c (gnupg_setenv): Also update the environment block maintained by the C runtime. (gnupg_unsetenv): Likewise. * tests/gpgscm/ffi.c (do_setenv): Fix error handling. Signed-off-by: Justus Winter --- tests/gpgscm/ffi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c index a0fbe2e64..8e21ba6d3 100644 --- a/tests/gpgscm/ffi.c +++ b/tests/gpgscm/ffi.c @@ -236,7 +236,9 @@ do_setenv (scheme *sc, pointer args) FFI_ARG_OR_RETURN (sc, char *, value, string, args); FFI_ARG_OR_RETURN (sc, int, overwrite, bool, args); FFI_ARGS_DONE_OR_RETURN (sc, args); - FFI_RETURN_ERR (sc, gnupg_setenv (name, value, overwrite)); + if (gnupg_setenv (name, value, overwrite)) + FFI_RETURN_ERR (sc, gpg_error_from_syserror ()); + FFI_RETURN (sc); } static pointer -- cgit v1.2.3