diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 13 | ||||
| -rw-r--r-- | g10/compress.c | 11 | ||||
| -rw-r--r-- | g10/g10.c | 18 | ||||
| -rw-r--r-- | g10/photoid.c | 4 | ||||
| -rw-r--r-- | g10/signal.c | 2 | ||||
| -rw-r--r-- | g10/trustdb.c | 2 |
6 files changed, 37 insertions, 13 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c1d565d02..978935d45 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,16 @@ +2002-10-31 Stefan Bellon <[email protected]> + + * compress.c (init_compress) [__riscos__]: Use + riscos_load_module() to load ZLib module. + + * g10.c (main) [__riscos__]: Renames due to changes in riscos.c + (e.g. prefixes all RISC OS specific functions with riscos_*). + * photoid.c (show_photos) [__riscos__]: Likewise. + * signal.c (got_fatal_signal) [__riscos__]: Likewise. + + * trustdb.c (check_regexp) [__riscos__]: Branch to RISC OS RegEx + handling. + 2002-10-31 David Shaw <[email protected]> * build-packet.c (do_plaintext), encode.c (encode_sesskey, diff --git a/g10/compress.c b/g10/compress.c index 6ea84f6cd..b11f148c3 100644 --- a/g10/compress.c +++ b/g10/compress.c @@ -26,6 +26,9 @@ #include <assert.h> #include <errno.h> #include <zlib.h> +#ifdef __riscos__ +# include "zlib-riscos.h" +#endif #include "util.h" #include "memory.h" @@ -34,13 +37,19 @@ #include "main.h" #include "options.h" - static void init_compress( compress_filter_context_t *zfx, z_stream *zs ) { int rc; int level; +#ifdef __riscos__ + static int zlib_initialized = 0; + + if (!zlib_initialized) + zlib_initialized = riscos_load_module("ZLib", zlib_path, 1); +#endif + if( opt.compress >= 0 && opt.compress <= 9 ) level = opt.compress; else if( opt.compress == -1 ) @@ -1349,7 +1349,7 @@ main( int argc, char **argv ) opt.use_agent = 1; #else /* __riscos__ */ opt.use_agent = 0; - not_implemented("use-agent"); + riscos_not_implemented("use-agent"); #endif /* __riscos__ */ break; case oNoUseAgent: opt.use_agent = 0; break; @@ -1365,7 +1365,7 @@ main( int argc, char **argv ) break; #ifdef __riscos__ case oStatusFile: - set_status_fd( iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 1), 1) ); + set_status_fd( iobuf_translate_file_handle ( riscos_fdopenfile (pargs.r.ret_str, 1), 1) ); break; #endif /* __riscos__ */ case oAttributeFD: @@ -1373,7 +1373,7 @@ main( int argc, char **argv ) break; #ifdef __riscos__ case oAttributeFile: - set_attrib_fd(iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 1), 1) ); + set_attrib_fd(iobuf_translate_file_handle ( riscos_fdopenfile (pargs.r.ret_str, 1), 1) ); break; #endif /* __riscos__ */ case oLoggerFD: @@ -1383,7 +1383,7 @@ main( int argc, char **argv ) #ifdef __riscos__ case oLoggerFile: log_set_logfile( NULL, - iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 1), 1) ); + iobuf_translate_file_handle ( riscos_fdopenfile (pargs.r.ret_str, 1), 1) ); break; #endif /* __riscos__ */ case oWithFingerprint: @@ -1449,7 +1449,7 @@ main( int argc, char **argv ) pargs.r.ret_str); #endif #else /* __riscos__ */ - not_implemented("load-extension"); + riscos_not_implemented("load-extension"); #endif /* __riscos__ */ break; case oRFC1991: @@ -1497,7 +1497,7 @@ main( int argc, char **argv ) log_error("shared memory coprocessing is not available\n"); # endif #else /* __riscos__ */ - not_implemented("run-as-shm-coprocess"); + riscos_not_implemented("run-as-shm-coprocess"); #endif /* __riscos__ */ break; case oSetFilename: opt.set_filename = pargs.r.ret_str; break; @@ -1556,7 +1556,7 @@ main( int argc, char **argv ) break; #ifdef __riscos__ case oPasswdFile: - pwfd = iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 0), 0); + pwfd = iobuf_translate_file_handle ( riscos_fdopenfile (pargs.r.ret_str, 0), 0); break; #endif /* __riscos__ */ case oCommandFD: @@ -1564,7 +1564,7 @@ main( int argc, char **argv ) break; #ifdef __riscos__ case oCommandFile: - opt.command_fd = iobuf_translate_file_handle ( fdopenfile (pargs.r.ret_str, 0), 0); + opt.command_fd = iobuf_translate_file_handle ( riscos_fdopenfile (pargs.r.ret_str, 0), 0); break; #endif /* __riscos__ */ case oCipherAlgo: def_cipher_string = m_strdup(pargs.r.ret_str); break; @@ -1587,7 +1587,7 @@ main( int argc, char **argv ) #ifndef __riscos__ opt.lock_once = 0; #else /* __riscos__ */ - not_implemented("lock-multiple"); + riscos_not_implemented("lock-multiple"); #endif /* __riscos__ */ break; case oKeyServer: diff --git a/g10/photoid.c b/g10/photoid.c index c20e20eca..cb95754fa 100644 --- a/g10/photoid.c +++ b/g10/photoid.c @@ -306,8 +306,8 @@ void show_photos(const struct user_attribute *attrs, } #ifdef __riscos__ - riscos_set_filetype(spawn->tempfile_in, - image_type_to_string(args.imagetype,2)); + riscos_set_filetype_by_mimetype(spawn->tempfile_in, + image_type_to_string(args.imagetype,2)); #endif m_free(name); diff --git a/g10/signal.c b/g10/signal.c index 0517ba648..140259a19 100644 --- a/g10/signal.c +++ b/g10/signal.c @@ -100,7 +100,7 @@ got_fatal_signal( int sig ) init_one_signal (sig, SIG_DFL, 0); remove_lockfiles (); #ifdef __riscos__ - close_fds (); + riscos_close_fds (); #endif /* __riscos__ */ raise( sig ); } diff --git a/g10/trustdb.c b/g10/trustdb.c index 651baa3ed..f2014012c 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -1331,6 +1331,8 @@ check_regexp(const char *exp,const char *string) /* When DISABLE_REGEXP is defined, assume all regexps do not match. */ return 0; +#elif defined(__riscos__) + return riscos_check_regexp(exp, string, DBG_TRUST); #else int ret; regex_t pat; |