Changeset 13307

Timestamp:

05/30/11 15:12:02 (10 years ago)

Author:

Mark Evenson

Message:

SYSTEM:ZIP now preserves last modified times.

Refactored common logic between two variants into auxillary methods.

File:

• trunk/abcl/src/org/armedbear/lisp/zip.java (modified) (5 diffs)

trunk/abcl/src/org/armedbear/lisp/zip.java

@@ -37 +37 @@
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -84 +85 @@
                 }
                 File file = new File(namestring);
-                FileInputStream in = new FileInputStream(file);
-                ZipEntry entry = new ZipEntry(file.getName());
-                out.putNextEntry(entry);
-                int n;
-                while ((n = in.read(buffer)) > 0)
-                    out.write(buffer, 0, n);
-                out.closeEntry();
-                in.close();
+    makeEntry(out, file);
                 list = list.cdr();
             }
@@ -106 +100 @@
     {
         Pathname zipfilePathname = coerceToPathname(first);
-        byte[] buffer = new byte[4096];
         try {
             String zipfileNamestring = zipfilePathname.getNamestring();
@@ -152 +145 @@
                     continue;
                 }
-                FileInputStream in = new FileInputStream(file);
-                ZipEntry entry = new ZipEntry(directory + file.getName());
-                out.putNextEntry(entry);
-                int n;
-                while ((n = in.read(buffer)) > 0)
-                    out.write(buffer, 0, n);
-                out.closeEntry();
-                in.close();
+    makeEntry(out, file, directory + file.getName());
                 list = list.cdr();
             }
@@ -170 +156 @@
     }
 
+    private static final Primitive zip = new zip();
 
-    private static final Primitive zip = new zip();
+    private void makeEntry(ZipOutputStream zip, File file) 
+  throws FileNotFoundException, IOException
+    {
+  makeEntry(zip, file, file.getName());
+    }
+
+    private void makeEntry(ZipOutputStream zip, File file, String name) 
+  throws FileNotFoundException, IOException
+    {
+        byte[] buffer = new byte[4096];
+  long lastModified = file.lastModified();
+  FileInputStream in = new FileInputStream(file);
+  ZipEntry entry = new ZipEntry(name);
+  if (lastModified > 0) {
+      entry.setTime(lastModified);
+  }
+  zip.putNextEntry(entry);
+  int n;
+  while ((n = in.read(buffer)) > 0)
+      zip.write(buffer, 0, n);
+  zip.closeEntry();
+  in.close();
+    }
+  
 }