-rw-r--r-- | ui-shared.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c index d4376ce..1c1415e 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -56,15 +56,15 @@ char *cgit_repourl(const char *reponame) | |||
56 | return fmt("?r=%s", reponame); | 56 | return fmt("?r=%s", reponame); |
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | char *cgit_pageurl(const char *reponame, const char *pagename, | 60 | char *cgit_fileurl(const char *reponame, const char *pagename, |
61 | const char *query) | 61 | const char *filename, const char *query) |
62 | { | 62 | { |
63 | if (cgit_virtual_root) { | 63 | if (cgit_virtual_root) { |
64 | if (query) | 64 | if (query) |
65 | return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, | 65 | return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame, |
66 | pagename, query); | 66 | pagename, filename?filename:"", query); |
67 | else | 67 | else |
68 | return fmt("%s/%s/%s/", cgit_virtual_root, reponame, | 68 | return fmt("%s/%s/%s/", cgit_virtual_root, reponame, |
69 | pagename); | 69 | pagename); |
70 | } else { | 70 | } else { |
@@ -74,8 +74,15 @@ char *cgit_pageurl(const char *reponame, const char *pagename, | |||
74 | return fmt("?r=%s&p=%s", reponame, pagename); | 74 | return fmt("?r=%s&p=%s", reponame, pagename); |
75 | } | 75 | } |
76 | } | 76 | } |
77 | 77 | ||
78 | char *cgit_pageurl(const char *reponame, const char *pagename, | ||
79 | const char *query) | ||
80 | { | ||
81 | return cgit_fileurl(reponame,pagename,0,query); | ||
82 | } | ||
83 | |||
84 | |||
78 | char *cgit_currurl() | 85 | char *cgit_currurl() |
79 | { | 86 | { |
80 | if (!cgit_virtual_root) | 87 | if (!cgit_virtual_root) |
81 | return cgit_script_name; | 88 | return cgit_script_name; |
@@ -367,4 +374,6 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename, | |||
367 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 374 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
368 | ttl_seconds(item->ttl))); | 375 | ttl_seconds(item->ttl))); |
369 | html("\n"); | 376 | html("\n"); |
370 | } | 377 | } |
378 | |||
379 | /* vim:set sw=8: */ | ||