1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-30 11:31:32 +01:00

scd: Use gpgrt_spawn_actions_set_env_rev to have clean semantics.

* scd/app.c (report_change): Use gpgrt_spawn_actions_set_env_rev.

--

It's UTF-8 string.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-12-20 11:45:45 +09:00
parent 893e5e7c6f
commit ab8a2408a3
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054

View File

@ -2494,12 +2494,7 @@ report_change (int slot, int old_status, int cur_status)
xfree (fname);
homestr = make_filename (gnupg_homedir (), NULL);
#ifdef HAVE_W32_SYSTEM
/* An environment block is terminated by two zero bytes. */
if (gpgrt_asprintf (&envstr, "GNUPGHOME=%s%c", homestr, 0) < 0)
#else
if (gpgrt_asprintf (&envstr, "GNUPGHOME=%s", homestr) < 0)
#endif
log_error ("out of core while building environment\n");
else
{
@ -2527,12 +2522,9 @@ report_change (int slot, int old_status, int cur_status)
err = gpgrt_spawn_actions_new (&act);
if (!err)
{
#ifdef HAVE_W32_SYSTEM
gpgrt_spawn_actions_set_envvars (act, envstr);
#else
char *env[2] = { envstr, NULL };
gpgrt_spawn_actions_set_environ (act, env);
#endif
const char *envchange[2] = { envstr, NULL };
gpgrt_spawn_actions_set_env_rev (act, envchange);
err = gpgrt_process_spawn (fname, args, GPGRT_PROCESS_DETACHED,
act, NULL);
gpgrt_spawn_actions_release (act);