RISC OS specific changes

7 files changed, 47 insertions, 5 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
diff --git a/g10/g10.c b/g10/g10.c
index cfe1cfb38..4b496968b 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -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 )
 {
diff --git a/include/ChangeLog b/include/ChangeLog
index b53345359..e401a6550 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-07  Stefan Bellon  <[email protected]>
+
+	* util.h [__riscos__]: RISC OS needs strings.h for strcasecmp()
+	and strncasecmp().
+
 2002-05-22  Werner Koch  <[email protected]>
 
 	* util.h: Add strncasecmp.  Removed stricmp and memicmp.
diff --git a/include/util.h b/include/util.h
index b49b6c9c6..1cb76c911 100644
--- a/include/util.h
+++ b/include/util.h
@@ -257,6 +257,8 @@ int vasprintf ( char **result, const char *format, va_list args);
 
 /******* RISC OS stuff ***********/
 #ifdef __riscos__
+/* needed for strcasecmp() */
+#include <strings.h>
 pid_t riscos_getpid(void);
 int riscos_kill(pid_t pid, int sig);
 int riscos_access(const char *path, int amode);
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 71dda2a95..15304f363 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-07  Stefan Bellon  <[email protected]>
+
+	* conf-riscos/include/config.h [__riscos__]: Fixed macro bug.
+
 2002-05-10  Stefan Bellon  <[email protected]>
 
 	* conf-riscos/include/config.h [__riscos__]: Changes for later
diff --git a/scripts/conf-riscos/include/config.h b/scripts/conf-riscos/include/config.h
index 92e9ce53c..6a3440235 100644
--- a/scripts/conf-riscos/include/config.h
+++ b/scripts/conf-riscos/include/config.h
@@ -373,7 +373,8 @@
 # define __attribute__(x) 
 # if (__CC_NORCROFT_VERSION < 544) /* old version of Norcroft */
 #  define inline __inline
-#  define __func__ "[" __FILE__ ":" __LINE__ "]"
+#  define STR(a) #a
+#  define __func__ "[" __FILE__ ":" STR(__LINE__) "]"
 # endif
 #else /* gcc */
 #endif