git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-06-30 10:57:06 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge pull request #2077 from r1walz/gzip-cmd-404

Browse Source 
[FIX] git-archive error, gzip -cn : command not found
This commit is contained in:
Johannes Schindelin
2019-02-20 16:59:56 +01:00
committed by Johannes Schindelin
parent c663e450e5 a7a57d7ebb
commit a6567c7b2c
1 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
archive-tar.c
View File

@@ -17,6 +17,8 @@ static unsigned long offset;
static int tar_umask = 002; static int tar_umask = 002;
static gzFile gzip;
static int write_tar_filter_archive(const struct archiver *ar, static int write_tar_filter_archive(const struct archiver *ar,
struct archiver_args *args); struct archiver_args *args);
@@ -38,11 +40,21 @@ static int write_tar_filter_archive(const struct archiver *ar,
#define USTAR_MAX_MTIME 077777777777ULL #define USTAR_MAX_MTIME 077777777777ULL
#endif #endif
/* writes out the whole block, or dies if fails */
static void write_block_or_die(const char *block) {
if (gzip) {
if (gzwrite(gzip, block, (unsigned) BLOCKSIZE) != BLOCKSIZE)
die(_("gzwrite failed"));
} else {
write_or_die(1, block, BLOCKSIZE);
}
}
/* writes out the whole block, but only if it is full */ /* writes out the whole block, but only if it is full */
static void write_if_needed(void) static void write_if_needed(void)
{ {
if (offset == BLOCKSIZE) { if (offset == BLOCKSIZE) {
write_or_die(1, block, BLOCKSIZE); write_block_or_die(block);
offset = 0; offset = 0;
} }
} }
@@ -66,7 +78,7 @@ static void do_write_blocked(const void *data, unsigned long size)
write_if_needed(); write_if_needed();
} }
while (size >= BLOCKSIZE) { while (size >= BLOCKSIZE) {
write_or_die(1, buf, BLOCKSIZE); write_block_or_die(buf);
size -= BLOCKSIZE; size -= BLOCKSIZE;
buf += BLOCKSIZE; buf += BLOCKSIZE;
} }
@@ -101,10 +113,10 @@ static void write_trailer(void)
{ {
int tail = BLOCKSIZE - offset; int tail = BLOCKSIZE - offset;
memset(block + offset, 0, tail); memset(block + offset, 0, tail);
write_or_die(1, block, BLOCKSIZE); write_block_or_die(block);
if (tail < 2 * RECORDSIZE) { if (tail < 2 * RECORDSIZE) {
memset(block, 0, offset); memset(block, 0, offset);
write_or_die(1, block, BLOCKSIZE); write_block_or_die(block);
} }
} }
@@ -454,18 +466,34 @@ static int write_tar_filter_archive(const struct archiver *ar,
filter.use_shell = 1; filter.use_shell = 1;
filter.in = -1; filter.in = -1;
if (start_command(&filter) < 0) if (!strcmp("gzip -cn", ar->data)) {
die_errno(_("unable to start '%s' filter"), argv[0]); char outmode[4] = "wb\0";
close(1);
if (dup2(filter.in, 1) < 0) if (args->compression_level >= 0 && args->compression_level <= 9)
die_errno(_("unable to redirect descriptor")); outmode[2] = '0' + args->compression_level;
close(filter.in);
gzip = gzdopen(fileno(stdout), outmode);
if (!gzip)
die(_("Could not gzdopen stdout"));
} else {
if (start_command(&filter) < 0)
die_errno(_("unable to start '%s' filter"), argv[0]);
close(1);
if (dup2(filter.in, 1) < 0)
die_errno(_("unable to redirect descriptor"));
close(filter.in);
}
r = write_tar_archive(ar, args); r = write_tar_archive(ar, args);
close(1); if (gzip) {
if (finish_command(&filter) != 0) if (gzclose(gzip) != Z_OK)
die(_("'%s' filter reported error"), argv[0]); die(_("gzclose failed"));
} else {
close(1);
if (finish_command(&filter) != 0)
die(_("'%s' filter reported error"), argv[0]);
}
strbuf_release(&cmd); strbuf_release(&cmd);
return r; return r;