diff options
| author | Marcus Brinkmann <[email protected]> | 2007-04-30 18:37:22 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-04-30 18:37:22 +0000 |
| commit | 0bd4e4c4d16d44ac08a7a1adc06ce7402a8784a9 (patch) | |
| tree | e9a44d8ee6f2b60e6eef10f76958004e201c2283 | |
| parent | Post release updates (diff) | |
| download | gpgme-0bd4e4c4d16d44ac08a7a1adc06ce7402a8784a9.tar.gz gpgme-0bd4e4c4d16d44ac08a7a1adc06ce7402a8784a9.zip | |
2007-04-30 Marcus Brinkmann <[email protected]>
* engine-gpgsm.c (gpgsm_new): Fix error handling for ttyname_r.
* rungpg.c (gpg_new): Likewise.
Submitted by Stephen Tether.
| -rw-r--r-- | gpgme/ChangeLog | 6 | ||||
| -rw-r--r-- | gpgme/engine-gpgsm.c | 7 | ||||
| -rw-r--r-- | gpgme/rungpg.c | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 5c31489e..b6900877 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,9 @@ +2007-04-30 Marcus Brinkmann <[email protected]> + + * 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 <[email protected]> * verify.c (op_data_t): New element PLAINTEXT_SEEN. diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index 7bb71cf2..02f506ca 100644 --- a/gpgme/engine-gpgsm.c +++ b/gpgme/engine-gpgsm.c @@ -448,9 +448,12 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir) 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 diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c index 58ab39d8..d6fd8fe1 100644 --- a/gpgme/rungpg.c +++ b/gpgme/rungpg.c @@ -476,7 +476,10 @@ gpg_new (void **engine, const char *file_name, const char *home_dir) 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 { |