global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-18 05:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "archive-zip: declare creator to be Unix for UTF-8 paths"

Browse Source 
This reverts commit 678770ac0c, to
replace it with a better alternative to make unzip pay attention
to the general purpose flag 11 (encoding of paths).
This commit is contained in:
Junio C Hamano
2012-09-24 10:35:47 -07:00
parent 68bd821eac
commit b383305a13
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
archive-zip.c
View File

@@ -186,8 +186,7 @@ static int write_zip_entry(struct archiver_args *args,
{
struct zip_local_header header;
struct zip_dir_header dirent;
unsigned int creator_version = 0;
unsigned long attr2 = 0;
unsigned long attr2;
unsigned long compressed_size;
unsigned long crc;
unsigned long direntsize;
@@ -225,15 +224,10 @@ static int write_zip_entry(struct archiver_args *args,
enum object_type type = sha1_object_info(sha1, &size);
method = 0;
attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :
(mode & 0111) ? ((mode) << 16) : 0;
if (S_ISREG(mode) && args->compression_level != 0 && size > 0)
method = 8;
if (S_ISLNK(mode) || (mode & 0111) || (flags & ZIP_UTF8)) {
creator_version = 0x033f;
attr2 = mode;
if (S_ISLNK(mode))
attr2 |= 0777;
attr2 <<= 16;
}
compressed_size = size;
if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
@@ -280,7 +274,8 @@ static int write_zip_entry(struct archiver_args *args,
}
copy_le32(dirent.magic, 0x02014b50);
copy_le16(dirent.creator_version, creator_version);
copy_le16(dirent.creator_version,
S_ISLNK(mode) || (S_ISREG(mode) && (mode & 0111)) ? 0x0317 : 0);
copy_le16(dirent.version, 10);
copy_le16(dirent.flags, flags);
copy_le16(dirent.compression_method, method);