From 62893478bf83b716a29a5b063bdb73ff256bc32c Mon Sep 17 00:00:00 2001 From: Stefan Bellon Date: Tue, 21 Aug 2001 18:09:56 +0000 Subject: [PATCH] Fixed use-agent and lock-multiple for RISC OS --- g10/ChangeLog | 9 +++++++-- g10/g10.c | 25 +++++++++++++------------ 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 0ffbf1f0c..1b8052b64 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2001-08-21 Stefan Bellon + + * 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 * encr-data.c (decrypt_data): Keep track on whether we already @@ -14,7 +19,7 @@ * sign.c (sign_and_symencrypt): New. Applied patches from Stefan Bellon 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. * compress.c: Added a couple of casts. * 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 avoid mismatch problems in pkclist.c * 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. * options.h [__riscos__]: Use an extern unless included from the main module. diff --git a/g10/g10.c b/g10/g10.c index 8ae76f62a..7892b3e25 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -854,7 +854,14 @@ main( int argc, char **argv ) case oKOption: set_cmd( &cmd, aKMode ); 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 oAnswerNo: opt.answer_no = 1; break; case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break; @@ -1026,11 +1033,12 @@ main( int argc, char **argv ) case oEscapeFrom: opt.escape_from = 1; break; case oLockOnce: opt.lock_once = 1; break; case oLockNever: disable_dotlock(); break; - case oLockMultiple: - opt.lock_once = 0; -#ifdef __riscos__ + case oLockMultiple: +#ifndef __riscos__ + opt.lock_once = 0; +#else /* __riscos__ */ not_implemented("lock-multiple"); -#endif +#endif /* __riscos__ */ 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)) 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) ) g10_exit(2);