From f97c707a3b975d32910331f72783ec3044e3c0ee Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Wed, 18 Jul 2007 14:40:03 +0200 Subject: add support for snapshot tarballs - reworked cgit_print_snapshot to use a list of supported archivers and pick one for the suffix supplied - moved printing of snaphot links into ui-snapshot and make it iterate through the said list --- cgit.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cgit.h') diff --git a/cgit.h b/cgit.h index 2ff5340..f01f6c9 100644 --- a/cgit.h +++ b/cgit.h @@ -230,7 +230,7 @@ extern void cgit_print_tree(const char *rev, char *path); extern void cgit_print_commit(char *hex); extern void cgit_print_diff(const char *new_hex, const char *old_hex); extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, - const char *format, const char *prefix, - const char *filename); + const char *prefix, const char *filename); +extern void cgit_print_snapshot_links(const char *repo, const char *hex); #endif /* CGIT_H */ -- cgit v1.2.3-59-g8ed1b From 127f43d4e202ba3e63f72add44238c2686dd97f3 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Fri, 20 Jul 2007 20:56:43 +0200 Subject: added a chk_non_negative check --- cgit.h | 1 + shared.c | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'cgit.h') diff --git a/cgit.h b/cgit.h index f01f6c9..6937c42 100644 --- a/cgit.h +++ b/cgit.h @@ -157,6 +157,7 @@ extern void cgit_querystring_cb(const char *name, const char *value); extern int chk_zero(int result, char *msg); extern int chk_positive(int result, char *msg); +extern int chk_non_negative(int result, char *msg); extern int hextoint(char c); extern char *trim_end(const char *str, char c); diff --git a/shared.c b/shared.c index 1a5b866..65fc8b2 100644 --- a/shared.c +++ b/shared.c @@ -86,6 +86,13 @@ int chk_positive(int result, char *msg) return result; } +int chk_non_negative(int result, char *msg) +{ + if (result < 0) + die("%s: %s",msg, strerror(errno)); + return result; +} + struct repoinfo *add_repo(const char *url) { struct repoinfo *ret; -- cgit v1.2.3-59-g8ed1b From 0df096f6e146187e55e2203ea1c017442cc2c8c6 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 21 Jul 2007 13:13:40 +0200 Subject: added snapshot filename to the link - changed cgit_pageurl into cgit_fileurl with the filename parameter - rewritten cgit_pageurl as a wrapper around cgit_fileurl Signed-off-by: Michael Krelin --- cgit.h | 2 ++ ui-shared.c | 17 +++++++++++++---- ui-snapshot.c | 2 +- 3 files changed, 16 insertions(+), 5 deletions(-) (limited to 'cgit.h') diff --git a/cgit.h b/cgit.h index 6937c42..aabf725 100644 --- a/cgit.h +++ b/cgit.h @@ -201,6 +201,8 @@ extern int cache_exist(struct cacheitem *item); extern int cache_expired(struct cacheitem *item); extern char *cgit_repourl(const char *reponame); +extern char *cgit_fileurl(const char *reponame, const char *pagename, + const char *filename, const char *query); extern char *cgit_pageurl(const char *reponame, const char *pagename, const char *query); diff --git a/ui-shared.c b/ui-shared.c index d4376ce..1c1415e 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -57,13 +57,13 @@ char *cgit_repourl(const char *reponame) } } -char *cgit_pageurl(const char *reponame, const char *pagename, - const char *query) +char *cgit_fileurl(const char *reponame, const char *pagename, + const char *filename, const char *query) { if (cgit_virtual_root) { if (query) - return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, - pagename, query); + return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame, + pagename, filename?filename:"", query); else return fmt("%s/%s/%s/", cgit_virtual_root, reponame, pagename); @@ -75,6 +75,13 @@ char *cgit_pageurl(const char *reponame, const char *pagename, } } +char *cgit_pageurl(const char *reponame, const char *pagename, + const char *query) +{ + return cgit_fileurl(reponame,pagename,0,query); +} + + char *cgit_currurl() { if (!cgit_virtual_root) @@ -368,3 +375,5 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename, ttl_seconds(item->ttl))); html("\n"); } + +/* vim:set sw=8: */ diff --git a/ui-snapshot.c b/ui-snapshot.c index 84bf8f7..7076b50 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -109,7 +109,7 @@ void cgit_print_snapshot_links(const char *repo,const char *hex) const struct snapshot_archive_t* sat = &snapshot_archives[f]; filename = fmt("%s-%s%s",repo,hex,sat->suffix); htmlf("%s
", - cgit_pageurl(repo,"snapshot", + cgit_fileurl(repo,"snapshot",filename, fmt("id=%s&name=%s",hex,filename)), filename); } } -- cgit v1.2.3-59-g8ed1b From 1cb8bedf1e0a4aa73bb8ad3f96bfa7eda50919b3 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 21 Jul 2007 15:24:07 +0200 Subject: introduce cgit_repobasename that shortens reponame stripping any directories and .git suffixes, that is turning 'dir/repo.git/' or 'dir/repo/.git/' or alikes into mere 'repo'. Signed-off-by: Michael Krelin --- cgit.h | 2 ++ ui-shared.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) (limited to 'cgit.h') diff --git a/cgit.h b/cgit.h index aabf725..1dbf901 100644 --- a/cgit.h +++ b/cgit.h @@ -206,6 +206,8 @@ extern char *cgit_fileurl(const char *reponame, const char *pagename, extern char *cgit_pageurl(const char *reponame, const char *pagename, const char *query); +extern const char *cgit_repobasename(const char *reponame); + extern void cgit_tree_link(char *name, char *title, char *class, char *head, char *rev, char *path); extern void cgit_log_link(char *name, char *title, char *class, char *head, diff --git a/ui-shared.c b/ui-shared.c index 1c1415e..3e378a4 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -81,6 +81,30 @@ char *cgit_pageurl(const char *reponame, const char *pagename, return cgit_fileurl(reponame,pagename,0,query); } +const char *cgit_repobasename(const char *reponame) +{ + /* I assume we don't need to store more than one repo basename */ + static char rvbuf[1024]; + int p; + const char *rv; + strncpy(rvbuf,reponame,sizeof(rvbuf)); + if(rvbuf[sizeof(rvbuf)-1]) + die("cgit_repobasename: truncated repository name '%s'", reponame); + p = strlen(rvbuf)-1; + /* strip trailing slashes */ + while(p && rvbuf[p]=='/') rvbuf[p--]=0; + /* strip trailing .git */ + if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { + p -= 3; rvbuf[p--] = 0; + } + /* strip more trailing slashes if any */ + while( p && rvbuf[p]=='/') rvbuf[p--]=0; + /* find last slash in the remaining string */ + rv = strrchr(rvbuf,'/'); + if(rv) + return ++rv; + return rvbuf; +} char *cgit_currurl() { -- cgit v1.2.3-59-g8ed1b From dc3c9b5bc48779f37f2fbcbadce8865eaf4a360e Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 21 Jul 2007 18:00:53 +0200 Subject: allow selective enabling of snapshots snapshot configuration parameter now can be a space/slash/comma/colon/semicolon/pipe-separated list of snaphot suffixes as listed in ui-snapshot.c Signed-off-by: Michael Krelin --- cgit.c | 3 ++- cgit.h | 6 ++++-- cgitrc | 5 +++-- shared.c | 4 ++-- ui-commit.c | 2 +- ui-snapshot.c | 43 ++++++++++++++++++++++++++++++++++++------- 6 files changed, 48 insertions(+), 15 deletions(-) (limited to 'cgit.h') diff --git a/cgit.c b/cgit.c index 7b55b7b..8795bbc 100644 --- a/cgit.c +++ b/cgit.c @@ -70,7 +70,8 @@ static void cgit_print_repo_page(struct cacheitem *item) if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { cgit_print_snapshot(item, cgit_query_sha1, cgit_repobasename(cgit_repo->url), - cgit_query_name); + cgit_query_name, + cgit_repo->snapshots ); return; } diff --git a/cgit.h b/cgit.h index 1dbf901..ea61be7 100644 --- a/cgit.h +++ b/cgit.h @@ -235,7 +235,9 @@ extern void cgit_print_tree(const char *rev, char *path); extern void cgit_print_commit(char *hex); extern void cgit_print_diff(const char *new_hex, const char *old_hex); extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, - const char *prefix, const char *filename); -extern void cgit_print_snapshot_links(const char *repo, const char *hex); + const char *prefix, const char *filename, + int snapshot); +extern void cgit_print_snapshot_links(const char *repo, const char *hex,int snapshots); +extern int cgit_parse_snapshots_mask(const char *str); #endif /* CGIT_H */ diff --git a/cgitrc b/cgitrc index 40877f8..1040997 100644 --- a/cgitrc +++ b/cgitrc @@ -8,7 +8,8 @@ #nocache=0 -## Enable/disable snapshots by default. This can be overridden per repo +## Set allowed snapshot types by default. Can be overridden per repo +# can be any combination of zip/tar.gz/tar.bz2/tar #snapshots=0 @@ -113,7 +114,7 @@ #repo.desc=the caching cgi for git #repo.path=/pub/git/cgit #repo.owner=Lars Hjemli -#repo.snapshots=1 # override a sitewide snapshot-setting +#repo.snapshots=tar.bz2 # override a sitewide snapshot-setting #repo.enable-log-filecount=0 # override the default filecount setting #repo.enable-log-linecount=0 # override the default linecount setting #repo.module-link=/git/%s/commit/?id=%s # override the standard module-link diff --git a/shared.c b/shared.c index 65fc8b2..ccbde27 100644 --- a/shared.c +++ b/shared.c @@ -155,7 +155,7 @@ void cgit_global_config_cb(const char *name, const char *value) else if (!strcmp(name, "nocache")) cgit_nocache = atoi(value); else if (!strcmp(name, "snapshots")) - cgit_snapshots = atoi(value); + cgit_snapshots = cgit_parse_snapshots_mask(value); else if (!strcmp(name, "enable-index-links")) cgit_enable_index_links = atoi(value); else if (!strcmp(name, "enable-log-filecount")) @@ -197,7 +197,7 @@ void cgit_global_config_cb(const char *name, const char *value) else if (cgit_repo && !strcmp(name, "repo.defbranch")) cgit_repo->defbranch = xstrdup(value); else if (cgit_repo && !strcmp(name, "repo.snapshots")) - cgit_repo->snapshots = cgit_snapshots * atoi(value); + cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) diff --git a/ui-commit.c b/ui-commit.c index bf5e6dc..50e9e11 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -196,7 +196,7 @@ void cgit_print_commit(char *hex) } if (cgit_repo->snapshots) { html("download"); - cgit_print_snapshot_links(cgit_query_repo,hex); + cgit_print_snapshot_links(cgit_query_repo,hex,cgit_repo->snapshots); html(""); } html("\n"); diff --git a/ui-snapshot.c b/ui-snapshot.c index 053fd48..d6be55b 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -57,21 +57,25 @@ static const struct snapshot_archive_t { const char *suffix; const char *mimetype; write_archive_fn_t write_func; + int bit; } snapshot_archives[] = { - { ".zip", "application/x-zip", write_zip_archive }, - { ".tar.gz", "application/x-tar", write_tar_gzip_archive }, - { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }, - { ".tar", "application/x-tar", write_tar_archive } + { ".zip", "application/x-zip", write_zip_archive, 0x1 }, + { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, + { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, + { ".tar", "application/x-tar", write_tar_archive, 0x8 } }; void cgit_print_snapshot(struct cacheitem *item, const char *hex, - const char *prefix, const char *filename) + const char *prefix, const char *filename, + int snapshots) { int fnl = strlen(filename); int f; for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { const struct snapshot_archive_t* sat = &snapshot_archives[f]; - int sl = strlen(sat->suffix); + int sl; + if(!(snapshots&sat->bit)) continue; + sl = strlen(sat->suffix); if(fnlsuffix)) continue; @@ -101,16 +105,41 @@ void cgit_print_snapshot(struct cacheitem *item, const char *hex, cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); } -void cgit_print_snapshot_links(const char *repo,const char *hex) +void cgit_print_snapshot_links(const char *repo,const char *hex,int snapshots) { char *filename; int f; for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { const struct snapshot_archive_t* sat = &snapshot_archives[f]; + if(!(snapshots&sat->bit)) continue; filename = fmt("%s-%s%s",cgit_repobasename(repo),hex,sat->suffix); htmlf("%s
", cgit_fileurl(repo,"snapshot",filename, fmt("id=%s&name=%s",hex,filename)), filename); } } + +int cgit_parse_snapshots_mask(const char *str) +{ + static const char *delim = " \t,:/|;"; + int f, tl, rv = 0; + /* favor legacy setting */ + if(atoi(str)) return 1; + for(;;) { + str += strspn(str,delim); + tl = strcspn(str,delim); + if(!tl) + break; + for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { + const struct snapshot_archive_t* sat = &snapshot_archives[f]; + if(! ( strncmp(sat->suffix,str,tl) && strncmp(sat->suffix+1,str,tl-1) ) ) { + rv |= sat->bit; + break; + } + } + str += tl; + } + return rv; +} + /* vim:set sw=8: */ -- cgit v1.2.3-59-g8ed1b