7 files changed, 111 insertions, 64 deletions

diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index 96b0ef6..f3c2970 100644
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -1,5 +1,17 @@
 # xdelta 3 - delta compression tools and library
-# Copyright (C) 2001, 2003, 2004, 2005, 2006.  Joshua P. MacDonald
+# Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007.  Joshua P. MacDonald
+
+UNAME = $(shell uname)
+CYGWIN = $(findstring CYGWIN, $(UNAME))
+PYVER = 2.5
+
+ifeq ("$(CYGWIN)", "")
+SWIGTGT = xdelta3module.so
+PYTGT = build/lib.linux-i686-$(PYVER)/xdelta3main.so
+else
+SWIGTGT = xdelta3module.dll
+PYTGT = build/lib.cygwin-1.5.24-i686-$(PYVER)/xdelta3main.dll
+endif
 
 SOURCES = xdelta3-cfgs.h \
           xdelta3-decode.h \
@@ -20,7 +32,6 @@ TARGETS = xdelta3-debug \
           xdelta3-debug3 \
           xdelta3.o \
           xdelta3_wrap.o \
-          xdelta3module.so \
           xdelta3-32 \
           xdelta3-64 \
           xdelta3-everything \
@@ -29,7 +40,7 @@ TARGETS = xdelta3-debug \
           xdelta3-Op \
           xdelta3-decoder xdelta3-decoder-nomain.o \
           xdelta3-nosec.o xdelta3-all.o xdelta3-fgk.o \
-          xdelta3-noext xdelta3-tools xdelta3-tune \
+          xdelta3-noext xdelta3-tools \
           xdelta3-notools \
           xdelta3_wrap.c xdelta3.py \
           $(PYTGT) $(SWIGTGT)
@@ -38,11 +49,12 @@ PYTHON = python
 
 WIXDIR = "/cygdrive/c/Program Files/wix2.0.4820"
 
-#SWIGTGT = xdelta3module.so
-SWIGTGT = xdelta3module.dll
+CFLAGS= -Wall -Wshadow -fno-builtin
 
-#PYTGT = build/lib.linux-i686-2.4/xdelta3main.so
-PYTGT = build/lib.cygwin-1.5.24-i686-2.4/xdelta3main.dll
+# $Format: "REL=$Xdelta3Version$" $
+REL=3.0t
+
+RELDIR = xdelta$(REL)
 
 EXTRA = Makefile COPYING linkxd3lib.c badcopy.c xdelta3.swig \
         draft-korn-vcdiff.txt xdelta3.vcproj badcopy.vcproj \
@@ -62,10 +74,6 @@ SWIG_FLAGS = -DXD3_DEBUG=0 \
               -DVCDIFF_TOOLS=1 \
               -DSWIG_MODULE=1
 
-# $Format: "REL=$Xdelta3Version$" $
-REL=3.0t_pre0
-RELDIR = xdelta$(REL)
-
 all: xdelta3-debug xdelta3
 
 all-py: all $(PYTGT) $(SWIGTGT)
@@ -108,7 +116,7 @@ wix: xdelta3.wxs xdelta3.wxi readme.txt Release\xdelta3.exe
         $(WIXDIR)/light.exe xdelta3.wixobj -out xdelta3.msi
 
 xdelta3: $(SOURCES)
-        $(CC) -O3 -Wall -Wshadow -fno-builtin xdelta3.c -lm -o xdelta3 \
+        $(CC) $(CFLAGS) -O3 xdelta3.c -lm -o xdelta3 \
               -DGENERIC_ENCODE_TABLES=0 \
               -DREGRESSION_TEST=1 \
               -DSECONDARY_DJW=1 \
@@ -120,7 +128,7 @@ xdelta3: $(SOURCES)
               -DXD3_USE_LARGEFILE64=1
 
 xdelta3-debug: $(SOURCES)
-        $(CC) -g -Wall -Wshadow -fno-builtin xdelta3.c -lm -o xdelta3-debug \
+        $(CC) -g $(CFLAGS) xdelta3.c -lm -o xdelta3-debug \
                 -DGENERIC_ENCODE_TABLES=1 \
                 -DREGRESSION_TEST=1 \
                 -DSECONDARY_DJW=1 \
@@ -132,7 +140,7 @@ xdelta3-debug: $(SOURCES)
                 -DXD3_USE_LARGEFILE64=1
 
 xdelta3-32: $(SOURCES)
-        $(CC) -O3 -Wall -Wshadow -fno-builtin xdelta3.c -lm -o xdelta3-32 \
+        $(CC) -O3 $(CFLAGS) xdelta3.c -lm -o xdelta3-32 \
               -DXD3_DEBUG=1 \
               -DXD3_USE_LARGEFILE64=0 \
               -DREGRESSION_TEST=1 \
@@ -142,7 +150,7 @@ xdelta3-32: $(SOURCES)
               -DXD3_POSIX=1
 
 xdelta3-debug2: $(SOURCES)
-        $(CC) -g -Wall -Wshadow \
+        $(CC) -g $(CFLAGS) \
                 xdelta3.c -o xdelta3-debug2 \
                 -DXD3_DEBUG=2 \
                 -DXD3_MAIN=1 \
@@ -155,8 +163,16 @@ xdelta3-debug2: $(SOURCES)
                 -lm
 
 xdelta3-debug3: $(SOURCES)
-        $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3-debug3 -DXD3_MAIN=1 -DGENERIC_ENCODE_TABLES=1 \
-                -DXD3_USE_LARGEFILE64=1 -DXD3_STDIO=1 -DREGRESSION_TEST=1 -DXD3_DEBUG=3 -DSECONDARY_DJW=1 -DSECONDARY_FGK=1 -lm
+        $(CC) -g $(CFLAGS) xdelta3.c -o xdelta3-debug3 \
+                -DXD3_MAIN=1 \
+                -DGENERIC_ENCODE_TABLES=1 \
+                -DXD3_USE_LARGEFILE64=1 \
+                -DXD3_STDIO=1 \
+                -DREGRESSION_TEST=1 \
+                -DXD3_DEBUG=3 \
+                -DSECONDARY_DJW=1 \
+                -DSECONDARY_FGK=1 \
+                -lm
 
 $(PYTGT): $(SOURCES) setup.py
         $(PYTHON) setup.py install --verbose --compile --force
@@ -165,61 +181,99 @@ xdelta3_wrap.c xdelta3.py: xdelta3.swig
         swig -python xdelta3.swig
 
 xdelta3.o: $(SOURCES)
-        $(CC) -O3 -Wall -Wshadow -fno-builtin -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
+        $(CC) -O3 $(CFLAGS) -c xdelta3.c $(SWIG_FLAGS) -o xdelta3.o
 
 xdelta3_wrap.o: xdelta3_wrap.c
-        $(CC) $(SWIG_FLAGS) \
+        $(CC) -O3 $(CFLAGS) $(SWIG_FLAGS) \
               -DHAVE_CONFIG_H \
-              -I/usr/include/python2.5 \
-              -I/usr/lib/python2.5/config \
+              -I/usr/include/python$(PYVER) \
+              -I/usr/lib/python$(PYVER)/config \
               -fpic \
-              -c -O3 -fno-builtin xdelta3_wrap.c
+              -c xdelta3_wrap.c
 
 xdelta3module.dll: xdelta3_wrap.o xdelta3.o
-        gcc -shared -Wl,--enable-auto-image-base xdelta3.o xdelta3_wrap.o -L/usr/lib/python2.5/config -lpython2.5 -o xdelta3module.dll
-        cp $(SWIGTGT) /usr/lib/python2.5/site-packages
+        gcc -shared -Wl,--enable-auto-image-base \
+                xdelta3.o \
+                xdelta3_wrap.o \
+                -L/usr/lib/python$(PYVER)/config \
+                -lpython$(PYVER) \
+                -o xdelta3module.dll
+        cp $(SWIGTGT) /usr/lib/python$(PYVER)/site-packages
 
 xdelta3module.so: xdelta3_wrap.o xdelta3.o
-        ld -shared xdelta3.o xdelta3_wrap.o -o xdelta3module.so /usr/lib/libpython2.4.so -lgcc_s -lc
+        ld -shared xdelta3.o xdelta3_wrap.o \
+                -o xdelta3module.so \
+                /usr/lib/libpython$(PYVER).so \
+                -lc
 
 xdelta3-decoder: $(SOURCES)
-        $(CC) -O2 -Wall -Wshadow xdelta3.c \
+        $(CC) -O3 -Wall -Wshadow xdelta3.c \
             -DXD3_ENCODER=0 -DXD3_MAIN=1 -DSECONDARY_FGK=0 -DSECONDARY_DJW=0 \
             -DXD3_STDIO=1 -DEXTERNAL_COMPRESSION=0 -DVCDIFF_TOOLS=0 \
             -o xdelta3-decoder
 
 xdelta3-decoder-nomain.o: $(SOURCES) linkxd3lib.c
-        $(CC) -O2 -Wall -Wshadow xdelta3.c linkxd3lib.c \
+        $(CC) -O3 -Wall -Wshadow xdelta3.c linkxd3lib.c \
             -DXD3_ENCODER=0 -DSECONDARY_FGK=0 -DSECONDARY_DJW=0 \
             -o xdelta3-decoder-nomain.o
         strip xdelta3-decoder-nomain.o
 
 xdelta3-O++: $(SOURCES)
-        $(CXX) -g -O2 -Wall -Wshadow xdelta3.c -o xdelta3-O++ -DXD3_MAIN=1 -DSECONDARY_DJW=1 -DREGRESSION_TEST=1 -lm
+        $(CXX) -g -O3 $(CFLAGS) xdelta3.c \
+                -o xdelta3-O++ \
+                -DXD3_MAIN=1 \
+                -DSECONDARY_DJW=1 \
+                -DREGRESSION_TEST=1 \
+                -lm
 
 xdelta3-Op: $(SOURCES)
-        $(CC) -g -O2 -Wall -Wshadow xdelta3.c -o xdelta3-Op -DXD3_POSIX=1 -DXD3_MAIN=1 -DREGRESSION_TEST=1 -lm
+        $(CC) -g -O3 $(CFLAGS) xdelta3.c \
+                -o xdelta3-Op \
+                -DXD3_POSIX=1 \
+                -DXD3_MAIN=1 \
+                -DREGRESSION_TEST=1 \
+                -lm
 
 xdelta3-64: $(SOURCES)
-        $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3-64 -DXD3_POSIX=1 -DXD3_MAIN=1 -DREGRESSION_TEST=1 \
-                                        -DXD3_DEBUG=0 -DXD3_USE_LARGEFILE64=1 -lm
+        $(CC) -g $(CFLAGS) \
+                xdelta3.c \
+                -o xdelta3-64 \
+                -DXD3_POSIX=1 \
+                -DXD3_MAIN=1 \
+                -DREGRESSION_TEST=1 \
+                -DXD3_DEBUG=0 \
+                -DXD3_USE_LARGEFILE64=1 \
+                -lm
 
 xdelta3-64-O: $(SOURCES)
-        $(CC) -O2 -Wall -Wshadow xdelta3.c -o xdelta3-64-O -DXD3_POSIX=1 -DXD3_MAIN=1 \
-                                        -DXD3_USE_LARGEFILE64=1 -lm
+        $(CC) -O3 $(CFLAGS) \
+                xdelta3.c \
+                -o xdelta3-64-O \
+                -DXD3_POSIX=1 \
+                -DXD3_MAIN=1 \
+                -DXD3_USE_LARGEFILE64=1 \
+                -lm
 
 xdelta3-everything: $(SOURCES)
-        $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3-everything \
-                                        -DXD3_MAIN=1 -DVCDIFF_TOOLS=1 -DREGRESSION_TEST=1 \
-                                        -DSECONDARY_FGK=1 -DSECONDARY_DJW=1 \
-                                        -DGENERIC_ENCODE_TABLES=1 \
-                                        -DGENERIC_ENCODE_TABLES_COMPUTE=1 \
-                                        -DXD3_POSIX=1 \
-                                        -DEXTERNAL_COMPRESSION=1 \
-                                        -DXD3_DEBUG=1 -lm
+        $(CC) -g $(CFLAGS) \
+                xdelta3.c \
+                -o xdelta3-everything \
+                -DXD3_MAIN=1 \
+                -DVCDIFF_TOOLS=1 \
+                -DREGRESSION_TEST=1 \
+                -DSECONDARY_FGK=1 \
+                -DSECONDARY_DJW=1 \
+                -DGENERIC_ENCODE_TABLES=1 \
+                -DGENERIC_ENCODE_TABLES_COMPUTE=1 \
+                -DXD3_POSIX=1 \
+                -DEXTERNAL_COMPRESSION=1 \
+                -DXD3_DEBUG=1 \
+                -lm
 
 xdelta3-Opg: $(SOURCES)
-        $(CC) -pg -g -O3 -fno-builtin -Wall -Wshadow xdelta3.c -o xdelta3-Opg \
+        $(CC) -pg -g -O3 $(CFLAGS) \
+                xdelta3.c \
+                -o xdelta3-Opg \
                 -DXD3_MAIN=1 \
                 -DSECONDARY_DJW=1 \
                 -DSECONDARY_FGK=1 \
@@ -228,19 +282,19 @@ xdelta3-Opg: $(SOURCES)
                 -DREGRESSION_TEST=1
 
 xdelta3-nosec.o: $(SOURCES)
-        $(CC) -O2 -Wall -Wshadow -c xdelta3.c -DSECONDARY_FGK=0 -DSECONDARY_DJW=0 -o xdelta3-nosec.o
+        $(CC) -O3 $(CFLAGS) -c xdelta3.c -DSECONDARY_FGK=0 -DSECONDARY_DJW=0 -o xdelta3-nosec.o
 
 xdelta3-all.o: $(SOURCES)
-        $(CC) -O2 -Wall -Wshadow -c xdelta3.c -DSECONDARY_FGK=1 -DSECONDARY_DJW=1 -o xdelta3-all.o
+        $(CC) -O3 $(CFLAGS) -c xdelta3.c -DSECONDARY_FGK=1 -DSECONDARY_DJW=1 -o xdelta3-all.o
 
 xdelta3-fgk.o: $(SOURCES)
-        $(CC) -O2 -Wall -Wshadow -c xdelta3.c -DSECONDARY_FGK=1 -DSECONDARY_DJW=0 -o xdelta3-fgk.o
+        $(CC) -O3 $(CFLAGS) -c xdelta3.c -DSECONDARY_FGK=1 -DSECONDARY_DJW=0 -o xdelta3-fgk.o
 
 xdelta3-noext: $(SOURCES)
-        $(CC) -O2 -Wall -Wshadow xdelta3.c -DXD3_MAIN=1 -DEXTERNAL_COMPRESSION=0 -o xdelta3-noext
+        $(CC) -O3 $(CFLAGS) xdelta3.c -DXD3_MAIN=1 -DEXTERNAL_COMPRESSION=0 -o xdelta3-noext
 
 xdelta3-tools: $(SOURCES)
-        $(CC) -O2 -Wall -Wshadow xdelta3.c -DXD3_MAIN=1 -o xdelta3-tools
+        $(CC) -O3 $(CFLAGS) xdelta3.c -DXD3_MAIN=1 -o xdelta3-tools
 
 xdelta3-notools: $(SOURCES)
-        $(CC) -O2 -Wall -Wshadow xdelta3.c -DXD3_MAIN=1 -DVCDIFF_TOOLS=0 -o xdelta3-notools
+        $(CC) -O3 $(CFLAGS) xdelta3.c -DXD3_MAIN=1 -DVCDIFF_TOOLS=0 -o xdelta3-notools
diff --git a/xdelta3/setup.py b/xdelta3/setup.py
index 7678d9a..b2c9022 100644
--- a/xdelta3/setup.py
+++ b/xdelta3/setup.py
@@ -49,7 +49,7 @@ xdelta3_ext = Extension('xdelta3main',
                                                ])
 
 # $Format: "REL='$Xdelta3Version$'" $
-REL='3.0s'
+REL='3.0t'
 
 # This provides xdelta3.main(), which calls the xdelta3 command-line main()
 # from python.
diff --git a/xdelta3/xdelta3-hash.h b/xdelta3/xdelta3-hash.h
index 239b8a7..2881000 100644
--- a/xdelta3/xdelta3-hash.h
+++ b/xdelta3/xdelta3-hash.h
@@ -194,7 +194,6 @@ xd3_scksum (const uint8_t *seg, const int ln)
 #define xd3_scksum(seg,ln) xd3_lcksum(seg,ln)
 #endif
 
-#if XD3_ENCODER
 static usize_t
 xd3_size_log2 (usize_t slots)
 {
@@ -214,7 +213,6 @@ xd3_size_log2 (usize_t slots)
 
   return bits;
 }
-#endif
 
 static void
 xd3_size_hashtable (xd3_stream    *stream,
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index 2c48661..365e3ae 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -341,7 +341,7 @@ static int
 main_version (void)
 {
   /* $Format: "  DP(RINT \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, Joshua MacDonald\n\");" $ */
-  DP(RINT "Xdelta version 3.0s, Copyright (C) 2007, Joshua MacDonald\n");
+  DP(RINT "Xdelta version 3.0t, Copyright (C) 2007, Joshua MacDonald\n");
   DP(RINT "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
   DP(RINT "This is free software, and you are welcome to redistribute it\n");
   DP(RINT "under certain conditions; see \"COPYING\" for details.\n");
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 826375f..9536d29 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -2411,6 +2411,7 @@ xd3_config_stream(xd3_stream *stream,
     }
 
   /* Default scanner settings. */
+#if XD3_ENCODER
   switch (config->smatch_cfg)
     {
       IF_BUILD_SOFT(case XD3_SMATCH_SOFT:
@@ -2480,6 +2481,7 @@ xd3_config_stream(xd3_stream *stream,
                            break;)
         }
     }
+#endif
 
   return 0;
 }
@@ -2599,8 +2601,9 @@ xd3_close_stream (xd3_stream *stream)
 
       if (stream->enc_state == ENC_POSTWIN)
         {
+#if XD3_ENCODER
           xd3_encode_reset (stream);
-
+#endif
           stream->current_window += 1;
           stream->enc_state = ENC_INPUT;
         }
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index e495d00..9b02980 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -90,18 +90,10 @@
  * output counts, the xoff_t type is used.  The decoder and encoder
  * generally check for overflow of the xoff_t size (this is tested at
  * the 32bit boundary [xdelta3-test.h]).
- *
- * As of 3.0r, a 64bit xoff_t is ~33% slower on a 32bit platform.
- * TODO: fix this.
  */
 #ifndef _WIN32
-typedef unsigned int    usize_t;
-typedef u_int8_t        uint8_t;
-typedef u_int16_t       uint16_t;
-#ifndef __uint32_t_defined
-typedef unsigned int uint32_t;
-#endif
-typedef long long unsigned int uint64_t;
+#include <stdint.h>
+typedef unsigned int usize_t;
 #else
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj
index 6ebaf1c..27fc3b9 100644
--- a/xdelta3/xdelta3.prj
+++ b/xdelta3/xdelta3.prj
@@ -9,7 +9,7 @@
 (Checkin-Login jmacd)
 (Populate-Ignore ("\\.svn"))
 (Project-Keywords
- (Xdelta3Version "3.0s")
+ (Xdelta3Version "3.0t")
  )
 (Files
   (COPYING (xdelta3/b/29_COPYING 1.1 744))