diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 9 | ||||
| -rw-r--r-- | g10/g10.c | 24 | ||||
| -rw-r--r-- | g10/gpgv.c | 5 |
3 files changed, 34 insertions, 4 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index d61c506f5..9f8b00ef5 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,12 @@ +2002-06-07 Stefan Bellon <[email protected]> + + * g10.c [__riscos__]: Added --attribute-file to do the same as + --attribute-fd, but with a filename not a fd as argument. + Added magic symbol for RISC OS to use different memory management. + + * gpgv.c [__riscos__]: Added magic symbol for RISC OS to use + different memory management. + 2002-06-06 David Shaw <[email protected]> * main.h, g10.c (main), keygen.c (build_personal_digest_list): Put @@ -148,10 +148,13 @@ enum cmd_and_opt_values { aNull = 0, oDebug, oDebugAll, oStatusFD, - oAttributeFD, #ifdef __riscos__ oStatusFile, #endif /* __riscos__ */ + oAttributeFD, +#ifdef __riscos__ + oAttributeFile, +#endif /* __riscos__ */ oSKComments, oNoSKComments, oNoVersion, @@ -413,10 +416,13 @@ static ARGPARSE_OPTS opts[] = { { oDebug, "debug" ,4|16, "@"}, { oDebugAll, "debug-all" ,0, "@"}, { oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") }, - { oAttributeFD, "attribute-fd" ,1, "@" }, #ifdef __riscos__ { oStatusFile, "status-file" ,2, N_("|[file]|write status info to file") }, #endif /* __riscos__ */ + { oAttributeFD, "attribute-fd" ,1, "@" }, +#ifdef __riscos__ + { oAttributeFile, "attribute-file" ,2, "@" }, +#endif /* __riscos__ */ { oNoSKComments, "no-comment", 0, "@"}, { oNoSKComments, "no-sk-comments", 0, "@"}, { oSKComments, "sk-comments", 0, "@"}, @@ -590,6 +596,11 @@ static void print_mds( const char *fname, int algo ); static void add_notation_data( const char *string, int which ); static void add_policy_url( const char *string, int which ); +#ifdef __riscos__ +/* This enables better dynamic memory management on RISC OS */ +const char *__dynamic_da_name = "GnuPG Heap"; +#endif /* __riscos__ */ + const char * strusage( int level ) { @@ -1067,12 +1078,17 @@ main( int argc, char **argv ) case oStatusFD: set_status_fd( iobuf_translate_file_handle (pargs.r.ret_int, 1) ); break; +#ifdef __riscos__ + case oStatusFile: + set_status_fd( iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 1), 1) ); + break; +#endif /* __riscos__ */ case oAttributeFD: set_attrib_fd(iobuf_translate_file_handle (pargs.r.ret_int, 1)); break; #ifdef __riscos__ - case oStatusFile: - set_status_fd( iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 1), 1) ); + case oAttributeFile: + set_attrib_fd(iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 1), 1) ); break; #endif /* __riscos__ */ case oLoggerFD: diff --git a/g10/gpgv.c b/g10/gpgv.c index 85c1ab9d7..de4b1ba3b 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -81,6 +81,11 @@ static ARGPARSE_OPTS opts[] = { int g10_errors_seen = 0; +#ifdef __riscos__ +/* This enables better dynamic memory management on RISC OS */ +const char *__dynamic_da_name = "GnuPG (gpgv) Heap"; +#endif /* __riscos__ */ + const char * strusage( int level ) { |