Changeset 3765

Timestamp:

07/20/08 08:37:32 (4 months ago)

Author:

larsivi

Message:

Make sure native and absolute paths are handled properly, closes #1189

Files:

• trunk/tango/io/compress/Zip.d (modified) (6 diffs)

trunk/tango/io/compress/Zip.d

@@ -41 +41 @@
-
-import Path = tango.io.Path;
+import PathUtil = tango.util.PathUtil;
-import Integer = tango.text.convert.Integer;
-
@@ -1331 +1332 @@
-            char[] file_name)
-    {
+        auto f_name = PathUtil.normalize(file_name);
+        auto p = Path.parse(f_name);
+
-        // Compute Zip version
-        if( data.extract_version == data.extract_version.max )
-        {
+
-            ushort zipver = 10;
-            void minver(ushort v) { zipver = v>zipver ? v : zipver; }
@@ -1348 +1353 @@
-
-                // File is a folder
-
-
+
-                    // Is a directory, not a real file
-                    minver(20);
@@ -1369 +1373 @@
-        LocalFileHeader header;
-        header.data = data;
-
+
+
+
-
-        // Write out the header and the filename
@@ -1381 +1387 @@
-        Entry entry;
-        entry.data.fromLocal(header.data);
-
+header.
-        entry.header_position = header_pos;
-        entry.data.relative_offset_of_local_header = cast(int) header_pos;
@@ -1779 +1785 @@
-    {
-        // Skip directories
-
+
+
-
-        auto path = Path.join(dest, entry.info.name);
+        path = Path.native(path);
-        scope fout = new FileConduit(path, FileConduit.WriteCreate);
-        fout.output.copy(entry.open);