Update head to match stable 1.0

1 files changed, 91 insertions, 12 deletions

diff --git a/util/fileutil.c b/util/fileutil.c
index 39268da74..76eacfb80 100644
--- a/util/fileutil.c
+++ b/util/fileutil.c
@@ -25,7 +25,10 @@
 #include <string.h>
 #include <assert.h>
 #include <unistd.h>
-#include <gcrypt.h>
+#ifdef __riscos__
+#include <kernel.h>
+#include <swis.h>
+#endif /* __riscos__ */
 #include "util.h"
 #include "memory.h"
 #include "ttyio.h"
@@ -40,16 +43,16 @@ make_basename(const char *filepath)
 {
     char *p;
 
-    if ( !(p=strrchr(filepath, '/')) )
+    if ( !(p=strrchr(filepath, DIRSEP_C)) )
       #ifdef HAVE_DRIVE_LETTERS
 	if ( !(p=strrchr(filepath, '\\')) )
 	    if ( !(p=strrchr(filepath, ':')) )
       #endif
 	      {
-		return gcry_xstrdup(filepath);
+		return m_strdup(filepath);
 	      }
 
-    return gcry_xstrdup(p+1);
+    return m_strdup(p+1);
 }
 
 
@@ -67,17 +70,17 @@ make_dirname(const char *filepath)
     int  dirname_length;
     char *p;
 
-    if ( !(p=strrchr(filepath, '/')) )
+    if ( !(p=strrchr(filepath, DIRSEP_C)) )
       #ifdef HAVE_DRIVE_LETTERS
 	if ( !(p=strrchr(filepath, '\\')) )
 	    if ( !(p=strrchr(filepath, ':')) )
       #endif
 	      {
-		return gcry_xstrdup(".");
+		return m_strdup(EXTSEP_S);
 	      }
 
     dirname_length = p-filepath;
-    dirname = gcry_xmalloc(dirname_length+1);
+    dirname = m_alloc(dirname_length+1);
     strncpy(dirname, filepath, dirname_length);
     dirname[dirname_length] = 0;
 
@@ -104,20 +107,30 @@ make_filename( const char *first_part, ... )
 	n += strlen(s) + 1;
     va_end(arg_ptr);
 
+#ifndef __riscos__
     home = NULL;
-    if( *first_part == '~' && first_part[1] == '/'
+    if( *first_part == '~' && first_part[1] == DIRSEP_C
 			   && (home = getenv("HOME")) && *home )
 	n += strlen(home);
-
-    name = gcry_xmalloc(n);
+    name = m_alloc(n);
     p = home ? stpcpy(stpcpy(name,home), first_part+1)
 	     : stpcpy(name, first_part);
+#else /* __riscos__ */
+    name = m_alloc(n);
+    p = stpcpy(name, first_part);
+#endif /* __riscos__ */
     va_start( arg_ptr, first_part ) ;
     while( (s=va_arg(arg_ptr, const char *)) )
-	p = stpcpy(stpcpy(p,"/"), s);
+	p = stpcpy(stpcpy(p, DIRSEP_S), s);
     va_end(arg_ptr);
 
+#ifndef __riscos__
     return name;
+#else /* __riscos__ */
+    p = gstrans(name);
+    m_free(name);
+    return p;
+#endif /* __riscos__ */
 }
 
 
@@ -127,11 +140,26 @@ compare_filenames( const char *a, const char *b )
     /* ? check whether this is an absolute filename and
      * resolve symlinks?
      */
+#ifndef __riscos__
   #ifdef HAVE_DRIVE_LETTERS
-    return stricmp(a,b);
+    return ascii_strcasecmp(a,b);
   #else
     return strcmp(a,b);
   #endif
+#else /* __riscos__ */
+    int c = 0;
+    char *abuf, *bbuf;
+
+    abuf = gstrans(a);
+    bbuf = gstrans(b);
+
+    c = strcasecmp (abuf, bbuf);
+
+    m_free(abuf);
+    m_free(bbuf);
+
+    return c;
+#endif /* __riscos__ */
 }
 
 
@@ -156,4 +184,55 @@ print_fname_stdin( const char *s )
     return s;
 }
 
+/****************
+ * Check if the file is compressed.
+ **/
+int
+is_file_compressed( const char *s, int *ret_rc )
+{
+    IOBUF a;
+    byte buf[4];
+    int i, rc = 0;
+
+    struct magic_compress_s {
+        size_t len;
+        byte magic[4];
+    } magic[] = {
+        { 3, { 0x42, 0x5a, 0x68, 0x00 } }, /* bzip2 */
+        { 3, { 0x1f, 0x8b, 0x08, 0x00 } }, /* gzip */
+        { 4, { 0x50, 0x4b, 0x03, 0x04 } }, /* (pk)zip */
+    };
+    
+    if ( !s || *s == '-' || !ret_rc )
+        return 0; /* We can't check stdin or no file was given */
+
+    a = iobuf_open( s );
+    if ( a == NULL ) {
+        *ret_rc = G10ERR_OPEN_FILE;
+        return 0;
+    }
+
+    if ( iobuf_get_filelength( a ) < 4 ) {
+        *ret_rc = 0;
+        goto leave;
+    }
+
+    if ( iobuf_read( a, buf, 4 ) == -1 ) {
+        *ret_rc = G10ERR_READ_FILE;
+        goto leave;
+    }
+
+    for ( i = 0; i < DIM( magic ); i++ ) {
+        if ( !memcmp( buf, magic[i].magic, magic[i].len ) ) {
+            *ret_rc = 0;
+            rc = 1;
+            break;
+        }
+    }
+
+leave:    
+    iobuf_close( a );
+    return rc;
+}
+