summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.h2
-rw-r--r--ui-shared.c24
2 files changed, 26 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index aabf725..1dbf901 100644
--- a/cgit.h
+++ b/cgit.h
@@ -197,24 +197,26 @@ extern char *cache_safe_filename(const char *unsafe);
197extern int cache_lock(struct cacheitem *item); 197extern int cache_lock(struct cacheitem *item);
198extern int cache_unlock(struct cacheitem *item); 198extern int cache_unlock(struct cacheitem *item);
199extern int cache_cancel_lock(struct cacheitem *item); 199extern int cache_cancel_lock(struct cacheitem *item);
200extern int cache_exist(struct cacheitem *item); 200extern int cache_exist(struct cacheitem *item);
201extern int cache_expired(struct cacheitem *item); 201extern int cache_expired(struct cacheitem *item);
202 202
203extern char *cgit_repourl(const char *reponame); 203extern char *cgit_repourl(const char *reponame);
204extern char *cgit_fileurl(const char *reponame, const char *pagename, 204extern char *cgit_fileurl(const char *reponame, const char *pagename,
205 const char *filename, const char *query); 205 const char *filename, const char *query);
206extern char *cgit_pageurl(const char *reponame, const char *pagename, 206extern char *cgit_pageurl(const char *reponame, const char *pagename,
207 const char *query); 207 const char *query);
208 208
209extern const char *cgit_repobasename(const char *reponame);
210
209extern void cgit_tree_link(char *name, char *title, char *class, char *head, 211extern void cgit_tree_link(char *name, char *title, char *class, char *head,
210 char *rev, char *path); 212 char *rev, char *path);
211extern void cgit_log_link(char *name, char *title, char *class, char *head, 213extern void cgit_log_link(char *name, char *title, char *class, char *head,
212 char *rev, char *path, int ofs); 214 char *rev, char *path, int ofs);
213extern void cgit_commit_link(char *name, char *title, char *class, char *head, 215extern void cgit_commit_link(char *name, char *title, char *class, char *head,
214 char *rev); 216 char *rev);
215extern void cgit_diff_link(char *name, char *title, char *class, char *head, 217extern void cgit_diff_link(char *name, char *title, char *class, char *head,
216 char *new_rev, char *old_rev, char *path); 218 char *new_rev, char *old_rev, char *path);
217 219
218extern void cgit_print_error(char *msg); 220extern void cgit_print_error(char *msg);
219extern void cgit_print_date(time_t secs, char *format); 221extern void cgit_print_date(time_t secs, char *format);
220extern void cgit_print_age(time_t t, time_t max_relative, char *format); 222extern void cgit_print_age(time_t t, time_t max_relative, char *format);
diff --git a/ui-shared.c b/ui-shared.c
index 1c1415e..3e378a4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -72,24 +72,48 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
72 return fmt("?r=%s&p=%s&%s", reponame, pagename, query); 72 return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
73 else 73 else
74 return fmt("?r=%s&p=%s", reponame, pagename); 74 return fmt("?r=%s&p=%s", reponame, pagename);
75 } 75 }
76} 76}
77 77
78char *cgit_pageurl(const char *reponame, const char *pagename, 78char *cgit_pageurl(const char *reponame, const char *pagename,
79 const char *query) 79 const char *query)
80{ 80{
81 return cgit_fileurl(reponame,pagename,0,query); 81 return cgit_fileurl(reponame,pagename,0,query);
82} 82}
83 83
84const char *cgit_repobasename(const char *reponame)
85{
86 /* I assume we don't need to store more than one repo basename */
87 static char rvbuf[1024];
88 int p;
89 const char *rv;
90 strncpy(rvbuf,reponame,sizeof(rvbuf));
91 if(rvbuf[sizeof(rvbuf)-1])
92 die("cgit_repobasename: truncated repository name '%s'", reponame);
93 p = strlen(rvbuf)-1;
94 /* strip trailing slashes */
95 while(p && rvbuf[p]=='/') rvbuf[p--]=0;
96 /* strip trailing .git */
97 if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
98 p -= 3; rvbuf[p--] = 0;
99 }
100 /* strip more trailing slashes if any */
101 while( p && rvbuf[p]=='/') rvbuf[p--]=0;
102 /* find last slash in the remaining string */
103 rv = strrchr(rvbuf,'/');
104 if(rv)
105 return ++rv;
106 return rvbuf;
107}
84 108
85char *cgit_currurl() 109char *cgit_currurl()
86{ 110{
87 if (!cgit_virtual_root) 111 if (!cgit_virtual_root)
88 return cgit_script_name; 112 return cgit_script_name;
89 else if (cgit_query_page) 113 else if (cgit_query_page)
90 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); 114 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
91 else if (cgit_query_repo) 115 else if (cgit_query_repo)
92 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); 116 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
93 else 117 else
94 return fmt("%s/", cgit_virtual_root); 118 return fmt("%s/", cgit_virtual_root);
95} 119}