[svn] gpgme - r1214 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2007-04-30 20:37:22 +0200 (Mon, 30 Apr 2007)
New Revision: 1214

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/engine-gpgsm.c
   trunk/gpgme/rungpg.c
Log:
2007-04-30  Marcus Brinkmann  <marcus at g10code.de>

	* engine-gpgsm.c (gpgsm_new): Fix error handling for ttyname_r.
	* rungpg.c (gpg_new): Likewise.
	Submitted by Stephen Tether.


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2007-03-05 11:18:47 UTC (rev 1213)
+++ trunk/gpgme/ChangeLog	2007-04-30 18:37:22 UTC (rev 1214)
@@ -1,3 +1,9 @@
+2007-04-30  Marcus Brinkmann  <marcus at g10code.de>
+
+	* engine-gpgsm.c (gpgsm_new): Fix error handling for ttyname_r.
+	* rungpg.c (gpg_new): Likewise.
+	Submitted by Stephen Tether.
+
 2007-02-26  Werner Koch  <wk at g10code.com>
 
 	* verify.c (op_data_t): New element PLAINTEXT_SEEN.

Modified: trunk/gpgme/engine-gpgsm.c
===================================================================
--- trunk/gpgme/engine-gpgsm.c	2007-03-05 11:18:47 UTC (rev 1213)
+++ trunk/gpgme/engine-gpgsm.c	2007-04-30 18:37:22 UTC (rev 1214)
@@ -448,9 +448,12 @@
 
   if (isatty (1))
     {
-      if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
+      int rc;
+
+      rc = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname));
+      if (rc)
 	{
-	  err = gpg_error_from_errno (errno);
+	  err = gpg_error_from_errno (rc);
 	  goto leave;
 	}
       else

Modified: trunk/gpgme/rungpg.c
===================================================================
--- trunk/gpgme/rungpg.c	2007-03-05 11:18:47 UTC (rev 1213)
+++ trunk/gpgme/rungpg.c	2007-04-30 18:37:22 UTC (rev 1214)
@@ -476,7 +476,10 @@
 
   if (isatty (1))
     {
-      if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
+      int err;
+
+      err = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname));
+      if (err)
 	rc = gpg_error_from_errno (errno);
       else
 	{