aboutsummaryrefslogtreecommitdiff
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cgit.c6
-rw-r--r--cgit.css1
-rw-r--r--cgit.h11
-rw-r--r--cgitrc5
-rw-r--r--shared.c11
-rw-r--r--ui-commit.c9
-rw-r--r--ui-shared.c41
-rw-r--r--ui-snapshot.c150
-rw-r--r--ui-tree.c4
9 files changed, 44 insertions, 194 deletions
diff --git a/cgit.c b/cgit.c
index 6597529..4b91829 100644
--- a/cgit.c
+++ b/cgit.c
@@ -68,10 +68,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
setenv("GIT_DIR", cgit_repo->path, 1);
if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
- cgit_print_snapshot(item, cgit_query_sha1,
- cgit_repobasename(cgit_repo->url),
- cgit_query_name,
- cgit_repo->snapshots );
+ cgit_print_snapshot(item, cgit_query_sha1, "zip",
+ cgit_repo->url, cgit_query_name);
return;
}
diff --git a/cgit.css b/cgit.css
index 43a40a3..112dac1 100644
--- a/cgit.css
+++ b/cgit.css
@@ -231,7 +231,6 @@ table.commit-info th {
text-align: left;
font-weight: normal;
padding: 0.1em 1em 0.1em 0.1em;
- vertical-align: top;
}
table.commit-info td {
diff --git a/cgit.h b/cgit.h
index eddcaa3..610a16d 100644
--- a/cgit.h
+++ b/cgit.h
@@ -157,7 +157,6 @@ 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);
@@ -201,13 +200,9 @@ 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);
-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,
@@ -238,9 +233,7 @@ extern void cgit_print_commit(char *hex);
extern void cgit_print_tag(char *revname);
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,
- 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);
+ const char *format, const char *prefix,
+ const char *filename);
#endif /* CGIT_H */
diff --git a/cgitrc b/cgitrc
index 1040997..40877f8 100644
--- a/cgitrc
+++ b/cgitrc
@@ -8,8 +8,7 @@
#nocache=0
-## Set allowed snapshot types by default. Can be overridden per repo
-# can be any combination of zip/tar.gz/tar.bz2/tar
+## Enable/disable snapshots by default. This can be overridden per repo
#snapshots=0
@@ -114,7 +113,7 @@
#repo.desc=the caching cgi for git
#repo.path=/pub/git/cgit
#repo.owner=Lars Hjemli
-#repo.snapshots=tar.bz2 # override a sitewide snapshot-setting
+#repo.snapshots=1 # 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 077934f..06693b0 100644
--- a/shared.c
+++ b/shared.c
@@ -86,13 +86,6 @@ 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;
@@ -155,7 +148,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 = cgit_parse_snapshots_mask(value);
+ cgit_snapshots = atoi(value);
else if (!strcmp(name, "enable-index-links"))
cgit_enable_index_links = atoi(value);
else if (!strcmp(name, "enable-log-filecount"))
@@ -197,7 +190,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 & cgit_parse_snapshots_mask(value); /* XXX: &? */
+ cgit_repo->snapshots = cgit_snapshots * atoi(value);
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 50e9e11..2679b59 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -139,6 +139,7 @@ void cgit_print_commit(char *hex)
struct commitinfo *info;
struct commit_list *p;
unsigned char sha1[20];
+ char *filename;
char *tmp;
int i;
@@ -195,9 +196,11 @@ void cgit_print_commit(char *hex)
html(")</td></tr>");
}
if (cgit_repo->snapshots) {
- html("<tr><th>download</th><td colspan='2' class='sha1'>");
- cgit_print_snapshot_links(cgit_query_repo,hex,cgit_repo->snapshots);
- html("</td></tr>");
+ htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
+ filename = fmt("%s-%s.zip", cgit_query_repo, hex);
+ html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
+ fmt("id=%s&amp;name=%s", hex, filename)));
+ htmlf("'>%s</a></td></tr>", filename);
}
html("</table>\n");
html("<div class='commit-subject'>");
diff --git a/ui-shared.c b/ui-shared.c
index ca2ee82..fd71c12 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -57,13 +57,13 @@ char *cgit_repourl(const char *reponame)
}
}
-char *cgit_fileurl(const char *reponame, const char *pagename,
- const char *filename, const char *query)
+char *cgit_pageurl(const char *reponame, const char *pagename,
+ const char *query)
{
if (cgit_virtual_root) {
if (query)
- return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
- pagename, filename?filename:"", query);
+ return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
+ pagename, query);
else
return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
pagename);
@@ -75,37 +75,6 @@ char *cgit_fileurl(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);
-}
-
-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()
{
if (!cgit_virtual_root)
@@ -423,5 +392,3 @@ 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 d6be55b..2257d6b 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,138 +8,40 @@
#include "cgit.h"
-static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
+static void cgit_print_zip(struct cacheitem *item, const char *hex,
+ const char *prefix, const char *filename)
{
- int rw[2];
- pid_t gzpid;
- int stdout2;
- int status;
- int rv;
+ struct archiver_args args;
+ struct commit *commit;
+ unsigned char sha1[20];
- 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);
+ if (get_sha1(hex, sha1)) {
+ cgit_print_error(fmt("Bad object id: %s", hex));
+ return;
}
- /* 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)
-{
- return write_compressed_tar_archive(args,"gzip");
-}
-static int write_tar_bzip2_archive(struct archiver_args *args)
-{
- return write_compressed_tar_archive(args,"bzip2");
-}
-
-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, 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,
- 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;
- if(!(snapshots&sat->bit)) continue;
- sl = strlen(sat->suffix);
- if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
- continue;
-
- struct archiver_args args;
- struct commit *commit;
- unsigned char sha1[20];
-
- if(get_sha1(hex, sha1)) {
- cgit_print_error(fmt("Bad object id: %s", hex));
- return;
- }
- commit = lookup_commit_reference(sha1);
-
- if(!commit) {
- cgit_print_error(fmt("Not a commit reference: %s", hex));
- return;;
- }
+ commit = lookup_commit_reference(sha1);
- memset(&args,0,sizeof(args));
- args.base = fmt("%s/", prefix);
- args.tree = commit->tree;
-
- cgit_print_snapshot_start(sat->mimetype, filename, item);
- (*sat->write_func)(&args);
+ if (!commit) {
+ cgit_print_error(fmt("Not a commit reference: %s", hex));
return;
}
- cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
-}
-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("<a href='%s'>%s</a><br/>",
- cgit_fileurl(repo,"snapshot",filename,
- fmt("id=%s&amp;name=%s",hex,filename)), filename);
- }
+ memset(&args, 0, sizeof(args));
+ args.base = fmt("%s/", prefix);
+ args.tree = commit->tree;
+
+ cgit_print_snapshot_start("application/x-zip", filename, item);
+ write_zip_archive(&args);
}
-int cgit_parse_snapshots_mask(const char *str)
+
+void cgit_print_snapshot(struct cacheitem *item, const char *hex,
+ const char *format, const char *prefix,
+ const char *filename)
{
- 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;
+ if (!strcmp(format, "zip"))
+ cgit_print_zip(item, hex, prefix, filename);
+ else
+ cgit_print_error(fmt("Unsupported snapshot format: %s",
+ format));
}
-
-/* vim:set sw=8: */
diff --git a/ui-tree.c b/ui-tree.c
index 75ce449..c5d64ff 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -32,10 +32,6 @@ static void print_object(const unsigned char *sha1, char *path)
return;
}
- html(" blob: <a href='");
- html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
- htmlf("'>%s</a>",sha1_to_hex(sha1));
-
html("<table class='blob'>\n");
idx = 0;
start = 0;
generated by cgitext v1.3.1+17 (git 2.54.0) at 2026-09-08 19:10:44 +0000