Revert "timezone: data file should be 32 bit aligned"

This reverts commit bc0b877a507f394001bb133891032d65e04cd106.

4 files changed, 1 insertions, 8 deletions

diff --git a/libc/tools/zoneinfo/ZoneCompactor.java b/libc/tools/zoneinfo/ZoneCompactor.java
index cc77c94..b657748 100644
--- a/libc/tools/zoneinfo/ZoneCompactor.java
+++ b/libc/tools/zoneinfo/ZoneCompactor.java
@@ -55,13 +55,11 @@ public class ZoneCompactor {
 
         InputStream in = new FileInputStream(inFile);
         byte[] buf = new byte[8192];
-        int length = 0;
         while (true) {
             int nbytes = in.read(buf);
             if (nbytes == -1) {
                 break;
             }
-            length += nbytes;
             out.write(buf, 0, nbytes);
 
             byte[] nret = new byte[ret.length + nbytes];
@@ -69,8 +67,6 @@ public class ZoneCompactor {
             System.arraycopy(buf, 0, nret, ret.length, nbytes);
             ret = nret;
         }
-	if (length%4 != 0)
-            out.write(new byte[] {00,00,00,00}, 0, 4 - length % 4);
         out.flush();
         return ret;
     }
@@ -109,9 +105,6 @@ public class ZoneCompactor {
                     lengths.put(s, new Integer((int)length));
 
                     start += length;
-                    if (start % 4 != 0)
-                        start += 4 - start % 4;
-
                     byte[] data = copyFile(f, zoneInfo);
 
                     TimeZone tz = ZoneInfo.make(s, data);
diff --git a/libc/tools/zoneinfo/generate b/libc/tools/zoneinfo/generate
index 6fdb775..3e21d0b 100755
--- a/libc/tools/zoneinfo/generate
+++ b/libc/tools/zoneinfo/generate
@@ -75,7 +75,7 @@ echo "Compacting $latest_version..."
 javac -d . \
     $bionic_zoneinfo_tools_dir/ZoneCompactor.java \
     $bionic_zoneinfo_tools_dir/ZoneInfo.java
-java -classpath . ZoneCompactor setup data
+java ZoneCompactor setup data
 
 echo "Updating bionic to $latest_version..."
 mv zoneinfo.dat zoneinfo.idx $bionic_zoneinfo_dir
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat
index 7dbc2dd..cc1cb38 100644
--- a/libc/zoneinfo/zoneinfo.dat
+++ b/libc/zoneinfo/zoneinfo.dat
diff --git a/libc/zoneinfo/zoneinfo.idx b/libc/zoneinfo/zoneinfo.idx
index 856e085..0483c28 100644
--- a/libc/zoneinfo/zoneinfo.idx
+++ b/libc/zoneinfo/zoneinfo.idx