Changeset 4059

Timestamp:

Dec 14, 2007, 9:55:01 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #749: TAR files with long files names are not supported

Location:

branches/2.5-stable/src

Files:

• core/net/sf/basedb/util/zip/TarFilePacker.java (modified) (1 diff)
• core/net/sf/basedb/util/zip/TarUtil.java (added)
• plugins/core/net/sf/basedb/plugins/TarFileUnpacker.java (modified) (2 diffs)

branches/2.5-stable/src/core/net/sf/basedb/util/zip/TarFilePacker.java

@@ -97 +97 @@
     if (lastModified > 0) entry.setModTime(lastModified);
     entry.setSize(size);
-    tar.putNextEntry(entry);
+    TarUtil.putNextEntry(entry, tar);
     if (!isDirectory) FileUtil.copy(in, tar);
     tar.closeEntry();

branches/2.5-stable/src/plugins/core/net/sf/basedb/plugins/TarFileUnpacker.java

@@ -54 +54 @@
 import net.sf.basedb.util.Values;
 import net.sf.basedb.util.zip.AbstractFileUnpacker;
+import net.sf.basedb.util.zip.TarUtil;
 
 /**
@@ -161 +162 @@
     long totalUnpacked = 0;
     int numFiles = 0;
-    while ((entry = tarStream.getNextEntry()) != null)
+    while ((entry = TarUtil.getNextEntry(tarStream)) != null)
     {
       String subPath = entry.getName();