9 files changed, 57 insertions, 22 deletions

diff --git a/xdelta3/examples/Makefile b/xdelta3/examples/Makefile
index 7bc575c..b21ebda 100755
--- a/xdelta3/examples/Makefile
+++ b/xdelta3/examples/Makefile
@@ -1,5 +1,5 @@
-#CFLAGS = -g -Wall -I.. -DXD3_DEBUG=1 -DNDEBUG=0
-CFLAGS = -O3 -Wall -I.. -DXD3_DEBUG=0 -fno-builtin -DNDEBUG=1
+CFLAGS = -g -Wall -I.. -DXD3_DEBUG=1 -DNDEBUG=0
+#CFLAGS = -O3 -Wall -I.. -DXD3_DEBUG=0 -fno-builtin -DNDEBUG=1
 # -pg
 
 SOURCES = small_page_test.c encode_decode_test.c speed_test.c
diff --git a/xdelta3/examples/checksum_test.cc b/xdelta3/examples/checksum_test.cc
index 56fb641..65e3d50 100644
--- a/xdelta3/examples/checksum_test.cc
+++ b/xdelta3/examples/checksum_test.cc
@@ -590,7 +590,7 @@ void print_array(const char *tname) {
 int main(int argc, char** argv) {
   int i;
   uint8_t *buf = NULL;
-  usize_t buf_len = 0;
+  size_t buf_len = 0;
   int ret;
 
   if (argc <= 1) {
diff --git a/xdelta3/examples/compare_test.c b/xdelta3/examples/compare_test.c
index 1cc41a8..f3b3ea2 100644
--- a/xdelta3/examples/compare_test.c
+++ b/xdelta3/examples/compare_test.c
@@ -4,13 +4,15 @@
 #include <string.h>
 #include <assert.h>
 
+#include "xdelta3.h"
+
 #define NUM (1<<20)
 #define ITERS 100
 
 /* From wikipedia on RDTSC */
-__inline__ uint64_t rdtsc() {
+inline uint64_t rdtsc() {
   uint32_t lo, hi;
-  __asm__ __volatile__ ("rdtsc" : "=a" (lo), "=d" (hi));
+  asm volatile ("rdtsc" : "=a" (lo), "=d" (hi));
   return (uint64_t)hi << 32 | lo;
 }
 
diff --git a/xdelta3/examples/encode_decode_test.c b/xdelta3/examples/encode_decode_test.c
index 2b585df..353d8db 100644
--- a/xdelta3/examples/encode_decode_test.c
+++ b/xdelta3/examples/encode_decode_test.c
@@ -65,7 +65,7 @@ int code (
     Input_Buf_Read = fread(Input_Buf, 1, BufSize, InFile);

     if (Input_Buf_Read < BufSize)

     {

-      xd3_set_flags(&stream, XD3_FLUSH);

+      xd3_set_flags(&stream, XD3_FLUSH | stream.flags);

     }

     xd3_avail_input(&stream, Input_Buf, Input_Buf_Read);

 

@@ -156,11 +156,21 @@ int main(int argc, char* argv[])
   FILE* OutFile;

   int r;

 

+  if (argc != 3) {

+    fprintf (stderr, "usage: %s source input output\n", argv[0]);

+    return 1;

+  }

+

+  char *input = argv[2];

+  char *source = argv[1];

+  const char *output = "encoded.testdata";

+  const char *decoded = "decoded.testdata";

+

   /* Encode */

 

-  InFile = fopen("input.txt", "rb");

-  SrcFile = fopen("source.txt", "rb");

-  OutFile = fopen("encoded.txt", "wb");

+  InFile = fopen(input, "rb");

+  SrcFile = fopen(source, "rb");

+  OutFile = fopen(output, "wb");

 

   r = code (1, InFile, SrcFile, OutFile, 0x1000);

 

@@ -168,14 +178,16 @@ int main(int argc, char* argv[])
   fclose(SrcFile);

   fclose(InFile);

 

-  if (r)

+  if (r) {

+    fprintf (stderr, "Encode error: %d\n", r);

     return r;

+  }

 

   /* Decode */

 

-  InFile = fopen("encoded.txt", "rb");

-  SrcFile = fopen("source.txt", "rb");

-  OutFile = fopen("decoded.txt", "wb");

+  InFile = fopen(output, "rb");

+  SrcFile = fopen(source, "rb");

+  OutFile = fopen(decoded, "wb");

 

   r = code (0, InFile, SrcFile, OutFile, 0x1000);

 

@@ -183,8 +195,10 @@ int main(int argc, char* argv[])
   fclose(SrcFile);

   fclose(InFile);

 

-  if (r)

+  if (r) {

+    fprintf (stderr, "Decode error: %d\n", r);

     return r;

+  }

 

   return 0;

 }

diff --git a/xdelta3/examples/small_page_test.c b/xdelta3/examples/small_page_test.c
index 8a4532b..2d9ae93 100755
--- a/xdelta3/examples/small_page_test.c
+++ b/xdelta3/examples/small_page_test.c
@@ -62,6 +62,8 @@ process_page (int            is_encode,
   context_t *ctx = calloc(SPACE_MAX, 1);
   int ret;
 
+  memset (&config, 0, sizeof(config));
+
   if (ctx == NULL)
     {
       printf("calloc failed\n");
@@ -142,7 +144,8 @@ int test(int stride, int encode_flags)
                            &output_size, OUTPUT_MAX,
                            encode_flags)) != 0)
     {
-      fprintf (stderr, "encode failed: stride %u flags 0x%x\n", stride, encode_flags);
+      fprintf (stderr, "encode failed: stride %u flags 0x%x\n", 
+               stride, encode_flags);
       return ret;
     }
 
@@ -153,7 +156,7 @@ int test(int stride, int encode_flags)
                            0)) != 0)
     {
       fprintf (stderr, "decode failed: stride %u output_size %u flags 0x%x\n",
-              stride, output_size, encode_flags);
+               stride, output_size, encode_flags);
       return ret;
     }
 
@@ -172,7 +175,8 @@ int test(int stride, int encode_flags)
         }
     }
 
-  fprintf(stderr, "stride %d flags 0x%x size %u ", stride, encode_flags, output_size);
+  fprintf(stderr, "stride %d flags 0x%x size %u ", 
+          stride, encode_flags, output_size);
   fprintf(stderr, "%s\n", (ret == 0) ? "OK" : "FAIL");
 
   return 0;
diff --git a/xdelta3/examples/test.h b/xdelta3/examples/test.h
index 70e46ff..e8016bb 100644
--- a/xdelta3/examples/test.h
+++ b/xdelta3/examples/test.h
@@ -11,7 +11,7 @@ static int read_whole_file(const char *name,
   main_file file;
   int ret;
   xoff_t len;
-  size_t nread;
+  usize_t nread;
   main_file_init(&file);
   file.filename = name;
   ret = main_file_open(&file, name, XO_READ);
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index b8e800e..4a75ac1 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -1816,7 +1816,8 @@ main_merge_output (xd3_stream *stream, main_file *ofile)
           main_free (main_bdata);
           main_bdata = NULL;
           main_bsize = 0;
-          if ((main_bdata = (uint8_t*) main_malloc (stream->dec_tgtlen)) == NULL)
+          if ((main_bdata = (uint8_t*) 
+               main_malloc (stream->dec_tgtlen)) == NULL)
             {
               return ENOMEM;
             }
@@ -3510,11 +3511,13 @@ done:
       main_file_close (sfile);
     }
 
+#if VCDIFF_TOOLS
   if (cmd == CMD_MERGE &&
       (ret = main_merge_output (& stream, ofile)))
     {
       return EXIT_FAILURE;
     }
+#endif /* VCDIFF_TOOLS */
 
   /* If output file is not open yet because of delayed-open, it means
    * we never encountered a window in the delta, but it could have had
@@ -4039,11 +4042,13 @@ main (int argc, char **argv)
       if (! option_stdout) { ofile.filename = argv[1]; }
     }
 
+#if VCDIFF_TOOLS
   if (cmd == CMD_MERGE &&
       (ret = main_merge_arguments (&merge_order)))
     {
       goto cleanup;
     }
+#endif /* VCDIFF_TOOLS */
 
   switch (cmd)
     {
diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h
index 8cbbb25..2c03bb3 100644
--- a/xdelta3/xdelta3-merge.h
+++ b/xdelta3/xdelta3-merge.h
@@ -191,12 +191,13 @@ xd3_whole_append_window (xd3_stream *stream)
 }
 
 /* xd3_merge_inputs() applies *input to *source, returns its result in
- * tmp_stream. */
+ * stream. */
 int xd3_merge_inputs (xd3_stream *stream, 
                       xd3_whole_state *source,
                       xd3_whole_state *input)
 {
   DP(RINT "Merge inputs!\n");
+  
   return 0;
 }
 
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 17985ae..3a0c6e8 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -3813,7 +3813,16 @@ xd3_encode_input (xd3_stream *stream)
                       return ret;
                     }
 
-                  stream->input_position += stream->match_fwd;
+                  /* The search has to make forward progress here
+                   * 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. */
+                  if (stream->match_fwd != 0) {
+                    stream->input_position += stream->match_fwd;
+                  } else {
+                    stream->input_position += 1;
+                  }
                 }
 
             case MATCH_SEARCHING:
@@ -4741,7 +4750,7 @@ xd3_smatch (xd3_stream *stream,
 
  again:
 
-  IF_DEBUG1 (DP(RINT "smatch at base=%u inp=%u cksum=%u\n", base,
+  IF_DEBUG2 (DP(RINT "smatch at base=%u inp=%u cksum=%u\n", base,
                 stream->input_position, scksum));
 
   /* For small matches, we can always go to the end-of-input because