4 files changed, 15 insertions, 17 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index f2a5d23e4..76e72b072 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-28  Stefan Bellon  <[email protected]>
+
+	* plaintext.c (handle_plaintext) [__riscos__]: Don't mangle
+	filename if the user specified it.
+
+	* g10.c, gpgv.c [__riscos__]: Removal of unnecessary #ifdef
+	__riscos__ sections.
+
 2003-12-27  David Shaw  <[email protected]>
 
 	* keyserver.c (strip_leading_space, get_arg): New.
diff --git a/g10/g10.c b/g10/g10.c
index 2486af3db..531506284 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -675,10 +675,6 @@ static void add_notation_data( const char *string, int which );
 static void add_policy_url( const char *string, int which );
 static void add_keyserver_url( const char *string, int which );
 
-#ifdef __riscos__
-RISCOS_GLOBAL_STATICS("GnuPG Heap")
-#endif /* __riscos__ */
-
 const char *
 strusage( int level )
 {
@@ -1191,7 +1187,6 @@ main( int argc, char **argv )
 #endif
 
 #ifdef __riscos__
-    riscos_global_defaults();
     opt.lock_once = 1;
 #endif /* __riscos__ */
 
diff --git a/g10/gpgv.c b/g10/gpgv.c
index c01263fe4..e5d48760e 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -78,10 +78,6 @@ static ARGPARSE_OPTS opts[] = {
 
 int g10_errors_seen = 0;
 
-#ifdef __riscos__
-RISCOS_GLOBAL_STATICS("GnuPG (gpgv) Heap")
-#endif /* __riscos__ */
-
 const char *
 strusage( int level )
 {
@@ -140,10 +136,6 @@ main( int argc, char **argv )
     STRLIST nrings=NULL;
     unsigned configlineno;
 
-#ifdef __riscos__
-    riscos_global_defaults();
-#endif /* __riscos__ */
-
     log_set_name("gpgv");
     init_signals();
     i18n_init();
diff --git a/g10/plaintext.c b/g10/plaintext.c
index 89043026c..6aad0ef5a 100644
--- a/g10/plaintext.c
+++ b/g10/plaintext.c
@@ -114,10 +114,13 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx,
 	goto leave;
     }
 #else /* __riscos__ */
-    /* Convert all '.' in fname to '/' -- we don't create directories! */
-    for( c=0; fname[c]; ++c )
-        if( fname[c] == '.' )
-            fname[c] = '/';
+    /* If no output filename was given, i.e. we constructed it,
+       convert all '.' in fname to '/' but not vice versa as
+       we don't create directories! */
+    if( !opt.outfile )
+        for( c=0; fname[c]; ++c )
+            if( fname[c] == '.' )
+                fname[c] = '/';
 
     if( fp || nooutput )
 	;