1 files changed, 24 insertions, 14 deletions

diff --git a/ui-snapshot.c b/ui-snapshot.c
index d6be55b..f9879ed 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -56,75 +56,85 @@ static int write_tar_bzip2_archive(struct archiver_args *args)
 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)
+void cgit_print_snapshot(struct cacheitem *item, const char *head,
+                         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) {
+        int f, n;
+
+        n = sizeof(snapshot_archives) / sizeof(*snapshot_archives);
+            for(f=0; f<n; f++) {
                 const struct snapshot_archive_t* sat = &snapshot_archives[f];
                 int sl;
-                if(!(snapshots&sat->bit)) continue;
+                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 (!hex)
+                        hex = head;
                 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;;
                 }
 
                 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);
                 return;
         }
         cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
 }
 
-void cgit_print_snapshot_links(const char *repo,const char *hex,int snapshots)
+void cgit_print_snapshot_links(const char *repo, const char *head,
+                               const char *hex, int snapshots)
 {
             char *filename;
-        int f;
-            for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
+        int f, n;
+
+        n = sizeof(snapshot_archives) / sizeof(*snapshot_archives);
+            for(f=0; f<n ;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);
+                if(!(snapshots & sat->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)
 {
         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);