GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2006-11-29 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* rungpg.c: Include <unistd.h>.
	(gpg_new): Support --display, --ttyname, --ttytype, --lc-ctype and
	--lc-messages.  Fixes issue 734.
This commit is contained in:
Marcus Brinkmann 2006-11-29 15:44:29 +00:00
parent 27e9625668
commit 7a1e9447e5
2 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gpgme/ChangeLog
View File

@ -1,3 +1,9 @@
2006-11-29 Marcus Brinkmann <marcus@g10code.de>
* rungpg.c: Include <unistd.h>.
(gpg_new): Support --display, --ttyname, --ttytype, --lc-ctype and
--lc-messages. Fixes issue 734.
2006-10-24 Marcus Brinkmann <marcus@g10code.de> 2006-10-24 Marcus Brinkmann <marcus@g10code.de>
* trustlist.c (gpgme_op_trustlist_next): Return error if OPD is * trustlist.c (gpgme_op_trustlist_next): Return error if OPD is

62
gpgme/rungpg.c
View File

@ -27,6 +27,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <unistd.h>
#include "gpgme.h" #include "gpgme.h"
#include "util.h" #include "util.h"
@ -344,6 +345,9 @@ gpg_new (void **engine, const char *file_name, const char *home_dir,
{ {
engine_gpg_t gpg; engine_gpg_t gpg;
gpgme_error_t rc = 0; gpgme_error_t rc = 0;
char *dft_display = NULL;
char dft_ttyname[64];
char *dft_ttytype = NULL;
gpg = calloc (1, sizeof *gpg); gpg = calloc (1, sizeof *gpg);
if (!gpg) if (!gpg)
@ -423,6 +427,64 @@ gpg_new (void **engine, const char *file_name, const char *home_dir,
rc = add_arg (gpg, "utf8"); rc = add_arg (gpg, "utf8");
if (!rc) if (!rc)
rc = add_arg (gpg, "--enable-progress-filter"); rc = add_arg (gpg, "--enable-progress-filter");
if (rc)
goto leave;
rc = _gpgme_getenv ("DISPLAY", &dft_display);
if (dft_display)
{
rc = add_arg (gpg, "--display");
if (!rc)
rc = add_arg (gpg, dft_display);
free (dft_display);
}
if (rc)
goto leave;
if (isatty (1))
{
if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
rc = gpg_error_from_errno (errno);
else
{
rc = add_arg (gpg, "--ttyname");
if (!rc)
rc = add_arg (gpg, dft_ttyname);
if (!rc)
{
rc = _gpgme_getenv ("TERM", &dft_ttytype);
if (!rc)
goto leave;
rc = add_arg (gpg, "--ttytype");
if (!rc)
rc = add_arg (gpg, dft_ttytype);
free (dft_ttytype);
}
}
if (rc)
goto leave;
}
if (lc_ctype)
{
rc = add_arg (gpg, "--lc-ctype");
if (!rc)
rc = add_arg (gpg, lc_ctype);
if (rc)
goto leave;
}
if (lc_messages)
{
rc = add_arg (gpg, "--lc-messages");
if (!rc)
rc = add_arg (gpg, lc_messages);
if (rc)
goto leave;
}
leave: leave:
if (rc) if (rc)