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>

diff --git a/cgit.h b/cgit.h
index 6937c42900eea20c5e9824974aa9eccbb68f814b..aabf7252af6bff743e18de9e028b9b5e23bf81e8 100644 (file)
--- 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 d4376cef5823f403ccd30707abc985ef76c2e6fb..1c1415e4f4d9934d60c6237be7105f58852eb73b 100644 (file)
--- 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 84bf8f7c1a9f9c87a8c84668ee33a5c685842128..7076b500fdc52581e573cd70b665e9cafa879a66 100644 (file)
--- 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("<a href='%s'>%s</a><br/>",
-                       cgit_pageurl(repo,"snapshot",
+                       cgit_fileurl(repo,"snapshot",filename,
                            fmt("id=%s&amp;name=%s",hex,filename)), filename);
        }
 }