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

archive: avoid spawning gzip

Browse Source 
As we already link to `zlib` library, we can perform the
compression without even requiring gzip on the host
machine

We modify write_tar_filter_archive() function in archive-tar.c
to handle the compression when `gzip -cn` is requested

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
This commit is contained in:
Rohit Ashiwal
2019-02-19 22:28:41 +05:30
committed by Johannes Schindelin
parent b52568fb0b
commit a7a57d7ebb
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
archive-tar.c
View File

@@ -466,18 +466,34 @@ static int write_tar_filter_archive(const struct archiver *ar,
filter.use_shell = 1;
filter.in = -1;
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);
if (!strcmp("gzip -cn", ar->data)) {
char outmode[4] = "wb\0";
if (args->compression_level >= 0 && args->compression_level <= 9)
outmode[2] = '0' + args->compression_level;
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);
close(1);
if (finish_command(&filter) != 0)
die(_("'%s' filter reported error"), argv[0]);
if (gzip) {
if (gzclose(gzip) != Z_OK)
die(_("gzclose failed"));
} else {
close(1);
if (finish_command(&filter) != 0)
die(_("'%s' filter reported error"), argv[0]);
}
strbuf_release(&cmd);
return r;