5 files changed, 34 insertions, 65 deletions

diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc
index 05a27ff..c39d56c 100644
--- a/xdelta3/testing/regtest.cc
+++ b/xdelta3/testing/regtest.cc
@@ -690,12 +690,14 @@ void FourWayMergeTest(const TestOptions &options,
   tcmd.push_back(recon.Name());
   tcmd.push_back(NULL);
 
+  DP(RINT "Running one recon! %s\n", CommandToString(tcmd).c_str());
   CHECK_EQ(0, xd3_main_cmdline(tcmd.size() - 1, 
                                const_cast<char**>(&tcmd[0])));
-  DP(RINT "Ran one recon! %s\n", CommandToString(tcmd).c_str());
   DP(RINT "Should equal! %s\n", f2.Name());
 
   CHECK(recon.EqualsSpec(spec2));
+
+  /* TODO: we've only done 3-way merges, try 4-way. */
 }
 
 void TestMergeCommand1() {
@@ -758,6 +760,8 @@ void TestMergeCommand1() {
 
 void TestMergeCommand2() {
   /* Same as above, different mutation pattern. */
+  /* TODO: run this with large sizes too */
+  /* TODO: run this with small sizes too */
   MTRandom rand;
   FileSpec spec0(&rand);
   FileSpec spec1(&rand);
@@ -806,6 +810,7 @@ void TestMergeCommand2() {
           spec0.ModifyTo(ChangeListMutator(cl3), &spec3);
 
           FourWayMergeTest(options, spec0, spec1, spec2, spec3);
+          FourWayMergeTest(options, spec3, spec2, spec1, spec0);
         }
       }
     }
@@ -816,19 +821,19 @@ void TestMergeCommand2() {
 
 int main(int argc, char **argv) {
 #define TEST(x) cerr << #x << "..." << endl; x()
-//   TEST(TestRandomNumbers);
-//   TEST(TestRandomFile);
-//   TEST(TestFirstByte);
-//   TEST(TestEmptyInMemory);
-//   TEST(TestBlockInMemory);
-//   TEST(TestModifyMutator);
-//   TEST(TestAddMutator);
-//   TEST(TestDeleteMutator);
-//   TEST(TestCopyMutator);
-//   TEST(TestMoveMutator);
-//   TEST(TestOverwriteMutator);
-//   TEST(TestNonBlockingProgress);
-//   TEST(TestMergeCommand1);
+  TEST(TestRandomNumbers);
+  TEST(TestRandomFile);
+  TEST(TestFirstByte);
+  TEST(TestEmptyInMemory);
+  TEST(TestBlockInMemory);
+  TEST(TestModifyMutator);
+  TEST(TestAddMutator);
+  TEST(TestDeleteMutator);
+  TEST(TestCopyMutator);
+  TEST(TestMoveMutator);
+  TEST(TestOverwriteMutator);
+  TEST(TestNonBlockingProgress);
+  TEST(TestMergeCommand1);
   TEST(TestMergeCommand2);
   return 0;
 }
diff --git a/xdelta3/xdelta3-decode.h b/xdelta3/xdelta3-decode.h
index d67f00a..bf2b0b1 100644
--- a/xdelta3/xdelta3-decode.h
+++ b/xdelta3/xdelta3-decode.h
@@ -23,15 +23,6 @@
                      VCD_SOURCE : ((((x) & VCD_SRCORTGT) == \
                                     VCD_TARGET) ? VCD_TARGET : 0))
 
-/* Return true if the caller must provide a source.  Theoretically,
- * this has to be checked after every window.  It could be that the
- * first window requires no source, but the second window does.  In
- * practice? */
-int xd3_decoder_needs_source (xd3_stream *stream)
-{
-  return stream->dec_win_ind & VCD_SOURCE;
-}
-
 /* Initialize the decoder for a new window.  The dec_tgtlen value is
  * preserved across successive window decodings, and the update to
  * dec_winstart is delayed until a new window actually starts.  This
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index c0639e0..a3f5238 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -3370,33 +3370,12 @@ main_input (xd3_cmd     cmd,
              * the sources. */
             if (cmd == CMD_DECODE)
               {
-                int have_src = sfile->filename != NULL;
-                int need_src = xd3_decoder_needs_source (& stream);
-                int recv_src;
-
                 /* May need to set the sfile->filename if none was given. */
                 main_get_appheader (& stream, ifile, ofile, sfile);
 
-                recv_src = sfile->filename != NULL;
-
-                /* Check if the user expected a source to be required although
-                 * it was not. */
-                if (have_src && ! need_src && option_verbose)
-                  {
-                    XPR(NT "warning: output window %"Q"u does not "
-                        "copy source\n", stream.current_window);
-                  }
-
-                /* Check if we have no source name and need one. */
-                if (need_src && ! recv_src)
-                  {
-                    XPR(NT "input requires a source file, use -s\n");
-                    return EXIT_FAILURE;
-                  }
-
                 /* Now open the source file. */
-                if (need_src &&
-                    (ret = main_set_source (& stream, cmd, sfile, & source)))
+                  if ((sfile->filename != NULL) &&
+                      (ret = main_set_source (& stream, cmd, sfile, & source)))
                   {
                     return EXIT_FAILURE;
                   }
@@ -3406,8 +3385,7 @@ main_input (xd3_cmd     cmd,
                      cmd == CMD_PRINTDELTA ||
                      cmd == CMD_RECODE)
               {
-                if (xd3_decoder_needs_source (& stream) &&
-                    sfile->filename == NULL)
+                if (sfile->filename == NULL)
                   {
                     allow_fake_source = 1;
                     sfile->filename = "<placeholder>";
diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h
index 8905643..434cf43 100644
--- a/xdelta3/xdelta3-merge.h
+++ b/xdelta3/xdelta3-merge.h
@@ -183,7 +183,9 @@ xd3_whole_append_inst (xd3_stream *stream,
         }
       else
         {
-          winst->addr = stream->total_out + inst->addr - stream->dec_cpylen;
+          winst->addr = (stream->dec_winstart + 
+                         inst->addr - 
+                         stream->dec_cpylen);
         }
       break;
     }
@@ -207,16 +209,16 @@ xd3_whole_append_window (xd3_stream *stream)
 
       if ((stream->dec_current1.type != XD3_NOOP) &&
           (ret = xd3_whole_append_inst (stream,
-                                        & stream->dec_current1)))
+                                        & stream->dec_current1)))
         {
-          return ret;
+          return ret;
         }
 
       if ((stream->dec_current2.type != XD3_NOOP) &&
-          (ret = xd3_whole_append_inst (stream,
-                                        & stream->dec_current2)))
+          (ret = xd3_whole_append_inst (stream,
+                                        & stream->dec_current2)))
         {
-          return ret;
+          return ret;
         }
     }
 
@@ -317,8 +319,6 @@ xd3_merge_target_copy (xd3_stream *stream,
   int ret;
   xd3_winst *oinst;
 
-  // TODO: this is totally untested
-
   if ((ret = xd3_whole_alloc_winst (stream, &oinst)))
     {
       return ret;
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index a989a63..fc3316a 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -1141,9 +1141,10 @@ void    xd3_free_stream   (xd3_stream    *stream);
  * be called before the first xd3_encode_input.  A NULL source is
  * ignored.  For decoding, this should be called before the first
  * window is decoded, but the appheader may be read first
- * (XD3_GOTHEADER).  At this point, consult
- * xd3_decoder_needs_source(), inlined below, to determine if a source
- * is expected by the decoder. */
+ * (XD3_GOTHEADER).  After decoding the header, call xd3_set_source()
+ * if you have a source file.  Note: if (stream->dec_win_ind & VCD_SOURCE)
+ * is true, it means the first window expects there to be a source file.
+ */
 int     xd3_set_source    (xd3_stream    *stream,
                            xd3_source    *source);
 
@@ -1161,12 +1162,6 @@ int     xd3_get_appheader (xd3_stream     *stream,
                            uint8_t       **data,
                            usize_t        *size);
 
-/* After receiving XD3_GOTHEADER, the decoder should check this
- * function which returns 1 if the decoder will require source
- * data. */
-int     xd3_decoder_needs_source (xd3_stream *stream);
-
-
 /* To generate a VCDIFF encoded delta with xd3_encode_init() from
  * another format, use:
  *