Fix parsing error for 0-instruction patch files.

Exit 0 on success for delta_command().  Used to exit 0 or 1 like diff.

2 files changed, 8 insertions, 4 deletions

diff --git a/xdelta1/libedsio/edsio.el b/xdelta1/libedsio/edsio.el
index d8cd91e..8c15215 100644
--- a/xdelta1/libedsio/edsio.el
+++ b/xdelta1/libedsio/edsio.el
@@ -1017,7 +1017,7 @@ replacement is as for replace-regexp."
          (format "%s{
 %s  gint i;
 %s  if (! (* source->next_uint) (source, &%s_len)) goto bail;
-%s  if (! (%s = serializeio_source_alloc (source, sizeof (%s) * %s_len))) goto bail;
+%s  if ((%s_len > 0) && ! (%s = serializeio_source_alloc (source, sizeof (%s) * %s_len))) goto bail;
 %s  for (i = 0; i < %s_len; i += 1)
 %s    {
 %s%s      }
@@ -1028,6 +1028,7 @@ replacement is as for replace-regexp."
                  name
                  prefix
                  name
+                 name
                  (field-ctype (cadr field))
                  name
                  prefix
diff --git a/xdelta1/xdmain.c b/xdelta1/xdmain.c
index ca7cdf4..8b6b800 100644
--- a/xdelta1/xdmain.c
+++ b/xdelta1/xdmain.c
@@ -39,7 +39,7 @@
 #ifndef WINHACK
 #include <unistd.h>
 #include <sys/mman.h>
-#define O_BINARY 0
+// #define O_BINARY 0
 
 #else /* WINHACK */
 
@@ -260,6 +260,7 @@ help ()
   xd_error ("  -h, --help         Print this summary\n");
   xd_error ("  -n, --noverify     Disable automatic MD5 verification\n");
   xd_error ("  -p, --pristine     Disable automatic GZIP decompression\n");
+  xd_error ("  -q, --quiet        Do not print warnings\n");
   xd_error ("  -m, --maxmem=SIZE  Set the buffer size limit, e.g. 640K, 16M\n");
   xd_error ("  -[0-9]             ZLIB compress level: 0=none, 1=fast, 6=default, 9=best\n");
   xd_error ("  -s=BLOCK_SIZE      Sets block size (power of 2), minimum match length\n");
@@ -1527,7 +1528,6 @@ delta_command (gint argc, gchar** argv)
       xd_error ("using block size: %d bytes\n", xdp_blocksize ());
     }
 
-
   if (! (from = open_read_seek_handle (argv[0], &from_is_compressed, TRUE)))
     return 2;
 
@@ -1647,7 +1647,10 @@ delta_command (gint argc, gchar** argv)
 
   xdp_generator_free (gen);
 
-  return control_offset != header_offset;
+  /* Note: prior to 1.1.5:
+   * return control_offset != header_offset;
+   */
+  return 0;
 }
 
 static XdeltaPatch*