From 952337a71a992899234245d97bf8cb4e4e1a9183 Mon Sep 17 00:00:00 2001
From: David Duponchel <d.duponchel@gmail.com>
Date: Sun, 19 Jan 2014 08:59:11 +0100
Subject: [PATCH 1/2] fix the script src in the index.html

---
 index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/index.html b/index.html
index bb741fb3..8f206f85 100644
--- a/index.html
+++ b/index.html
@@ -102,8 +102,7 @@
 .bad { color: #B63939; }
 #status { color: #28AA31; }
 </style>
-<script type="text/javascript" src="jszip.js"></script>
-<script type="text/javascript" src="jszip-deflate.js"></script>
+<script type="text/javascript" src="dist/jszip.min.js"></script>
 <script type="text/javascript">
 imgData = "R0lGODdhBQAFAIACAAAAAP/eACwAAAAABQAFAAACCIwPkWerClIBADs=";
 

From c5bdc33ce361582514df176304e29f2d3e021ad5 Mon Sep 17 00:00:00 2001
From: David Duponchel <d.duponchel@gmail.com>
Date: Sun, 19 Jan 2014 10:29:37 +0100
Subject: [PATCH 2/2] Add support for the unicode path extra field

This patch sets the unicode path extra field. unzip needs at least one
extra field to correctly handle unicode path, so using the path is as
good as any other information. This could improve the situation with
other archive managers too.

This field is usually used without the utf8 flag, with a non unicode
path in the header (winrar, winzip). This helps (a bit) with the messy
Windows' default compressed folders feature but breaks on p7zip which
doesn't seek the unicode path extra field.

So for now, UTF-8 everywhere !

Fix #79.
---
 lib/object.js                    |  38 +++++++++++++++++++++++++++----
 lib/zipEntry.js                  |  29 +++++++++++++++++++++++
 test/ref/winrar_utf8_in_name.zip | Bin 0 -> 154 bytes
 test/test.js                     |  15 +++++++++++-
 4 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 test/ref/winrar_utf8_in_name.zip

diff --git a/lib/object.js b/lib/object.js
index deeb2c18..c22672a8 100644
--- a/lib/object.js
+++ b/lib/object.js
@@ -352,7 +352,9 @@ var generateZipParts = function(name, file, compressedObject, offset) {
         useUTF8 = utfEncodedFileName !== file.name,
         o = file.options,
         dosTime,
-        dosDate;
+        dosDate,
+        extraFields = "",
+        unicodePathExtraField = "";
 
     // date
     // @see http://www.delorie.com/djgpp/doc/rbinter/it/52/13.html
@@ -371,6 +373,32 @@ var generateZipParts = function(name, file, compressedObject, offset) {
     dosDate = dosDate << 5;
     dosDate = dosDate | o.date.getDate();
 
+    if (useUTF8) {
+        // set the unicode path extra field. unzip needs at least one extra
+        // field to correctly handle unicode path, so using the path is as good
+        // as any other information. This could improve the situation with
+        // other archive managers too.
+        // This field is usually used without the utf8 flag, with a non
+        // unicode path in the header (winrar, winzip). This helps (a bit)
+        // with the messy Windows' default compressed folders feature but
+        // breaks on p7zip which doesn't seek the unicode path extra field.
+        // So for now, UTF-8 everywhere !
+        unicodePathExtraField =
+            // Version
+            decToHex(1, 1) +
+            // NameCRC32
+            decToHex(this.crc32(utfEncodedFileName), 4) +
+            // UnicodeName
+            utfEncodedFileName;
+
+        extraFields +=
+            // Info-ZIP Unicode Path Extra Field
+            "\x75\x70" +
+            // size
+            decToHex(unicodePathExtraField.length, 2) +
+            // content
+            unicodePathExtraField;
+    }
 
     var header = "";
 
@@ -394,10 +422,10 @@ var generateZipParts = function(name, file, compressedObject, offset) {
     // file name length
     header += decToHex(utfEncodedFileName.length, 2);
     // extra field length
-    header += "\x00\x00";
+    header += decToHex(extraFields.length, 2);
 
 
-    var fileRecord = signature.LOCAL_FILE_HEADER + header + utfEncodedFileName;
+    var fileRecord = signature.LOCAL_FILE_HEADER + header + utfEncodedFileName + extraFields;
 
     var dirRecord = signature.CENTRAL_FILE_HEADER +
     // version made by (00: DOS)
@@ -415,7 +443,9 @@ var generateZipParts = function(name, file, compressedObject, offset) {
     // relative offset of local header
     decToHex(offset, 4) +
     // file name
-    utfEncodedFileName;
+    utfEncodedFileName +
+    // extra field
+    extraFields;
 
 
     return {
diff --git a/lib/zipEntry.js b/lib/zipEntry.js
index f4b1f9cb..8f56e809 100644
--- a/lib/zipEntry.js
+++ b/lib/zipEntry.js
@@ -216,7 +216,36 @@ ZipEntry.prototype = {
         if (this.useUTF8()) {
             this.fileName = jszipProto.utf8decode(this.fileName);
             this.fileComment = jszipProto.utf8decode(this.fileComment);
+        } else {
+            var upath = this.findExtraFieldUnicodePath();
+            if (upath !== null) {
+                this.fileName = upath;
+            }
+        }
+    },
+
+    /**
+     * Find the unicode path declared in the extra field, if any.
+     * @return {String} the unicode path, null otherwise.
+     */
+    findExtraFieldUnicodePath: function() {
+        var upathField = this.extraFields[0x7075];
+        if (upathField) {
+            var extraReader = new StringReader(upathField.value);
+
+            // wrong version
+            if (extraReader.readInt(1) !== 1) {
+                return null;
+            }
+
+            // the crc of the filename changed, this field is out of date.
+            if (jszipProto.crc32(this.fileName) !== extraReader.readInt(4)) {
+                return null;
+            }
+
+            return jszipProto.utf8decode(extraReader.readString(upathField.length - 5));
         }
+        return null;
     }
 };
 module.exports = ZipEntry;
diff --git a/test/ref/winrar_utf8_in_name.zip b/test/ref/winrar_utf8_in_name.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5dfdf857d43bd5263cff8a7da896f051175a1ffb
GIT binary patch
literal 154
zcmWIWW@h1H00D_wSBI=$GaT7~Y!GH=5MqcoG}SAqC@C%AV_<Cg-Rt|PX$?dK%-{;}
jW@M6Qz^xr*ECYiAm}J0hSb#Sx$U+82Aan=PwqOkaBzqr#

literal 0
HcmV?d00001

diff --git a/test/test.js b/test/test.js
index 60d946be..e1cfd4cb 100644
--- a/test/test.js
+++ b/test/test.js
@@ -146,7 +146,11 @@ testZipFile("Zip text file with UTF-8 characters in filename", "ref/utf8_in_name
       zip.file("€15.txt", "€15\n");
       var actual = zip.generate({type:"string"});
 
-      ok(similar(actual, expected, 18) , "Generated ZIP matches reference ZIP");
+      // zip doesn't generate a strange file like us (utf8 flag AND unicode path extra field)
+      // if one of the files has more data than the other, the bytes are no more aligned and the
+      // error count goes through the roof. The parsing is checked on a other test so I'll
+      // comment this one for now.
+      // ok(similar(actual, expected, 18) , "Generated ZIP matches reference ZIP");
       equal(reload(actual), actual, "Generated ZIP can be parsed");
       });
 
@@ -1097,6 +1101,15 @@ testZipFile("Zip text file with UTF-8 characters in filename", "ref/utf8_in_name
    equal(zip.files["€15.txt"].asText(), "€15\n", "the utf8 content was correctly read (with files[].astext).");
 });
 
+// Created with winrar
+// winrar will replace the euro symbol with a '_' but set the correct unicode path in an extra field.
+testZipFile("Zip text file with UTF-8 characters in filename and windows compatibility", "ref/winrar_utf8_in_name.zip", function(file) {
+   var zip = new JSZip(file);
+   ok(zip.file("€15.txt") !== null, "the utf8 file is here.");
+   equal(zip.file("€15.txt").asText(), "€15\n", "the utf8 content was correctly read (with file().asText).");
+   equal(zip.files["€15.txt"].asText(), "€15\n", "the utf8 content was correctly read (with files[].astext).");
+});
+
 // zip backslash.zip -0 -X Hel\\lo.txt
 testZipFile("Zip text file with backslash in filename", "ref/backslash.zip", function(file) {
    var zip = new JSZip(file);