global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-19 14:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/archive-zip-utf8' into next

Browse Source 
Rerolled with minor fix-ups.

* rs/archive-zip-utf8:
  archive-zip: declare creator to be Unix for UTF-8 paths
  archive-zip: support UTF-8 paths
  Revert "archive-zip: support UTF-8 paths"
This commit is contained in:
Junio C Hamano
2012-09-18 14:43:31 -07:00
parent 6651fb839b 678770ac0c
commit 8535c83442
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
archive-zip.c
View File

@@ -4,7 +4,6 @@
#include "cache.h"
#include "archive.h"
#include "streaming.h"
#include "commit.h"
#include "utf8.h"
static int zip_date;
@@ -167,6 +166,17 @@ static void set_zip_header_data_desc(struct zip_local_header *header,
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)
static int write_zip_entry(struct archiver_args *args,
@@ -191,7 +201,7 @@ static int write_zip_entry(struct archiver_args *args,
crc = crc32(0, NULL, 0);
if (has_non_ascii(path)) {
if (!has_only_ascii(path)) {
if (is_utf8(path))
flags |= ZIP_UTF8;
else