summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-11 08:08:28 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-07-11 08:08:28 +0000
commit0b329f437c6a55d8210340306b263b49676222c2 (patch)
treeea9d205bc66d7603749d74ae7875278e1420ef93
parentff5255431d5f16a658f98bd989b7c5aa28fb42c9 (diff)
libs/zziplib: Bug fix for WIN32 (from Akira)
git-svn-id: svn://tug.org/texlive/trunk@34571 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/ChangeLog9
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-01-binary15
-rw-r--r--Build/source/libs/zziplib/zziplib-0.13.62/bins/unzzip.c4
3 files changed, 28 insertions, 0 deletions
diff --git a/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/ChangeLog b/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/ChangeLog
index f13334c3bca..3526fac6463 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/ChangeLog
+++ b/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-binary (new): Do not convert NL => CRLF (required
+ under Windows for our test case), from Akira.
+
+2012-03-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import zziplib-0.13.62.
+
2011-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Adapted to zziplib-0.13.60.
diff --git a/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-01-binary b/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-01-binary
new file mode 100644
index 00000000000..4d528511791
--- /dev/null
+++ b/Build/source/libs/zziplib/zziplib-0.13.62-PATCHES/patch-01-binary
@@ -0,0 +1,15 @@
+diff -ur zziplib-0.13.62.orig/bins/unzzip.c zziplib-0.13.62/bins/unzzip.c
+--- zziplib-0.13.62.orig/bins/unzzip.c 2009-08-23 13:38:22.000000000 +0200
++++ zziplib-0.13.62/bins/unzzip.c 2014-07-11 09:50:50.000000000 +0200
+@@ -72,7 +72,11 @@
+ continue;
+ }
+
++#ifdef _WIN32
++ output = _open (d.d_name, _O_CREAT | _O_BINARY | _O_RDWR);
++#else
+ output = creat (d.d_name, 0664);
++#endif
+ if (output == -1)
+ {
+ fprintf (stderr, "|output file %s: \n", d.d_name);
diff --git a/Build/source/libs/zziplib/zziplib-0.13.62/bins/unzzip.c b/Build/source/libs/zziplib/zziplib-0.13.62/bins/unzzip.c
index ae8b3b97969..94a38f9ebec 100644
--- a/Build/source/libs/zziplib/zziplib-0.13.62/bins/unzzip.c
+++ b/Build/source/libs/zziplib/zziplib-0.13.62/bins/unzzip.c
@@ -72,7 +72,11 @@ main (int argc, char ** argv)
continue;
}
+#ifdef _WIN32
+ output = _open (d.d_name, _O_CREAT | _O_BINARY | _O_RDWR);
+#else
output = creat (d.d_name, 0664);
+#endif
if (output == -1)
{
fprintf (stderr, "|output file %s: \n", d.d_name);