Rocco Rutte:
- use putenv() instead of setenv() (this one from mutt-dev is more elegant than mine)
git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@539
e385b8ad-14ed-0310-8656-
cc95a2468c6d
}
int pgp_use_gpg_agent (void) {
}
int pgp_use_gpg_agent (void) {
if (!option (OPTUSEGPGAGENT) || !getenv ("GPG_AGENT_INFO"))
return 0;
if (!option (OPTUSEGPGAGENT) || !getenv ("GPG_AGENT_INFO"))
return 0;
- if ((tty = ttyname(0))) {
- char tmp[SHORT_STRING];
- snprintf (tmp, sizeof (tmp), "GPG_TTY=%s", tty);
- putenv (tmp);
-#if 0
- setenv("GPG_TTY", tty, 0);
-#endif
+ if ((tty = ttyname(0)) &&
+ ((ttybuf = mem_malloc (sizeof("GPG_TTY") + strlen(tty) + 1)))) {
+ snprintf (ttybuf, sizeof (ttybuf), "GPG_TTY=%s", tty);
+ putenv (ttybuf);