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 <hacker@klever.net>

3 files changed, 16 insertions, 5 deletions

diff --git a/cgit.h b/cgit.h
index 6937c42..aabf725 100644
--- a/cgit.h
+++ b/cgit.h
@@ -198,12 +198,14 @@ 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);
 
 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 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 d4376ce..1c1415e 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -54,30 +54,37 @@ char *cgit_repourl(const char *reponame)
                 return fmt("%s/%s/", cgit_virtual_root, reponame);
         } else {
                 return fmt("?r=%s", 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);
         } else {
                 if (query)
                         return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
                 else
                         return fmt("?r=%s&p=%s", reponame, 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)
                 return cgit_script_name;
         else if (cgit_query_page)
                 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
@@ -365,6 +372,8 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
         htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
         htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
         htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                          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
@@ -106,11 +106,11 @@ void cgit_print_snapshot_links(const char *repo,const char *hex)
             char *filename;
         int f;
             for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) {
                 const struct snapshot_archive_t* sat = &snapshot_archives[f];
                 filename = fmt("%s-%s%s",repo,hex,sat->suffix);
                 htmlf("<a href='%s'>%s</a><br/>",
-                        cgit_pageurl(repo,"snapshot",
+                        cgit_fileurl(repo,"snapshot",filename,
                             fmt("id=%s&amp;name=%s",hex,filename)), filename);
         }
 }
 /* vim:set sw=8: */