2 files changed, 113 insertions, 63 deletions

diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 575e5e5..e7ce493 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -219,7 +219,7 @@ static int         option_verbose            = DEFAULT_VERBOSE;
 static int         option_quiet              = 0;
 static int         option_use_appheader      = 1;
 static uint8_t*    option_appheader          = NULL;
-static int         option_use_secondary      = 0;
+static int         option_use_secondary      = 1;
 static const char* option_secondary          = NULL;
 static int         option_use_checksum       = 1;
 static const char* option_smatch_config      = NULL;
@@ -338,7 +338,7 @@ static int
 main_version (void)
 {
   /* $Format: "  XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, Joshua MacDonald\\n\");" $ */
-  XPR(NTR "Xdelta version 3.0.10, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Joshua MacDonald\n");
+  XPR(NTR "Xdelta version 3.0.11, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Joshua MacDonald\n");
   XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
   XPR(NTR "This is free software, and you are welcome to redistribute it\n");
   XPR(NTR "under certain conditions; see \"COPYING\" for details.\n");
@@ -391,7 +391,7 @@ reset_defaults(void)
   option_verbose = DEFAULT_VERBOSE;
   option_quiet = 0;
   option_appheader = NULL;
-  option_use_secondary = 0;
+  option_use_secondary = 1;
   option_secondary = NULL;
   option_smatch_config = NULL;
   option_no_compress = 0;
@@ -1155,70 +1155,72 @@ static int
 main_set_secondary_flags (xd3_config *config)
 {
   int ret;
-  if (option_use_secondary)
+  if (!option_use_secondary)
     {
-      /* The default secondary compressor is DJW, if it's compiled. */
-      if (option_secondary == NULL)
+      return 0;
+    }
+  if (option_secondary == NULL)
+    {
+      /* Set a default secondary compressor if LZMA is built in, otherwise
+       * default to no secondary compressor. */
+      if (SECONDARY_LZMA)
         {
-          if (SECONDARY_DJW)
-            {
-              config->flags |= XD3_SEC_DJW;
-            }
+          config->flags |= XD3_SEC_LZMA;
         }
-      else
+    }
+  else
+    {
+      if (strcmp (option_secondary, "lzma") == 0 && SECONDARY_LZMA)
         {
-          if (strcmp (option_secondary, "fgk") == 0 && SECONDARY_FGK)
-            {
-              config->flags |= XD3_SEC_FGK;
-            }
-          else if (strcmp (option_secondary, "lzma") == 0 && SECONDARY_LZMA)
+          config->flags |= XD3_SEC_LZMA;
+        }
+      else if (strcmp (option_secondary, "fgk") == 0 && SECONDARY_FGK)
+        {
+          config->flags |= XD3_SEC_FGK;
+        }
+      else if (strncmp (option_secondary, "djw", 3) == 0 && SECONDARY_DJW)
+        {
+          usize_t level = XD3_DEFAULT_SECONDARY_LEVEL;
+
+          config->flags |= XD3_SEC_DJW;
+
+          if (strlen (option_secondary) > 3 &&
+              (ret = main_atou (option_secondary + 3,
+                                &level,
+                                0, 9, 'S')) != 0 &&
+              !option_quiet)
             {
-              config->flags |= XD3_SEC_LZMA;
+              return XD3_INVALID;
             }
-          else if (strncmp (option_secondary, "djw", 3) == 0 && SECONDARY_DJW)
-            {
-              usize_t level = XD3_DEFAULT_SECONDARY_LEVEL;
 
-              config->flags |= XD3_SEC_DJW;
+          /* XD3_SEC_NOXXXX flags disable secondary compression on
+           * a per-section basis.  For djw, ngroups=1 indicates
+           * minimum work, ngroups=0 uses default settings, which
+           * is > 1 groups by default. */
+          if (level < 1) { config->flags |= XD3_SEC_NODATA; }
+          if (level < 7) { config->sec_data.ngroups = 1; }
+          else { config->sec_data.ngroups = 0; }
 
-              if (strlen (option_secondary) > 3 &&
-                  (ret = main_atou (option_secondary + 3,
-                                    &level,
-                                    0, 9, 'S')) != 0 &&
-                  !option_quiet)
-                {
-                  return XD3_INVALID;
-                }
+          if (level < 3) { config->flags |= XD3_SEC_NOINST; }
+          if (level < 8) { config->sec_inst.ngroups = 1; }
+          else { config->sec_inst.ngroups = 0; }
 
-              /* XD3_SEC_NOXXXX flags disable secondary compression on
-               * a per-section basis.  For djw, ngroups=1 indicates
-               * minimum work, ngroups=0 uses default settings, which
-               * is > 1 groups by default. */
-              if (level < 1) { config->flags |= XD3_SEC_NODATA; }
-              if (level < 7) { config->sec_data.ngroups = 1; }
-              else { config->sec_data.ngroups = 0; }
-
-              if (level < 3) { config->flags |= XD3_SEC_NOINST; }
-              if (level < 8) { config->sec_inst.ngroups = 1; }
-              else { config->sec_inst.ngroups = 0; }
-
-              if (level < 5) { config->flags |= XD3_SEC_NOADDR; }
-              if (level < 9) { config->sec_addr.ngroups = 1; }
-              else { config->sec_addr.ngroups = 0; }
-            }
-          else if (strcmp (option_secondary, "none") == 0 && SECONDARY_DJW)
-            {
-              /* No secondary */
-            }
-          else
+          if (level < 5) { config->flags |= XD3_SEC_NOADDR; }
+          if (level < 9) { config->sec_addr.ngroups = 1; }
+          else { config->sec_addr.ngroups = 0; }
+        }
+      else if (*option_secondary == 0 ||
+               strcmp (option_secondary, "none") == 0)
+        {
+        }
+      else 
+        {
+          if (!option_quiet)
             {
-              if (!option_quiet)
-                {
-                  XPR(NT "unrecognized secondary compressor type: %s\n",
-                      option_secondary);
-                  return XD3_INVALID;
-                }
+              XPR(NT "unrecognized or not compiled secondary compressor: %s\n",
+                  option_secondary);
             }
+          return XD3_INVALID;
         }
     }
 
@@ -2400,7 +2402,7 @@ main_secondary_decompress_check (main_file  *file,
   usize_t i;
   usize_t try_read = xd3_min (input_size, XD3_ALLOCSIZE);
   size_t  check_nread = 0;
-  uint8_t check_buf[XD3_ALLOCSIZE];  /* TODO: stack limit */
+  uint8_t check_buf[XD3_ALLOCSIZE];  /* TODO: heap allocate */
   const main_extcomp *decompressor = NULL;
 
   if ((ret = main_file_read (file, check_buf,
@@ -3742,8 +3744,8 @@ int main (int argc, char **argv)
         case 'J': option_no_output = 1; break;
         case 'S': if (my_optarg == NULL)
             {
-              option_use_secondary = 1;
-              option_secondary = "none";
+              option_use_secondary = 0;
+              option_secondary = NULL;
             }
           else
             {
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index 97330bb..8e186e2 100644
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -233,7 +233,8 @@ static void
 test_unlink (char* file)
 {
   int ret;
-  if ((ret = unlink (file)) != 0 && errno != ENOENT)
+  if (file != NULL && *file != 0 &&
+      (ret = unlink (file)) != 0 && errno != ENOENT)
     {
       XPR(NT "unlink %s failed: %s\n", file, strerror(ret));
     }
@@ -258,6 +259,9 @@ int test_setup (void)
   static int x = 0;
   pid_t pid = getpid();
   x++;
+
+  test_cleanup();
+
   snprintf_func (TEST_TARGET_FILE, TESTFILESIZE,
                  "/tmp/xdtest.%d.target.%d", pid, x);
   snprintf_func (TEST_SOURCE_FILE, TESTFILESIZE,
@@ -272,6 +276,7 @@ int test_setup (void)
                  "/tmp/xdtest.%d.copy.%d", pid, x);
   snprintf_func (TEST_NOPERM_FILE, TESTFILESIZE,
                  "/tmp/xdtest.%d.noperm.%d", pid, x);
+
   test_cleanup();
   return 0;
 }
@@ -1509,7 +1514,8 @@ IF_DJW (static int test_secondary_huff (xd3_stream *stream, usize_t gp)
         { return test_secondary (stream, & djw_sec_type, gp); })
 IF_LZMA (static int test_secondary_lzma (xd3_stream *stream, usize_t gp)
         { return test_secondary (stream, & lzma_sec_type, gp); })
-#endif
+
+#endif  /* SECONDARY_ANY */
 
 /***********************************************************************
  TEST INSTRUCTION TABLE
@@ -1906,7 +1912,7 @@ test_recode_command2 (xd3_stream *stream, int has_source,
             recoded_adler32 ? "" : "-n ",
             !change_apphead ? "" :
                 (recoded_apphead ? "-A=recode_apphead " : "-A= "),
-            recoded_secondary ? "-S djw " : "-S none ",
+            recoded_secondary ? "-S djw " : "-S= ",
             TEST_DELTA_FILE,
             TEST_COPY_FILE);
 
@@ -2002,6 +2008,7 @@ test_recode_command2 (xd3_stream *stream, int has_source,
     {
       return ret;
     }
+  test_cleanup ();
 
   return 0;
 }
@@ -2040,7 +2047,46 @@ test_recode_command (xd3_stream *stream, int ignore)
 
   return 0;
 }
-#endif
+
+#if SECONDARY_LZMA
+int test_secondary_lzma_default (xd3_stream *stream, int ignore)
+{
+  char ecmd[TESTBUFSIZE];
+  int ret;
+
+  test_setup ();
+
+  if ((ret = test_make_inputs (stream, NULL, NULL)))
+    {
+      return ret;
+    }
+
+  /* First encode */
+  snprintf_func (ecmd, TESTBUFSIZE, "%s -e %s %s",
+                 program_name,
+                 TEST_TARGET_FILE,
+                 TEST_DELTA_FILE);
+
+  if ((ret = system (ecmd)) != 0)
+    {
+      return XD3_INTERNAL;
+    }
+
+  if ((ret = check_vcdiff_header (stream,
+                                  TEST_DELTA_FILE,
+                                  "VCDIFF secondary compressor",
+                                  "lzma",
+                                  1)))
+    {
+      return ret;
+    }
+
+  test_cleanup ();
+  return 0;
+}
+
+#endif  /* SECONDARY_LZMA */
+#endif  /* SHELL_TESTS */
 
 /***********************************************************************
  EXTERNAL I/O DECOMPRESSION/RECOMPRESSION
@@ -2422,6 +2468,7 @@ test_appheader (xd3_stream *stream, int ignore)
       return XD3_INVALID;  // Must have crashed!
     }
 
+  test_cleanup ();
   return 0;
 }
 
@@ -2915,6 +2962,7 @@ xd3_selftest (void)
   DO_TEST (recode_command, 0, 0);
 #endif
 
+  IF_LZMA (DO_TEST (secondary_lzma_default, 0, 0));
   IF_LZMA (DO_TEST (secondary_lzma, 0, 1));
   IF_DJW (DO_TEST (secondary_huff, 0, DJW_MAX_GROUPS));
   IF_FGK (DO_TEST (secondary_fgk, 0, 1));