Straighten up the logic for calling xd3_merge_inputs in both

main_merge_arguments and main_merge_output.

3 files changed, 25 insertions, 5 deletions

diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 4a75ac1..acb0ac0 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -1694,10 +1694,11 @@ main_merge_arguments (main_merge_list* merges)
             {
               xd3_stream tmp_stream;
               memset (& tmp_stream, 0, sizeof (tmp_stream));
-              ret = xd3_merge_inputs (& tmp_stream, 
-                                      & merge_input.whole_target,
-                                      & recode_stream->whole_target);
-              if (ret != 0) 
+              if ((ret = xd3_config_stream (& tmp_stream, NULL)) ||
+                  (ret = xd3_whole_state_init (& tmp_stream)) ||
+                  (ret = xd3_merge_inputs (& tmp_stream, 
+                                           & merge_input.whole_target,
+                                           & recode_stream->whole_target)))
                 {
                   XPR(NT XD3_LIB_ERRMSG (&tmp_stream, ret));
                 }
@@ -1789,6 +1790,17 @@ main_merge_output (xd3_stream *stream, main_file *ofile)
   xoff_t output_pos = 0;
   xd3_source recode_source;
 
+  /* merge_stream is set if there were arguments.  this stream's input
+   * needs to be applied to the merge_stream source. */
+  if (merge_stream != NULL &&
+      (ret = xd3_merge_inputs (stream, 
+                               & merge_stream->whole_target, 
+                               & stream->whole_target)))
+    {
+      XPR(NT XD3_LIB_ERRMSG (stream, ret));
+      return ret;
+    }
+
   /* Enter the ENC_INPUT state and bypass the next_in == NULL test
    * and (leftover) input buffering logic. */
   XD3_ASSERT(recode_stream->enc_state == ENC_INIT);
diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h
index 2c03bb3..2e54cb5 100644
--- a/xdelta3/xdelta3-merge.h
+++ b/xdelta3/xdelta3-merge.h
@@ -197,6 +197,8 @@ int xd3_merge_inputs (xd3_stream *stream,
                       xd3_whole_state *input)
 {
   DP(RINT "Merge inputs!\n");
+
+  xd3_swap_whole_state (&stream->whole_target, input);
   
   return 0;
 }
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 3a0c6e8..d08266e 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -3817,7 +3817,13 @@ xd3_encode_input (xd3_stream *stream)
                    * or else it can get stuck in a match-backward
                    * (getsrcblk) then match-forward (getsrcblk),
                    * find insufficient match length, then repeat
-                   * exactly the same search. */
+                   * exactly the same search. 
+                   *
+                   * TODO: would be better to solve this be remebering
+                   * the previous address and avoiding long matches 
+                   * in xd3_string_match(), since there could still be
+                   * a small match at ths position.  Write a test
+                   * that reproduces the above scenario. */
                   if (stream->match_fwd != 0) {
                     stream->input_position += stream->match_fwd;
                   } else {