security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-02 16:43:03 +01:00
Code Activity

Fixed use-agent and lock-multiple for RISC OS

Browse Source
This commit is contained in:
Stefan Bellon 2001-08-21 18:09:56 +00:00
parent f3f5665cf6
commit 62893478bf
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2001-08-21 Stefan Bellon <sbellon@sbellon.de>
* trustdb.c (query_trust_info): Changed trustlevel to signed int.
* g10.c [__riscos__]: Fixed handling of --use-agent --lock-multiple.
2001-08-20 Werner Koch <wk@gnupg.org> 2001-08-20 Werner Koch <wk@gnupg.org>
* encr-data.c (decrypt_data): Keep track on whether we already * encr-data.c (decrypt_data): Keep track on whether we already
@ -14,7 +19,7 @@
* sign.c (sign_and_symencrypt): New. * sign.c (sign_and_symencrypt): New.
Applied patches from Stefan Bellon <sbellon@sbellon.de> to support Applied patches from Stefan Bellon <sbellon@sbellon.de> to support
the RISCOS. Nearly all of these patches are identified by the RISC OS. Nearly all of these patches are identified by the
__riscos__ macro. __riscos__ macro.
* compress.c: Added a couple of casts. * compress.c: Added a couple of casts.
* g10.c [__riscos__]: Some patches and new options foo-file similar * g10.c [__riscos__]: Some patches and new options foo-file similar
@ -25,7 +30,7 @@
* trustdb.c (check_trust): Changed r_trustlevel to signed int to * trustdb.c (check_trust): Changed r_trustlevel to signed int to
avoid mismatch problems in pkclist.c avoid mismatch problems in pkclist.c
* pkclist.c (add_ownertrust): Ditto. * pkclist.c (add_ownertrust): Ditto.
* plaintext.c (handle_plaintext) [__riscos__]: RPint a note when * plaintext.c (handle_plaintext) [__riscos__]: Print a note when
file can't be created. file can't be created.
* options.h [__riscos__]: Use an extern unless included from the * options.h [__riscos__]: Use an extern unless included from the
main module. main module.

21
g10/g10.c
View File

@ -854,7 +854,14 @@ main( int argc, char **argv )
case oKOption: set_cmd( &cmd, aKMode ); break; case oKOption: set_cmd( &cmd, aKMode ); break;
case oBatch: opt.batch = 1; nogreeting = 1; break; case oBatch: opt.batch = 1; nogreeting = 1; break;
case oUseAgent: opt.use_agent = 1; break; case oUseAgent:
#ifndef __riscos__
opt.use_agent = 1;
#else /* __riscos__ */
opt.use_agent = 0;
not_implemented("use-agent");
#endif /* __riscos__ */
break;
case oAnswerYes: opt.answer_yes = 1; break; case oAnswerYes: opt.answer_yes = 1; break;
case oAnswerNo: opt.answer_no = 1; break; case oAnswerNo: opt.answer_no = 1; break;
case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break; case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
@ -1027,10 +1034,11 @@ main( int argc, char **argv )
case oLockOnce: opt.lock_once = 1; break; case oLockOnce: opt.lock_once = 1; break;
case oLockNever: disable_dotlock(); break; case oLockNever: disable_dotlock(); break;
case oLockMultiple: case oLockMultiple:
#ifndef __riscos__
opt.lock_once = 0; opt.lock_once = 0;
#ifdef __riscos__ #else /* __riscos__ */
not_implemented("lock-multiple"); not_implemented("lock-multiple");
#endif #endif /* __riscos__ */
break; break;
case oKeyServer: opt.keyserver_name = pargs.r.ret_str; break; case oKeyServer: opt.keyserver_name = pargs.r.ret_str; break;
@ -1174,13 +1182,6 @@ main( int argc, char **argv )
if (preference_list && keygen_set_std_prefs (preference_list)) if (preference_list && keygen_set_std_prefs (preference_list))
log_error(_("invalid preferences\n")); log_error(_("invalid preferences\n"));
#ifdef __riscos__
if (opt.use_agent) {
opt.use_agent = 0;
not_implemented ("use-agent");
}
#endif
if( log_get_errorcount(0) ) if( log_get_errorcount(0) )
g10_exit(2); g10_exit(2);