Adding ability to enable/disable compression support

5 files changed, 77 insertions, 40 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index bf07655..af7264a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -38,35 +38,72 @@
 # ______________________________________________________________________________
 AC_DEFUN([AC_SCU_ZCAT_DEPS],[dnl
 
+   enableval=""
+   AC_ARG_ENABLE(
+      bzip2,
+      [AS_HELP_STRING([--disable-bzip2], [disable bzip2 support [auto]])],
+      [ EBZIP2=$enableval ],
+      [ EBZIP2=$enableval ]
+   )
+   enableval=""
+   AC_ARG_ENABLE(
+      lzma,
+      [AS_HELP_STRING([--disable-lzma], [disable lzma support [auto]])],
+      [ ELZMA=$enableval ],
+      [ ELZMA=$enableval ]
+   )
+   enableval=""
+   AC_ARG_ENABLE(
+      zlib,
+      [AS_HELP_STRING([--disable-zlib], [disable zlib support [auto]])],
+      [ EZLIB=$enableval ],
+      [ EZLIB=$enableval ]
+   )
+
    # check zlib
-   USE_ZLIB=yes;
-   AC_CHECK_HEADERS([zlib.h],      [], [USE_ZLIB=no])
-   AC_SEARCH_LIBS([gzclose],  [z], [], [USE_ZLIB=no])
-   AC_SEARCH_LIBS([gzerror],  [z], [], [USE_ZLIB=no])
-   AC_SEARCH_LIBS([gzopen],   [z], [], [USE_ZLIB=no])
-   AC_SEARCH_LIBS([gzread],   [z], [], [USE_ZLIB=no])
-   if test "x${USE_ZLIB}" = "xyes";then
-      AC_DEFINE_UNQUOTED(USE_ZLIB, 1, [Use zlib])
+   USE_ZLIB=no;
+   if test "x${EZLIB}" != "xno";then
+      USE_ZLIB=yes;
+      AC_CHECK_HEADERS([zlib.h],      [], [USE_ZLIB=no])
+      AC_SEARCH_LIBS([gzclose],  [z], [], [USE_ZLIB=no])
+      AC_SEARCH_LIBS([gzerror],  [z], [], [USE_ZLIB=no])
+      AC_SEARCH_LIBS([gzopen],   [z], [], [USE_ZLIB=no])
+      AC_SEARCH_LIBS([gzread],   [z], [], [USE_ZLIB=no])
+      if test "x${USE_ZLIB}" = "xyes";then
+         AC_DEFINE_UNQUOTED(USE_ZLIB, 1, [Use zlib])
+      elif test "x${EZLIB}" == "xyes";then
+         AC_MSG_ERROR([unable to locate zlib library and headers])
+      fi
    fi
 
    # check libbz2
-   USE_BZIP2=yes;
-   AC_CHECK_HEADERS([bzlib.h],                   [], [USE_BZIP2=no])
-   AC_SEARCH_LIBS([BZ2_bzRead],           [bz2], [], [USE_BZIP2=no])
-   AC_SEARCH_LIBS([BZ2_bzReadClose],      [bz2], [], [USE_BZIP2=no])
-   AC_SEARCH_LIBS([BZ2_bzReadGetUnused],  [bz2], [], [USE_BZIP2=no])
-   AC_SEARCH_LIBS([BZ2_bzReadOpen],       [bz2], [], [USE_BZIP2=no])
-   if test "x${USE_BZIP2}" = "xyes";then
-      AC_DEFINE_UNQUOTED(USE_BZIP2, 1, [Use bzip2])
+   USE_BZIP2=no
+   if test "x${EBZIP2}" != "xno";then
+      USE_BZIP2=yes;
+      AC_CHECK_HEADERS([bzlib.h],                   [], [USE_BZIP2=no])
+      AC_SEARCH_LIBS([BZ2_bzRead],           [bz2], [], [USE_BZIP2=no])
+      AC_SEARCH_LIBS([BZ2_bzReadClose],      [bz2], [], [USE_BZIP2=no])
+      AC_SEARCH_LIBS([BZ2_bzReadGetUnused],  [bz2], [], [USE_BZIP2=no])
+      AC_SEARCH_LIBS([BZ2_bzReadOpen],       [bz2], [], [USE_BZIP2=no])
+      if test "x${USE_BZIP2}" = "xyes";then
+         AC_DEFINE_UNQUOTED(USE_BZIP2, 1, [Use bzip2])
+      elif test "x${EBZIP2}" == "xyes";then
+         AC_MSG_ERROR([unable to locate bzip2 library and headers])
+      fi
    fi
 
    # check liblzma
-   USE_XZ=yes;
-   AC_CHECK_HEADERS([lzma.h],                     [], [USE_XZ=no])
-   AC_SEARCH_LIBS([lzma_stream_decoder],  [lzma], [], [USE_XZ=no])
-   AC_SEARCH_LIBS([lzma_code],            [lzma], [], [USE_XZ=no])
-   if test "x${USE_XZ}" = "xyes";then
-      AC_DEFINE_UNQUOTED(USE_XZ, 1, [Use liblzma])
+   USE_LZMA=no;
+   if test "x${ELZMA}" != "xno";then
+      USE_LZMA=yes;
+      AC_CHECK_HEADERS([lzma.h],                     [], [USE_LZMA=no])
+      AC_SEARCH_LIBS([lzma_stream_decoder],  [lzma], [], [USE_LZMA=no])
+      AC_SEARCH_LIBS([lzma_code],            [lzma], [], [USE_LZMA=no])
+      if test "x${USE_LZMA}" = "xyes";then
+         AC_DEFINE_UNQUOTED(USE_LZMA, 1, [Use liblzma])
+      elif test "x${ELZMA}" == "xyes";then
+         AC_MSG_ERROR([unable to locate LZMA library and headers])
+      fi
    fi
 
    AC_CHECK_PROG([USE_Z], [uncompress], [yes], [no])
diff --git a/configure.ac b/configure.ac
index cd05ae0..4fbc532 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,7 +167,7 @@ AC_MSG_NOTICE([ ])
 AC_MSG_NOTICE([   Features:])
 AC_MSG_NOTICE([      zlib support:              $USE_ZLIB])
 AC_MSG_NOTICE([      bzip2 support:             $USE_BZIP2])
-AC_MSG_NOTICE([      xz support:                $USE_XZ])
+AC_MSG_NOTICE([      lzma support:              $USE_LZMA])
 AC_MSG_NOTICE([      Z support:                 $USE_Z])
 AC_MSG_NOTICE([ ])
 AC_MSG_NOTICE([   Please send suggestions to:   $PACKAGE_BUGREPORT])
diff --git a/securecoreutilities.xcodeproj/project.pbxproj b/securecoreutilities.xcodeproj/project.pbxproj
index 2d38e6a..5cbc1d6 100644
--- a/securecoreutilities.xcodeproj/project.pbxproj
+++ b/securecoreutilities.xcodeproj/project.pbxproj
@@ -308,7 +308,7 @@
                                 GCC_PREPROCESSOR_DEFINITIONS = (
                                         "USE_ZLIB=1",
                                         "USE_BZIP2=1",
-                                        "USE_XZ=1",
+                                        "USE_LZMA=1",
                                 );
                                 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                 GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -343,7 +343,7 @@
                                 GCC_PREPROCESSOR_DEFINITIONS = (
                                         "USE_ZLIB=1",
                                         "USE_BZIP2=1",
-                                        "USE_XZ=1",
+                                        "USE_LZMA=1",
                                 );
                                 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                 GCC_WARN_ABOUT_RETURN_TYPE = YES;
diff --git a/src/widget-zcat.c b/src/widget-zcat.c
index dc36826..ec9a24a 100644
--- a/src/widget-zcat.c
+++ b/src/widget-zcat.c
@@ -63,7 +63,7 @@
 #include <bzlib.h>
 #endif
 
-#ifdef USE_XZ
+#ifdef USE_LZMA
 #include <lzma.h>
 #endif
 
@@ -79,7 +79,7 @@ const uint8_t scm_magic_gz[2]    = { 0x1f, 0x8b };                         // ta
 const uint8_t scm_magic_lz4[4]   = { 0x04, 0x22, 0x4d, 0x18 };             // tar.lz4
 const uint8_t scm_magic_z_lzw[2] = { 0x1f, 0x9d };                         // tar.Z
 const uint8_t scm_magic_z_lzh[2] = { 0x1f, 0xa0 };                         // tar.Z
-const uint8_t scm_magic_xz[6]    = { 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00 }; // tar.xz
+const uint8_t scm_magic_lzma[6]  = { 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00 }; // tar.xz
 
 
 //////////////////
@@ -91,8 +91,8 @@ const uint8_t scm_magic_xz[6]    = { 0xfd, 0x37, 0x7a, 0x58, 0x5a, 0x00 }; // ta
 #pragma mark -
 #endif
 
-#ifdef USE_XZ
-int scu_widget_zcat_xz_perror(scu_config * cnf, lzma_ret ret);
+#ifdef USE_LZMA
+int scu_widget_zcat_lzma_perror(scu_config * cnf, lzma_ret ret);
 #endif
 
 
@@ -226,9 +226,9 @@ int scu_widget_zcat(scu_config * cnf)
       return(scu_widget_zcat_bz2(cnf));
 #endif
 
-#ifdef USE_XZ
-   if (!( memcmp(magic, scm_magic_xz, sizeof(scm_magic_xz)) ))
-      return(scu_widget_zcat_xz(cnf));
+#ifdef USE_LZMA
+   if (!( memcmp(magic, scm_magic_lzma, sizeof(scm_magic_lzma)) ))
+      return(scu_widget_zcat_lzma(cnf));
 #endif
 
 #ifdef USE_Z
@@ -351,8 +351,8 @@ void scu_widget_zcat_usage(scu_config * cnf)
 }
 
 
-#ifdef USE_XZ
-int scu_widget_zcat_xz(scu_config * cnf)
+#ifdef USE_LZMA
+int scu_widget_zcat_lzma(scu_config * cnf)
 {
    int            fd;
    lzma_ret       ret;
@@ -377,7 +377,7 @@ int scu_widget_zcat_xz(scu_config * cnf)
 
    if ((ret = lzma_stream_decoder(&strm, UINT64_MAX, LZMA_CONCATENATED)) != LZMA_OK)
    {
-      scu_widget_zcat_xz_perror(cnf, ret);
+      scu_widget_zcat_lzma_perror(cnf, ret);
       close(fd);
       return(1);
    };
@@ -406,7 +406,7 @@ int scu_widget_zcat_xz(scu_config * cnf)
       {
          if (ret != LZMA_STREAM_END)
          {
-            scu_widget_zcat_xz_perror(cnf, ret);
+            scu_widget_zcat_lzma_perror(cnf, ret);
             close(fd);
             return(1);
          };
@@ -434,7 +434,7 @@ int scu_widget_zcat_xz(scu_config * cnf)
       {
          if (ret != LZMA_STREAM_END)
          {
-            scu_widget_zcat_xz_perror(cnf, ret);
+            scu_widget_zcat_lzma_perror(cnf, ret);
             return(1);
          };
       };
@@ -455,7 +455,7 @@ int scu_widget_zcat_xz(scu_config * cnf)
 }
 
 
-int scu_widget_zcat_xz_perror(scu_config * cnf, lzma_ret ret)
+int scu_widget_zcat_lzma_perror(scu_config * cnf, lzma_ret ret)
 {
    switch(ret)
    {
@@ -468,7 +468,7 @@ int scu_widget_zcat_xz_perror(scu_config * cnf, lzma_ret ret)
       return(1);
 
       case LZMA_FORMAT_ERROR:
-      fprintf(stderr, "%s: %s: invalid .xz format\n", cnf->prog_name, cnf->widget->name);
+      fprintf(stderr, "%s: %s: invalid LZMA format\n", cnf->prog_name, cnf->widget->name);
       return(1);
 
       case LZMA_MEM_ERROR:
diff --git a/src/widget-zcat.h b/src/widget-zcat.h
index 8228d94..198b362 100644
--- a/src/widget-zcat.h
+++ b/src/widget-zcat.h
@@ -64,7 +64,7 @@ int scu_widget_zcat(scu_config * cnf);
 int scu_widget_zcat_bz2(scu_config * cnf);
 int scu_widget_zcat_gz(scu_config * cnf);
 int scu_widget_zcat_prog(scu_config * cnf, const char * prog);
-int scu_widget_zcat_xz(scu_config * cnf);
+int scu_widget_zcat_lzma(scu_config * cnf);
 
 void scu_widget_zcat_usage(scu_config * cnf);