4 files changed, 77 insertions, 73 deletions

diff --git a/cgit.h b/cgit.h
index 295441b..e2d5126 100644
--- a/cgit.h
+++ b/cgit.h
@@ -132,100 +132,108 @@ struct cgit_config {
         char *clone_prefix;
         char *css;
         char *index_header;
         char *index_info;
         char *logo;
         char *logo_link;
         char *module_link;
         char *repo_group;
         char *robots;
         char *root_title;
         char *script_name;
         char *virtual_root;
         int cache_dynamic_ttl;
         int cache_max_create_time;
         int cache_repo_ttl;
         int cache_root_ttl;
         int cache_static_ttl;
         int enable_index_links;
         int enable_log_filecount;
         int enable_log_linecount;
         int max_commit_count;
         int max_lock_attempts;
         int max_msg_len;
         int max_repodesc_len;
         int nocache;
         int renamelimit;
         int snapshots;
         int summary_branches;
         int summary_log;
         int summary_tags;
 };
 
 struct cgit_page {
         time_t modified;
         time_t expires;
         char *mimetype;
         char *charset;
         char *filename;
         char *title;
 };
 
 struct cgit_context {
         struct cgit_query qry;
         struct cgit_config cfg;
         struct cgit_repo *repo;
         struct cgit_page page;
 };
 
+struct cgit_snapshot_format {
+        const char *suffix;
+        const char *mimetype;
+        write_archive_fn_t write_func;
+        int bit;
+};
+
 extern const char *cgit_version;
 
 extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
+extern const struct cgit_snapshot_format cgit_snapshot_formats[];
 extern int cgit_cmd;
 
 extern void cgit_prepare_context(struct cgit_context *ctx);
 extern struct cgit_repo *cgit_get_repoinfo(const char *url);
 extern void cgit_global_config_cb(const char *name, const char *value);
 extern void cgit_repo_config_cb(const char *name, const char *value);
 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);
 extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);
 
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
                         int flags, void *cb_data);
 
 extern void *cgit_free_commitinfo(struct commitinfo *info);
 
 extern int cgit_diff_files(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            filepair_fn fn, const char *prefix);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
 extern char *fmt(const char *format,...);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
 
 extern char *cache_safe_filename(const char *unsafe);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
diff --git a/shared.c b/shared.c
index 67eb67b..800c06a 100644
--- a/shared.c
+++ b/shared.c
@@ -434,48 +434,75 @@ int cgit_diff_files(const unsigned char *old_sha1,
         emit_params.ctxlen = 3;
         emit_params.flags = XDL_EMIT_FUNCNAMES;
         emit_params.find_func = NULL;
         emit_cb.outf = filediff_cb;
         emit_cb.priv = fn;
         xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
         return 0;
 }
 
 void cgit_diff_tree(const unsigned char *old_sha1,
                     const unsigned char *new_sha1,
                     filepair_fn fn, const char *prefix)
 {
         struct diff_options opt;
         int ret;
         int prefixlen;
 
         diff_setup(&opt);
         opt.output_format = DIFF_FORMAT_CALLBACK;
         opt.detect_rename = 1;
         opt.rename_limit = ctx.cfg.renamelimit;
         DIFF_OPT_SET(&opt, RECURSIVE);
         opt.format_callback = cgit_diff_tree_cb;
         opt.format_callback_data = fn;
         if (prefix) {
                 opt.nr_paths = 1;
                 opt.paths = &prefix;
                 prefixlen = strlen(prefix);
                 opt.pathlens = &prefixlen;
         }
         diff_setup_done(&opt);
 
         if (old_sha1 && !is_null_sha1(old_sha1))
                 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
         else
                 ret = diff_root_tree_sha1(new_sha1, "", &opt);
         diffcore_std(&opt);
         diff_flush(&opt);
 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 {
         unsigned char *old_sha1 = NULL;
 
         if (commit->parents)
                 old_sha1 = commit->parents->item->object.sha1;
         cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
 }
+
+int cgit_parse_snapshots_mask(const char *str)
+{
+        const struct cgit_snapshot_format *f;
+        static const char *delim = " \t,:/|;";
+        int tl, sl, rv = 0;
+
+        /* favor legacy setting */
+        if(atoi(str))
+                return 1;
+        for(;;) {
+                str += strspn(str,delim);
+                tl = strcspn(str,delim);
+                if (!tl)
+                        break;
+                for (f = cgit_snapshot_formats; f->suffix; f++) {
+                        sl = strlen(f->suffix);
+                        if((tl == sl && !strncmp(f->suffix, str, tl)) ||
+                           (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) {
+                                rv |= f->bit;
+                                break;
+                        }
+                }
+                str += tl;
+        }
+        return rv;
+}
diff --git a/ui-shared.c b/ui-shared.c
index 2596023..aa65988 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -528,49 +528,64 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 for_each_branch_ref(print_branch_option, ctx->qry.head);
                 html("</select>\n");
         //      html("</td><td>");
                 html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
         //      html("</td></tr></table>");
                 html("</form>\n");
 
                 html("<h1>search</h1>\n");
                 html("<form method='get' action='");
                 if (ctx->cfg.virtual_root)
                         html_attr(cgit_fileurl(ctx->qry.repo, "log",
                                                ctx->qry.path, NULL));
                 html("'>\n");
                 add_hidden_formfields(1, 0, "log");
                 html("<select name='qt'>\n");
                 html_option("grep", "log msg", ctx->qry.grep);
                 html_option("author", "author", ctx->qry.grep);
                 html_option("committer", "committer", ctx->qry.grep);
                 html("</select>\n");
                 html("<input class='txt' type='text' name='q' value='");
                 html_attr(ctx->qry.search);
                 html("'/>\n");
                 html("</form>\n");
         } else {
                 if (!ctx->cfg.index_info || html_include(ctx->cfg.index_info))
                         html(default_info);
         }
 
         html("</td></tr></table></td>\n");
 
         html("<td id='content'>\n");
 }
 
 void cgit_print_filemode(unsigned short mode)
 {
         if (S_ISDIR(mode))
                 html("d");
         else if (S_ISLNK(mode))
                 html("l");
         else if (S_ISGITLINK(mode))
                 html("m");
         else
                 html("-");
         html_fileperm(mode >> 6);
         html_fileperm(mode >> 3);
         html_fileperm(mode);
 }
 
-/* vim:set sw=8: */
+void cgit_print_snapshot_links(const char *repo, const char *head,
+                               const char *hex, int snapshots)
+{
+        const struct cgit_snapshot_format* f;
+            char *filename;
+
+        for (f = cgit_snapshot_formats; f->suffix; f++) {
+                if (!(snapshots & f->bit))
+                        continue;
+                filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
+                               f->suffix);
+                cgit_snapshot_link(filename, NULL, NULL, (char *)head,
+                                   (char *)hex, filename);
+                html("<br/>");
+        }
+}
diff --git a/ui-snapshot.c b/ui-snapshot.c
index c741469..512fcd2 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -10,150 +10,104 @@
 #include "html.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)
 {
         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[] = {
+const struct cgit_snapshot_format cgit_snapshot_formats[] = {
         { ".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 }
+        { ".tar", "application/x-tar", write_tar_archive, 0x8 },
+        {}
 };
 
-#define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives))
-
-void cgit_print_snapshot(const char *head, const char *hex, const char *prefix,
-                         const char *filename, int snapshots)
+static int make_snapshot(const struct cgit_snapshot_format *format,
+                         const char *hex, const char *prefix,
+                         const char *filename)
 {
-        const struct snapshot_archive_t* sat;
         struct archiver_args args;
         struct commit *commit;
         unsigned char sha1[20];
-        int f, sl, fnl = strlen(filename);
 
-        for(f=0; f<snapshot_archives_len; f++) {
-                sat = &snapshot_archives[f];
-                if(!(snapshots & sat->bit))
-                        continue;
-                sl = strlen(sat->suffix);
-                if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix))
-                        continue;
-                if (!hex)
-                        hex = head;
                 if(get_sha1(hex, sha1)) {
                         cgit_print_error(fmt("Bad object id: %s", hex));
-                        return;
+                return 1;
                 }
                 commit = lookup_commit_reference(sha1);
                 if(!commit) {
                         cgit_print_error(fmt("Not a commit reference: %s", hex));
-                        return;;
+                return 1;
                 }
                 memset(&args,0,sizeof(args));
                 args.base = fmt("%s/", prefix);
                 args.tree = commit->tree;
                 args.time = commit->date;
-                ctx.page.mimetype = xstrdup(sat->mimetype);
+        ctx.page.mimetype = xstrdup(format->mimetype);
                 ctx.page.filename = xstrdup(filename);
                 cgit_print_http_headers(&ctx);
-                (*sat->write_func)(&args);
-                return;
-        }
-        cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
+        format->write_func(&args);
+        return 0;
 }
 
-void cgit_print_snapshot_links(const char *repo, const char *head,
-                               const char *hex, int snapshots)
+void cgit_print_snapshot(const char *head, const char *hex, const char *prefix,
+                         const char *filename, int snapshots)
 {
-        const struct snapshot_archive_t* sat;
-            char *filename;
-        int f;
+        const struct cgit_snapshot_format* f;
+        int sl, fnl;
 
-        for(f=0; f<snapshot_archives_len; f++) {
-                sat = &snapshot_archives[f];
-                if(!(snapshots & sat->bit))
+        fnl = strlen(filename);
+        if (!hex)
+                hex = head;
+        for (f = cgit_snapshot_formats; f->suffix; f++) {
+                if (!(snapshots & f->bit))
                         continue;
-                filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
-                               sat->suffix);
-                cgit_snapshot_link(filename, NULL, NULL, (char *)head,
-                                   (char *)hex, filename);
-                html("<br/>");
-        }
-}
-
-int cgit_parse_snapshots_mask(const char *str)
-{
-        const struct snapshot_archive_t* sat;
-        static const char *delim = " \t,:/|;";
-        int f, tl, sl, 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<snapshot_archives_len; f++) {
-                        sat = &snapshot_archives[f];
-                        sl = strlen(sat->suffix);
-                        if((tl == sl && !strncmp(sat->suffix, str, tl)) ||
-                           (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) {
-                                rv |= sat->bit;
-                                break;
-                        }
-                }
-                str += tl;
+                sl = strlen(f->suffix);
+                if(fnl < sl || strcmp(&filename[fnl-sl], f->suffix))
+                        continue;
+                make_snapshot(f, hex, prefix, filename);
+                return;
         }
-        return rv;
+        cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
 }
-
-/* vim:set sw=8: */