mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduced .tar.bz2 snapshots

Browse Source 
- reworked write_tar_gzip_archive to handle arbitrary filter as a
   write_compressed_tar_archive
 - reformatted whitespaces in the said function to adhere to common cgit
   standards
 - added wrappers around write_compressed_tar_archive for .tar.gz and .tar.bz2
 - added a hint for vim to use 8 characters shift width by default

Signed-off-by: Michael Krelin <hacker@klever.net>
This commit is contained in:
Michael Krelin 2007-07-21 02:05:34 +02:00
parent 4a92cbb7fd
commit 18a99bdf87
1 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
ui-snapshot.c
View File

@ -8,40 +8,49 @@
#include "cgit.h" #include "cgit.h"
static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
{
int rw[2];
pid_t gzpid;
int stdout2;
int status;
int rv;
stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing");
chk_zero(pipe(rw), "Opening pipe from compressor subprocess");
gzpid = chk_non_negative(fork(), "Forking compressor subprocess");
if(gzpid==0) {
/* child */
chk_zero(close(rw[1]), "Closing write end of pipe in child");
chk_zero(close(STDIN_FILENO), "Closing STDIN");
chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin");
execlp(filter,filter,NULL);
_exit(-1);
}
/* parent */
chk_zero(close(rw[0]), "Closing read end of pipe");
chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
rv = write_tar_archive(args);
chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor");
chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT");
chk_zero(close(stdout2), "Closing uncompressed STDOUT");
chk_zero(close(rw[1]), "Closing write end of pipe in parent");
chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
cgit_print_error("Failed to compress archive");
return rv;
}
static int write_tar_gzip_archive(struct archiver_args *args) static int write_tar_gzip_archive(struct archiver_args *args)
{ {
int rw[2]; return write_compressed_tar_archive(args,"gzip");
pid_t gzpid; }
int stdout2; static int write_tar_bzip2_archive(struct archiver_args *args)
int status; {
int rv; return write_compressed_tar_archive(args,"bzip2");
stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing");
chk_zero(pipe(rw), "Opening pipe from compressor subprocess");
gzpid = chk_non_negative(fork(), "Forking compressor subprocess");
if(gzpid==0) {
/* child */
chk_zero(close(rw[1]), "Closing write end of pipe in child");
chk_zero(close(STDIN_FILENO), "Closing STDIN");
chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin");
execlp("gzip","gzip",NULL);
_exit(-1);
}
/* parent */
chk_zero(close(rw[0]), "Closing read end of pipe");
chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
rv = write_tar_archive(args);
chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor");
chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT");
chk_zero(close(stdout2), "Closing uncompressed STDOUT");
chk_zero(close(rw[1]), "Closing write end of pipe in parent");
chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
cgit_print_error("Failed to compress archive");
return rv;
} }
static const struct snapshot_archive_t { static const struct snapshot_archive_t {
@ -50,7 +59,8 @@ static const struct snapshot_archive_t {
write_archive_fn_t write_func; write_archive_fn_t write_func;
} snapshot_archives[] = { } snapshot_archives[] = {
{ ".zip", "application/x-zip", write_zip_archive }, { ".zip", "application/x-zip", write_zip_archive },
{ ".tar.gz", "application/x-gzip", write_tar_gzip_archive } { ".tar.gz", "application/x-tar", write_tar_gzip_archive },
{ ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }
}; };
void cgit_print_snapshot(struct cacheitem *item, const char *hex, void cgit_print_snapshot(struct cacheitem *item, const char *hex,
@ -102,3 +112,4 @@ void cgit_print_snapshot_links(const char *repo,const char *hex)
fmt("id=%s&amp;name=%s",hex,filename)), filename); fmt("id=%s&amp;name=%s",hex,filename)), filename);
} }
} }
/* vim:set sw=8: */