security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Translate all file descriptors received from assuan.

Browse source
This commit is contained in:
Werner Koch 2007-07-12 15:28:30 +00:00
parent b188c246ca
commit 5f97dd2c44
9 changed files with 86 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
g10/ChangeLog
View file

@ -1,3 +1,9 @@
2007-07-12 Werner Koch <wk@g10code.com>
* gpg.c (main): Use translate_sys2libc_fd_int when passing an int
value.
* gpgv.c (main): Ditto.
2007-07-05 Werner Koch <wk@g10code.com>
* card-util.c (card_generate_subkey, card_store_subkey): Enable

10
g10/gpg.c
View file

@ -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);

2
g10/gpgv.c
View file

@ -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;