Changes for compatibility with Slackware installation scripts.

[chaz/tar] / src / suffix.c

diff --git a/src/suffix.c b/src/suffix.c
index 6dbc68e2d5a516eddb26f737cda704b9031299ee..cf8056cf9518a3f436dfdee2b73030b5de80b37f 100644 (file)
--- a/src/suffix.c
+++ b/src/suffix.c
@@ -1,5 +1,5 @@
 /* This file is part of GNU tar.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright 2007, 2009, 2013 Free Software Foundation, Inc.
 
    Written by Sergey Poznyakoff.
 
@@ -26,32 +26,36 @@ struct compression_suffix
   const char *program;
 };
 
-struct compression_suffix compression_suffixes[] = {
-#define S(s,p) #s, sizeof (#s) - 1, #p
-  { S(gz, gzip) },
-  { S(tgz, gzip) },
-  { S(taz, gzip) },
-  { S(Z, compress) },
-  { S(taZ, compress) },
-  { S(bz2, bzip2) },
-  { S(tbz, bzip2) },
-  { S(tbz2, bzip2) },
-  { S(tz2, bzip2) },
-  { S(lzma, lzma) },
-  { S(tlz, lzma) },
-  { S(lzo, lzop) },
-  { S(xz, xz) },
+static struct compression_suffix compression_suffixes[] = {
+#define __CAT2__(a,b) a ## b
+#define S(s,p) #s, sizeof (#s) - 1, __CAT2__(p,_PROGRAM)
+  { S(gz,   GZIP) },
+  { S(tgz,  GZIP) },
+  { S(taz,  GZIP) },
+  { S(Z,    COMPRESS) },
+  { S(taZ,  COMPRESS) },
+  { S(bz2,  BZIP2) },
+  { S(tbz,  BZIP2) },
+  { S(tbz2, BZIP2) },
+  { S(tz2,  BZIP2) },
+  { S(lz,   LZIP) },
+  { S(lzma, LZMA) },
+  { S(tlz,  LZMA) },
+  { S(lzo,  LZOP) },
+  { S(xz,   XZ) },
+  { S(txz,  XZ) }, /* Slackware */
 #undef S
+#undef __CAT2__
 };
 
-int nsuffixes = sizeof (compression_suffixes) /
-                  sizeof (compression_suffixes[0]);
+static int nsuffixes = sizeof (compression_suffixes) /
+                        sizeof (compression_suffixes[0]);
 
 static const char *
 find_compression_program (const char *name, const char *defprog)
 {
   char *suf = strrchr (name, '.');
-    
+
   if (suf)
     {
       int i;
@@ -71,10 +75,9 @@ find_compression_program (const char *name, const char *defprog)
 }
 
 void
-set_comression_program_by_suffix (const char *name, const char *defprog)
+set_compression_program_by_suffix (const char *name, const char *defprog)
 {
   const char *program = find_compression_program (name, defprog);
   if (program)
     use_compress_program_option = program;
 }
-