diff options
| author | Werner Koch <[email protected]> | 2007-06-25 11:54:43 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-06-25 11:54:43 +0000 |
| commit | 831cd76256290541a102bc660442918c95a65e6c (patch) | |
| tree | c5b54be81f3530fee16f7d6ecf832a235bdba222 /g10 | |
| parent | Implemented the --gen-key command as we can't use the gpgsm-gencert.sh under ... (diff) | |
| download | gnupg-831cd76256290541a102bc660442918c95a65e6c.tar.gz gnupg-831cd76256290541a102bc660442918c95a65e6c.zip | |
Fixed a problem in estream-printf.c.
Changes for Windows (gpgsm -k does now work).
Minor cleanups.
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 e3db0f80f..2958c9fff 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2007-06-25 Werner Koch <[email protected]> + + * gpg.c (main): Replace iobuf_translate_file_handle by + translate_sys2libc_fd. + * gpgv.c (main): Ditto. + 2007-06-21 Werner Koch <[email protected]> * main.h: Include util.h. @@ -2161,19 +2161,19 @@ main (int argc, char **argv ) case oDebugLevel: debug_level = pargs.r.ret_str; break; case oStatusFD: - set_status_fd( iobuf_translate_file_handle (pargs.r.ret_int, 1) ); + set_status_fd( translate_sys2libc_fd (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(iobuf_translate_file_handle (pargs.r.ret_int, 1)); + set_attrib_fd(translate_sys2libc_fd (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 (iobuf_translate_file_handle (pargs.r.ret_int, 1)); + log_set_fd (translate_sys2libc_fd (pargs.r.ret_int, 1)); break; case oLoggerFile: logfile = pargs.r.ret_str; @@ -2437,14 +2437,14 @@ main (int argc, char **argv ) set_passphrase_from_string(pargs.r.ret_str); break; case oPasswdFD: - pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0); + pwfd = translate_sys2libc_fd (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 = iobuf_translate_file_handle (pargs.r.ret_int, 0); + opt.command_fd = translate_sys2libc_fd (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 73f3be09b..f7cac3457 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -155,7 +155,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 (iobuf_translate_file_handle (pargs.r.ret_int, 1)); + log_set_fd (translate_sys2libc_fd (pargs.r.ret_int, 1)); break; case oHomedir: opt.homedir = pargs.r.ret_str; break; case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break; |