Implement adler32 and appheader for merge command.

5 files changed, 59 insertions, 29 deletions

diff --git a/xdelta3/testing/delta.h b/xdelta3/testing/delta.h
index 103d7cc..58fbaac 100644
--- a/xdelta3/testing/delta.h
+++ b/xdelta3/testing/delta.h
@@ -15,7 +15,7 @@ public:
   }
 
   xoff_t Windows() const {
-    return stream_.whole_target.windows;
+    return stream_.whole_target.wininfolen;
   }
 
   void Print() const;
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 46b2cfb..9bc438f 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -1807,6 +1807,13 @@ main_merge_output (xd3_stream *stream, main_file *ofile)
       return ret;
     }
 
+  if (option_use_appheader != 0 &&
+      option_appheader != NULL)
+    {
+      xd3_set_appheader (recode_stream, option_appheader,
+                         strlen ((char*) option_appheader));
+    }
+
   /* 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);
@@ -1839,8 +1846,24 @@ main_merge_output (xd3_stream *stream, main_file *ofile)
       /* Window sizes must match from the input to the output, so that
        * target copies are in-range (and so that checksums carry
        * over). */
-      XD3_ASSERT (window_num < stream->whole_target.winsizeslen);
-      window_size = stream->whole_target.winsizes[window_num++];
+      XD3_ASSERT (window_num < stream->whole_target.wininfolen);
+      window_size = stream->whole_target.wininfo[window_num].length;
+
+      /* Output position should also match. */
+      if (output_pos != stream->whole_target.wininfo[window_num].offset)
+        {
+          XPR(NT "internal merge error: offset mismatch\n");
+          return XD3_INVALID;
+        }
+
+      if (option_use_checksum &&
+          (stream->dec_win_ind & VCD_ADLER32) != 0) 
+        {
+          recode_stream->flags |= XD3_ADLER32_RECODE;
+          recode_stream->recode_adler32 = stream->whole_target.wininfo[window_num].adler32;
+        }
+
+      window_num++;
 
       if (main_bsize < window_size)
         {
diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h
index 553fbf0..2253a2c 100644
--- a/xdelta3/xdelta3-merge.h
+++ b/xdelta3/xdelta3-merge.h
@@ -28,19 +28,19 @@ xd3_whole_state_init (xd3_stream *stream)
 {
   XD3_ASSERT (stream->whole_target.adds == NULL);
   XD3_ASSERT (stream->whole_target.inst == NULL);
-  XD3_ASSERT (stream->whole_target.winsizes == NULL);
+  XD3_ASSERT (stream->whole_target.wininfo == NULL);
   XD3_ASSERT (stream->whole_target.length == 0);
 
   stream->whole_target.adds_alloc = XD3_ALLOCSIZE;
   stream->whole_target.inst_alloc = XD3_ALLOCSIZE;
-  stream->whole_target.winsizes_alloc = XD3_ALLOCSIZE;
+  stream->whole_target.wininfo_alloc = XD3_ALLOCSIZE;
 
   if ((stream->whole_target.adds = (uint8_t*) 
        xd3_alloc (stream, stream->whole_target.adds_alloc, 1)) == NULL ||
       (stream->whole_target.inst = (xd3_winst*) 
        xd3_alloc (stream, stream->whole_target.inst_alloc, 1)) == NULL ||
-      (stream->whole_target.winsizes = (usize_t*) 
-       xd3_alloc (stream, stream->whole_target.winsizes_alloc, 1)) == NULL)
+      (stream->whole_target.wininfo = (xd3_wininfo*) 
+       xd3_alloc (stream, stream->whole_target.wininfo_alloc, 1)) == NULL)
     {
       return ENOMEM;
     }
@@ -54,7 +54,7 @@ xd3_swap_whole_state (xd3_whole_state *a,
   xd3_whole_state tmp;
   XD3_ASSERT (a->inst != NULL && a->adds != NULL);
   XD3_ASSERT (b->inst != NULL && b->adds != NULL);
-  XD3_ASSERT (b->winsizes != NULL && b->winsizes != NULL);
+  XD3_ASSERT (b->wininfo != NULL && b->wininfo != NULL);
   memcpy (&tmp, a, sizeof (xd3_whole_state));
   memcpy (a, b, sizeof (xd3_whole_state));
   memcpy (b, &tmp, sizeof (xd3_whole_state));
@@ -139,22 +139,22 @@ xd3_whole_alloc_adds (xd3_stream *stream,
 }
 
 static int
-xd3_whole_alloc_winsize (xd3_stream *stream,
-                         usize_t **winsizep)
+xd3_whole_alloc_wininfo (xd3_stream *stream,
+                         xd3_wininfo **wininfop)
 {
   int ret;
 
   if ((ret = xd3_realloc_buffer (stream, 
-                                 stream->whole_target.winsizeslen, 
-                                 sizeof (xd3_winst),
+                                 stream->whole_target.wininfolen, 
+                                 sizeof (xd3_wininfo),
                                  1,
-                                 & stream->whole_target.winsizes_alloc, 
-                                 (void**) & stream->whole_target.winsizes))) 
+                                 & stream->whole_target.wininfo_alloc, 
+                                 (void**) & stream->whole_target.wininfo))) 
     { 
       return ret; 
     }
 
-  *winsizep = &stream->whole_target.winsizes[stream->whole_target.winsizeslen++];
+  *wininfop = &stream->whole_target.wininfo[stream->whole_target.wininfolen++];
 
   return 0;
 }
@@ -223,13 +223,13 @@ int
 xd3_whole_append_window (xd3_stream *stream)
 {
   int ret;
-  usize_t *winsize;
+  xd3_wininfo *wininfo;
 
-  stream->whole_target.windows += 1;
-  
-  if ((ret = xd3_whole_alloc_winsize (stream, &winsize))) { return ret; }
+  if ((ret = xd3_whole_alloc_wininfo (stream, &wininfo))) { return ret; }
 
-  *winsize = stream->dec_tgtlen;
+  wininfo->length = stream->dec_tgtlen;
+  wininfo->offset = stream->dec_winstart;
+  wininfo->adler32 = stream->dec_adler32;
 
   while (stream->inst_sect.buf < stream->inst_sect.buf_max)
     {
@@ -533,12 +533,12 @@ int xd3_merge_inputs (xd3_stream *stream,
   usize_t i;
   size_t input_i;
 
-  for (i = 0; i < input->winsizeslen; ++i) {
-    usize_t *copysize;
+  for (i = 0; i < input->wininfolen; ++i) {
+    xd3_wininfo *copyinfo;
 
-    if ((ret = xd3_whole_alloc_winsize (stream, &copysize))) { return ret; }
+    if ((ret = xd3_whole_alloc_wininfo (stream, &copyinfo))) { return ret; }
 
-    *copysize = input->winsizes[i];
+    *copyinfo = input->wininfo[i];
   }
 
   /* iterate over each instruction. */
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 7921556..9028d0c 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -2295,7 +2295,7 @@ xd3_free_stream (xd3_stream *stream)
 
   xd3_free (stream, stream->whole_target.adds);
   xd3_free (stream, stream->whole_target.inst);
-  xd3_free (stream, stream->whole_target.winsizes);
+  xd3_free (stream, stream->whole_target.wininfo);
 
   XD3_ASSERT (stream->alloc_cnt == stream->free_cnt);
 
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 362e173..3aab8b6 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -249,6 +249,7 @@ typedef struct _xd3_code_table_desc    xd3_code_table_desc;
 typedef struct _xd3_code_table_sizes   xd3_code_table_sizes;
 typedef struct _xd3_slist              xd3_slist;
 typedef struct _xd3_whole_state        xd3_whole_state;
+typedef struct _xd3_wininfo            xd3_wininfo;
 
 /* The stream configuration has three callbacks functions, all of
  * which may be supplied with NULL values.  If config->getblk is
@@ -638,6 +639,13 @@ struct _xd3_slist
   usize_t     last_pos;
 };
 
+/* window info (for whole state) */
+struct _xd3_wininfo {
+  xoff_t offset;
+  usize_t length;
+  uint32_t adler32;
+};
+
 /* whole state for, e.g., merge */
 struct _xd3_whole_state {
   usize_t addslen;
@@ -648,12 +656,11 @@ struct _xd3_whole_state {
   xd3_winst *inst;
   usize_t  inst_alloc;
 
-  usize_t winsizeslen;
-  usize_t *winsizes;
-  usize_t winsizes_alloc;
+  usize_t wininfolen;
+  xd3_wininfo *wininfo;
+  usize_t wininfo_alloc;
 
   xoff_t length;
-  xoff_t windows;
 };
 
 /********************************************************************