Fix 'xdelta3: -B: maximum value: 9223372036854775808'

7 files changed, 70 insertions, 9 deletions

diff --git a/xdelta3/Makefile.all b/xdelta3/Makefile.all
new file mode 100644
index 0000000..c8e8cc0
--- /dev/null
+++ b/xdelta3/Makefile.all
@@ -0,0 +1,40 @@
+# -*- Mode: Makefile -*-
+all: 32_32_32 32_32_64 32_64_64 64_32_32 64_32_64 64_64_64
+
+32_32_32:
+        (cd ./build/m32/32size-32off && $(MAKE) all)
+
+32_32_64:
+        (cd ./build/m32/32size-64off && $(MAKE) all)
+
+32_64_64:
+        (cd ./build/m32/64size-64off && $(MAKE) all)
+
+64_32_32:
+        (cd ./build/m64/32size-32off && $(MAKE) all)
+
+64_32_64:
+        (cd ./build/m64/32size-64off && $(MAKE) all)
+
+64_64_64:
+        (cd ./build/m64/64size-64off && $(MAKE) all)
+
+clean: 32_32_32_clean 32_32_64_clean 32_64_64_clean 64_32_32_clean 64_32_64_clean 64_64_64_clean
+
+32_32_32_clean:
+        (cd ./build/m32/32size-32off && $(MAKE) clean)
+
+32_32_64_clean:
+        (cd ./build/m32/32size-64off && $(MAKE) clean)
+
+32_64_64_clean:
+        (cd ./build/m32/64size-64off && $(MAKE) clean)
+
+64_32_32_clean:
+        (cd ./build/m64/32size-32off && $(MAKE) clean)
+
+64_32_64_clean:
+        (cd ./build/m64/32size-64off && $(MAKE) clean)
+
+64_64_64_clean:
+        (cd ./build/m64/64size-64off && $(MAKE) clean)
diff --git a/xdelta3/config.h.in b/xdelta3/config.h.in
index 70bb1c2..6607403 100644
--- a/xdelta3/config.h.in
+++ b/xdelta3/config.h.in
@@ -61,6 +61,15 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
 /* The size of `size_t', as computed by sizeof. */
 #undef SIZEOF_SIZE_T
 
diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac
index 3b430d7..313e48b 100644
--- a/xdelta3/configure.ac
+++ b/xdelta3/configure.ac
@@ -8,9 +8,13 @@ AM_INIT_AUTOMAKE([1.9 no-define foreign tar-ustar])
 AX_CHECK_ALIGNED_ACCESS_REQUIRED
 AC_PROG_CC
 AC_PROG_CXX
+AC_CHECK_SIZEOF(size_t)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(long long)
 AC_CHECK_HEADERS([lzma.h])
 AC_CHECK_LIB(lzma, lzma_easy_buffer_encode)
-AC_CHECK_SIZEOF(size_t)
+
 #AM_PATH_PYTHON(,, [:])
 #AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 #AX_PYTHON_DEVEL()
@@ -22,6 +26,7 @@ AC_ARG_ENABLE(debug-symbols,
    AS_HELP_STRING(--enable-debug-symbols,[Build with debug symbols (default is NO)]),,enableval=no)
 AM_CONDITIONAL([DEBUG_SYMBOLS], [test ${enableval} = "yes"])
 
+
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/xdelta3/run_release.sh b/xdelta3/run_release.sh
index 4266af4..fc06491 100755
--- a/xdelta3/run_release.sh
+++ b/xdelta3/run_release.sh
@@ -53,7 +53,7 @@ function buildit {
     D=build/$MACH/${sizebits}size-${offsetbits}off
     mkdir -p $D
     (cd $D && $SRCDIR/configure --prefix=$PWD/bin --enable-debug-symbols)
-    (cd $D && make xdelta3checksum)
+    #(cd $D && make all && make test)
 }
 
 function buildall {
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 63ca51f..157a4fb 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -49,6 +49,8 @@
 
 /*********************************************************************/
 
+#include <limits.h>
+
 #ifndef XD3_POSIX
 #define XD3_POSIX 0
 #endif
@@ -669,14 +671,17 @@ main_strtoxoff (const char* s, xoff_t *xo, char which)
   XD3_ASSERT(s && *s != 0);
 
   {
-    /* Should check LONG_MIN, LONG_MAX, LLONG_MIN, LLONG_MAX? */
-#if SIZEOF_XOFF_T == 4
-    long xx = strtol (s, &e, 0);
+#if SIZEOF_XOFF_T == SIZEOF_LONG_LONG
+    unsigned long long xx = strtoull (s, &e, 0);
+    unsigned long long bad = ULLONG_MAX;
+#elif SIZEOF_XOFF_T <= SIZEOF_LONG
+    unsigned long xx = strtoul (s, &e, 0);
+    unsigned long long bad = ULONG_MAX;
 #else
-    long long xx = strtoll (s, &e, 0);
+    /* Something wrong with SIZEOF_XOFF_T, SIZEOF_LONG, etc. */
 #endif
 
-    if (xx < 0)
+    if (xx == bad)
       {
         XPR(NT "-%c: negative integer: %s\n", which, s);
         return EXIT_FAILURE;
@@ -703,7 +708,7 @@ main_atoux (const char* arg, xoff_t *xo, xoff_t low,
   int ret;
 
   if ((ret = main_strtoxoff (arg, & x, which))) { return ret; }
-
+  XPR(NT "SEE -%c: value %"Q" low %"Q" high %"Q"\n", which, x, low, high);
   if (x < low)
     {
       XPR(NT "-%c: minimum value: %"Q"\n", which, low);
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 612e747..42fdfe2 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -349,7 +349,9 @@ typedef unsigned int xd3_rtype;
 
 #include "xdelta3-list.h"
 
+#if XD3_ENCODER
 XD3_MAKELIST(xd3_rlist, xd3_rinst, link);
+#endif
 
 /***********************************************************************/
 
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 7b63b9c..f1aa5d8 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -25,7 +25,7 @@
 #ifndef _XDELTA3_H_
 #define _XDELTA3_H_
 
-#define _POSIX_SOURCE
+#define _POSIX_SOURCE 200112L
 #define _ISOC99_SOURCE
 #define _C99_SOURCE