security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

common: Use strconcat in gnupg_setenv. 

* common/sysutils.c (gnupg_setenv): Replace malloc+stpcpy by
strconcat.  Indent cpp conditionals.
(gnupg_unsetenv): Indent cpp conditionals.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-10-25 08:59:44 +02:00
parent 9d6146d6f9
commit 7983f87587
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
common/sysutils.c
View File

@ -754,8 +754,8 @@ gnupg_setenv (const char *name, const char *value, int overwrite)
(void)value;
(void)overwrite;
return 0;
#else
#if defined(HAVE_W32_SYSTEM)
#else /*!W32CE*/
# ifdef HAVE_W32_SYSTEM
/* Windows maintains (at least) two sets of environment variables.
One set can be accessed by GetEnvironmentVariable and
SetEnvironmentVariable. This set is inherited by the children.
@ -773,11 +773,11 @@ gnupg_setenv (const char *name, const char *value, int overwrite)
return -1;
}
}
#endif
# endif /*W32*/
#if defined(HAVE_SETENV)
# ifdef HAVE_SETENV
return setenv (name, value, overwrite);
#else
# else /*!HAVE_SETENV*/
if (! getenv (name) || overwrite)
{
char *buf;
@ -788,18 +788,17 @@ gnupg_setenv (const char *name, const char *value, int overwrite)
gpg_err_set_errno (EINVAL);
return -1;
}
buf = xtrymalloc (strlen (name) + 1 + strlen (value) + 1);
buf = strconcat (name, "=", value, NULL);
if (!buf)
return -1;
strcpy (stpcpy (stpcpy (buf, name), "="), value);
#if __GNUC__
# warning no setenv - using putenv but leaking memory.
#endif
# if __GNUC__
# warning no setenv - using putenv but leaking memory.
# endif
return putenv (buf);
}
return 0;
#endif
#endif
# endif /*!HAVE_SETENV*/
#endif /*!W32CE*/
}
@ -809,8 +808,8 @@ gnupg_unsetenv (const char *name)
#ifdef HAVE_W32CE_SYSTEM
(void)name;
return 0;
#else
#if defined(HAVE_W32_SYSTEM)
#else /*!W32CE*/
# ifdef HAVE_W32_SYSTEM
/* Windows maintains (at least) two sets of environment variables.
One set can be accessed by GetEnvironmentVariable and
SetEnvironmentVariable. This set is inherited by the children.
@ -822,10 +821,11 @@ gnupg_unsetenv (const char *name)
gpg_err_set_errno (EINVAL); /* (Might also be ENOMEM.) */
return -1;
}
#endif
#if defined(HAVE_UNSETENV)
# endif /*W32*/
# ifdef HAVE_UNSETENV
return unsetenv (name);
#else
# else /*!HAVE_UNSETENV*/
{
char *buf;
@ -837,13 +837,13 @@ gnupg_unsetenv (const char *name)
buf = xtrystrdup (name);
if (!buf)
return -1;
#if __GNUC__
# warning no unsetenv - trying putenv but leaking memory.
#endif
# if __GNUC__
# warning no unsetenv - trying putenv but leaking memory.
# endif
return putenv (buf);
}
#endif
#endif
# endif /*!HAVE_UNSETENV*/
#endif /*!W32CE*/
}