diff options
| author | Werner Koch <[email protected]> | 2007-07-12 15:28:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-07-12 15:28:30 +0000 |
| commit | 5f97dd2c44662784d63e62862a38ef7164d8758e (patch) | |
| tree | c5db7a48d285d1d67c6b21d97f35f30d2058595e /g10 | |
| parent | Typo fixes. (diff) | |
| download | gnupg-5f97dd2c44662784d63e62862a38ef7164d8758e.tar.gz gnupg-5f97dd2c44662784d63e62862a38ef7164d8758e.zip | |
Translate all file descriptors received from assuan.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/gpg.c | 10 | ||||
| -rw-r--r-- | g10/gpgv.c | 2 |
3 files changed, 12 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 6c6e5afd3..86d1da562 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2007-07-12 Werner Koch <[email protected]> + + * gpg.c (main): Use translate_sys2libc_fd_int when passing an int + value. + * gpgv.c (main): Ditto. + 2007-07-05 Werner Koch <[email protected]> * card-util.c (card_generate_subkey, card_store_subkey): Enable @@ -2160,19 +2160,19 @@ main (int argc, char **argv ) case oDebugLevel: debug_level = pargs.r.ret_str; break; case oStatusFD: - set_status_fd( translate_sys2libc_fd (pargs.r.ret_int, 1) ); + set_status_fd( translate_sys2libc_fd_int (pargs.r.ret_int, 1) ); break; case oStatusFile: set_status_fd ( open_info_file (pargs.r.ret_str, 1) ); break; case oAttributeFD: - set_attrib_fd(translate_sys2libc_fd (pargs.r.ret_int, 1)); + set_attrib_fd(translate_sys2libc_fd_int (pargs.r.ret_int, 1)); break; case oAttributeFile: set_attrib_fd ( open_info_file (pargs.r.ret_str, 1) ); break; case oLoggerFD: - log_set_fd (translate_sys2libc_fd (pargs.r.ret_int, 1)); + log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1)); break; case oLoggerFile: logfile = pargs.r.ret_str; @@ -2436,14 +2436,14 @@ main (int argc, char **argv ) set_passphrase_from_string(pargs.r.ret_str); break; case oPasswdFD: - pwfd = translate_sys2libc_fd (pargs.r.ret_int, 0); + pwfd = translate_sys2libc_fd_int (pargs.r.ret_int, 0); break; case oPasswdFile: pwfd = open_info_file (pargs.r.ret_str, 0); break; case oPasswdRepeat: opt.passwd_repeat=pargs.r.ret_int; break; case oCommandFD: - opt.command_fd = translate_sys2libc_fd (pargs.r.ret_int, 0); + opt.command_fd = translate_sys2libc_fd_int (pargs.r.ret_int, 0); break; case oCommandFile: opt.command_fd = open_info_file (pargs.r.ret_str, 0); diff --git a/g10/gpgv.c b/g10/gpgv.c index a2343ae85..9b1fe2aed 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -154,7 +154,7 @@ main( int argc, char **argv ) case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break; case oStatusFD: set_status_fd( pargs.r.ret_int ); break; case oLoggerFD: - log_set_fd (translate_sys2libc_fd (pargs.r.ret_int, 1)); + log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1)); break; case oHomedir: opt.homedir = pargs.r.ret_str; break; case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break; |