kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

archive-zip: support UTF-8 paths 

Set general purpose flag 11 if we encounter a path that contains
non-ASCII characters.  We assume that all paths are given as UTF-8; no
conversion is done.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
René Scharfe 2012-09-18 21:46:56 +02:00 committed by Junio C Hamano
parent bb52d22ebb
commit 88182bab00
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
archive-zip.c
View File

@ -4,6 +4,7 @@
#include "cache.h" #include "cache.h"
#include "archive.h" #include "archive.h"
#include "streaming.h" #include "streaming.h"
#include "utf8.h"


static int zip_date; static int zip_date;
static int zip_time; static int zip_time;
@ -16,7 +17,8 @@ static unsigned int zip_dir_offset;
static unsigned int zip_dir_entries; static unsigned int zip_dir_entries;


#define ZIP_DIRECTORY_MIN_SIZE (1024 * 1024) #define ZIP_DIRECTORY_MIN_SIZE (1024 * 1024)
#define ZIP_STREAM (8) #define ZIP_STREAM (1 << 3)
#define ZIP_UTF8 (1 << 11)


struct zip_local_header { struct zip_local_header {
unsigned char magic[4]; unsigned char magic[4];
@ -164,6 +166,17 @@ static void set_zip_header_data_desc(struct zip_local_header *header,
copy_le32(header->size, size); copy_le32(header->size, size);
} }


static int has_only_ascii(const char *s)
{
for (;;) {
int c = *s++;
if (c == '\0')
return 1;
if (!isascii(c))
return 0;
}
}

#define STREAM_BUFFER_SIZE (1024 * 16) #define STREAM_BUFFER_SIZE (1024 * 16)


static int write_zip_entry(struct archiver_args *args, static int write_zip_entry(struct archiver_args *args,
@ -187,6 +200,13 @@ static int write_zip_entry(struct archiver_args *args,


crc = crc32(0, NULL, 0); crc = crc32(0, NULL, 0);


if (!has_only_ascii(path)) {
if (is_utf8(path))
flags |= ZIP_UTF8;
else
warning("Path is not valid UTF-8: %s", path);
}

if (pathlen > 0xffff) { if (pathlen > 0xffff) {
return error("path too long (%d chars, SHA1: %s): %s", return error("path too long (%d chars, SHA1: %s): %s",
(int)pathlen, sha1_to_hex(sha1), path); (int)pathlen, sha1_to_hex(sha1), path);