X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=archive-zip.c;h=f31b8ed8236c3fcad10ac9a84e2f508f11e1a6cf;hb=61b41790c4d6abccf86c87f7ae312da8adbac3dd;hp=3ffdad68d130136312028b389da73af1a789232e;hpb=2958d9b5dbebeb82e7230bbfd3f421781d90f3f7;p=git.git

diff --git a/archive-zip.c b/archive-zip.c
index 3ffdad68d..f31b8ed82 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -1,7 +1,6 @@
 /*
  * Copyright (c) 2006 Rene Scharfe
  */
-#include <time.h>
 #include "cache.h"
 #include "commit.h"
 #include "blob.h"
@@ -35,6 +34,7 @@ struct zip_local_header {
 	unsigned char size[4];
 	unsigned char filename_length[2];
 	unsigned char extra_length[2];
+	unsigned char _end[1];
 };
 
 struct zip_dir_header {
@@ -55,6 +55,7 @@ struct zip_dir_header {
 	unsigned char attr1[2];
 	unsigned char attr2[4];
 	unsigned char offset[4];
+	unsigned char _end[1];
 };
 
 struct zip_dir_trailer {
@@ -66,8 +67,18 @@ struct zip_dir_trailer {
 	unsigned char size[4];
 	unsigned char offset[4];
 	unsigned char comment_length[2];
+	unsigned char _end[1];
 };
 
+/*
+ * On ARM, padding is added at the end of the struct, so a simple
+ * sizeof(struct ...) reports two bytes more than the payload size
+ * we're interested in.
+ */
+#define ZIP_LOCAL_HEADER_SIZE	offsetof(struct zip_local_header, _end)
+#define ZIP_DIR_HEADER_SIZE	offsetof(struct zip_dir_header, _end)
+#define ZIP_DIR_TRAILER_SIZE	offsetof(struct zip_dir_trailer, _end)
+
 static void copy_le16(unsigned char *dest, unsigned int n)
 {
 	dest[0] = 0xff & n;
@@ -145,6 +156,7 @@ static int write_zip_entry(const unsigned char *sha1,
 {
 	struct zip_local_header header;
 	struct zip_dir_header dirent;
+	unsigned long attr2;
 	unsigned long compressed_size;
 	unsigned long uncompressed_size;
 	unsigned long crc;
@@ -159,7 +171,7 @@ static int write_zip_entry(const unsigned char *sha1,
 	void *buffer = NULL;
 	void *deflated = NULL;
 
-	crc = crc32(0, Z_NULL, 0);
+	crc = crc32(0, NULL, 0);
 
 	path = construct_path(base, baselen, filename, S_ISDIR(mode), &pathlen);
 	if (verbose)
@@ -172,12 +184,16 @@ static int write_zip_entry(const unsigned char *sha1,
 
 	if (S_ISDIR(mode)) {
 		method = 0;
+		attr2 = 16;
 		result = READ_TREE_RECURSIVE;
 		out = NULL;
 		uncompressed_size = 0;
 		compressed_size = 0;
-	} else if (S_ISREG(mode)) {
-		method = zlib_compression_level == 0 ? 0 : 8;
+	} else if (S_ISREG(mode) || S_ISLNK(mode)) {
+		method = 0;
+		attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) : 0;
+		if (S_ISREG(mode) && zlib_compression_level != 0)
+			method = 8;
 		result = 0;
 		buffer = read_sha1_file(sha1, type, &size);
 		if (!buffer)
@@ -206,15 +222,15 @@ static int write_zip_entry(const unsigned char *sha1,
 	}
 
 	/* make sure we have enough free space in the dictionary */
-	direntsize = sizeof(struct zip_dir_header) + pathlen;
+	direntsize = ZIP_DIR_HEADER_SIZE + pathlen;
 	while (zip_dir_size < zip_dir_offset + direntsize) {
 		zip_dir_size += ZIP_DIRECTORY_MIN_SIZE;
 		zip_dir = xrealloc(zip_dir, zip_dir_size);
 	}
 
 	copy_le32(dirent.magic, 0x02014b50);
-	copy_le16(dirent.creator_version, 0);
-	copy_le16(dirent.version, 20);
+	copy_le16(dirent.creator_version, S_ISLNK(mode) ? 0x0317 : 0);
+	copy_le16(dirent.version, 10);
 	copy_le16(dirent.flags, 0);
 	copy_le16(dirent.compression_method, method);
 	copy_le16(dirent.mtime, zip_time);
@@ -227,16 +243,16 @@ static int write_zip_entry(const unsigned char *sha1,
 	copy_le16(dirent.comment_length, 0);
 	copy_le16(dirent.disk, 0);
 	copy_le16(dirent.attr1, 0);
-	copy_le32(dirent.attr2, 0);
+	copy_le32(dirent.attr2, attr2);
 	copy_le32(dirent.offset, zip_offset);
-	memcpy(zip_dir + zip_dir_offset, &dirent, sizeof(struct zip_dir_header));
-	zip_dir_offset += sizeof(struct zip_dir_header);
+	memcpy(zip_dir + zip_dir_offset, &dirent, ZIP_DIR_HEADER_SIZE);
+	zip_dir_offset += ZIP_DIR_HEADER_SIZE;
 	memcpy(zip_dir + zip_dir_offset, path, pathlen);
 	zip_dir_offset += pathlen;
 	zip_dir_entries++;
 
 	copy_le32(header.magic, 0x04034b50);
-	copy_le16(header.version, 20);
+	copy_le16(header.version, 10);
 	copy_le16(header.flags, 0);
 	copy_le16(header.compression_method, method);
 	copy_le16(header.mtime, zip_time);
@@ -246,8 +262,8 @@ static int write_zip_entry(const unsigned char *sha1,
 	copy_le32(header.size, uncompressed_size);
 	copy_le16(header.filename_length, pathlen);
 	copy_le16(header.extra_length, 0);
-	write_or_die(1, &header, sizeof(struct zip_local_header));
-	zip_offset += sizeof(struct zip_local_header);
+	write_or_die(1, &header, ZIP_LOCAL_HEADER_SIZE);
+	zip_offset += ZIP_LOCAL_HEADER_SIZE;
 	write_or_die(1, path, pathlen);
 	zip_offset += pathlen;
 	if (compressed_size > 0) {
@@ -277,7 +293,7 @@ static void write_zip_trailer(const unsigned char *sha1)
 	copy_le16(trailer.comment_length, sha1 ? 40 : 0);
 
 	write_or_die(1, zip_dir, zip_dir_offset);
-	write_or_die(1, &trailer, sizeof(struct zip_dir_trailer));
+	write_or_die(1, &trailer, ZIP_DIR_TRAILER_SIZE);
 	if (sha1)
 		write_or_die(1, sha1_to_hex(sha1), 40);
 }