aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-05-18 10:00:54 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-05-19 05:51:01 (JST)
commit30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de (patch)
treeefb3eddd091117281d5592c9eab44bc63121edf6
parent43d40f2b704151d145a1383b2b964210915ecae4 (diff)
downloadcgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.zip
cgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.tar.gz
Enable url=value querystring parameter
This makes is possible to use repo-urls like '/pub/scm/git/git.git' and even add path specifications, like '/pub/scm/git/git.git/log/documentation'. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cache.c9
-rw-r--r--cgit.c60
-rw-r--r--cgit.h16
-rw-r--r--parsing.c43
-rw-r--r--shared.c5
-rw-r--r--ui-shared.c5
6 files changed, 98 insertions, 40 deletions
diff --git a/cache.c b/cache.c
index 8df7c26..7cdea9b 100644
--- a/cache.c
+++ b/cache.c
@@ -43,15 +43,18 @@ int cache_create_dirs()
43 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 43 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
44 return 0; 44 return 0;
45 45
46 if (!cgit_query_repo) 46 if (!cgit_repo)
47 return 0; 47 return 0;
48 48
49 path = fmt("%s/%s", cgit_cache_root, cgit_query_repo); 49 path = fmt("%s/%s", cgit_cache_root,
50 cache_safe_filename(cgit_repo->url));
51
50 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 52 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
51 return 0; 53 return 0;
52 54
53 if (cgit_query_page) { 55 if (cgit_query_page) {
54 path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo, 56 path = fmt("%s/%s/%s", cgit_cache_root,
57 cache_safe_filename(cgit_repo->url),
55 cgit_query_page); 58 cgit_query_page);
56 if (mkdir(path, S_IRWXU) && errno!=EEXIST) 59 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
57 return 0; 60 return 0;
diff --git a/cgit.c b/cgit.c
index 431e8fb..e5d8fbd 100644
--- a/cgit.c
+++ b/cgit.c
@@ -13,13 +13,7 @@ const char cgit_version[] = CGIT_VERSION;
13 13
14static int cgit_prepare_cache(struct cacheitem *item) 14static int cgit_prepare_cache(struct cacheitem *item)
15{ 15{
16 if (!cgit_query_repo) { 16 if (!cgit_repo && cgit_query_repo) {
17 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
18 item->ttl = cgit_cache_root_ttl;
19 return 1;
20 }
21 cgit_repo = cgit_get_repoinfo(cgit_query_repo);
22 if (!cgit_repo) {
23 char *title = fmt("%s - %s", cgit_root_title, "Bad request"); 17 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
24 cgit_print_docstart(title, item); 18 cgit_print_docstart(title, item);
25 cgit_print_pageheader(title, 0); 19 cgit_print_pageheader(title, 0);
@@ -28,13 +22,19 @@ static int cgit_prepare_cache(struct cacheitem *item)
28 return 0; 22 return 0;
29 } 23 }
30 24
31 if (!cgit_query_page) { 25 if (!cgit_repo) {
26 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
27 item->ttl = cgit_cache_root_ttl;
28 return 1;
29 }
30
31 if (!cgit_cmd) {
32 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 32 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
33 cgit_repo->url)); 33 cache_safe_filename(cgit_repo->url)));
34 item->ttl = cgit_cache_repo_ttl; 34 item->ttl = cgit_cache_repo_ttl;
35 } else { 35 } else {
36 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 36 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
37 cgit_repo->url, cgit_query_page, 37 cache_safe_filename(cgit_repo->url), cgit_query_page,
38 cache_safe_filename(cgit_querystring))); 38 cache_safe_filename(cgit_querystring)));
39 if (cgit_query_has_symref) 39 if (cgit_query_has_symref)
40 item->ttl = cgit_cache_dynamic_ttl; 40 item->ttl = cgit_cache_dynamic_ttl;
@@ -68,25 +68,20 @@ static void cgit_print_repo_page(struct cacheitem *item)
68 show_search = 0; 68 show_search = 0;
69 setenv("GIT_DIR", cgit_repo->path, 1); 69 setenv("GIT_DIR", cgit_repo->path, 1);
70 70
71 if (cgit_query_page) { 71 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
72 if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
73 cgit_print_snapshot(item, cgit_query_sha1, "zip", 72 cgit_print_snapshot(item, cgit_query_sha1, "zip",
74 cgit_repo->url, cgit_query_name); 73 cgit_repo->url, cgit_query_name);
75 return; 74 return;
76 }
77 if (!strcmp(cgit_query_page, "blob")) {
78 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
79 return;
80 }
81 } 75 }
82 76
83 if (cgit_query_page && !strcmp(cgit_query_page, "log")) 77 if (cgit_cmd == CMD_BLOB) {
84 show_search = 1; 78 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
79 return;
80 }
85 81
82 show_search = (cgit_cmd == CMD_LOG);
86 cgit_print_docstart(title, item); 83 cgit_print_docstart(title, item);
87 84 if (!cgit_cmd) {
88
89 if (!cgit_query_page) {
90 cgit_print_pageheader("summary", show_search); 85 cgit_print_pageheader("summary", show_search);
91 cgit_print_summary(); 86 cgit_print_summary();
92 cgit_print_docend(); 87 cgit_print_docend();
@@ -95,20 +90,26 @@ static void cgit_print_repo_page(struct cacheitem *item)
95 90
96 cgit_print_pageheader(cgit_query_page, show_search); 91 cgit_print_pageheader(cgit_query_page, show_search);
97 92
98 if (!strcmp(cgit_query_page, "log")) { 93 switch(cgit_cmd) {
94 case CMD_LOG:
99 cgit_print_log(cgit_query_head, cgit_query_ofs, 95 cgit_print_log(cgit_query_head, cgit_query_ofs,
100 cgit_max_commit_count, cgit_query_search, 96 cgit_max_commit_count, cgit_query_search,
101 cgit_query_path); 97 cgit_query_path);
102 } else if (!strcmp(cgit_query_page, "tree")) { 98 break;
99 case CMD_TREE:
103 cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path); 100 cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
104 } else if (!strcmp(cgit_query_page, "commit")) { 101 break;
102 case CMD_COMMIT:
105 cgit_print_commit(cgit_query_head); 103 cgit_print_commit(cgit_query_head);
106 } else if (!strcmp(cgit_query_page, "view")) { 104 break;
105 case CMD_VIEW:
107 cgit_print_view(cgit_query_sha1, cgit_query_path); 106 cgit_print_view(cgit_query_sha1, cgit_query_path);
108 } else if (!strcmp(cgit_query_page, "diff")) { 107 break;
108 case CMD_DIFF:
109 cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, 109 cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
110 cgit_query_path); 110 cgit_query_path);
111 } else { 111 break;
112 default:
112 cgit_print_error("Invalid request"); 113 cgit_print_error("Invalid request");
113 } 114 }
114 cgit_print_docend(); 115 cgit_print_docend();
@@ -129,7 +130,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
129 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 130 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
130 } 131 }
131 132
132 if (cgit_query_repo) 133 if (cgit_repo)
133 cgit_print_repo_page(item); 134 cgit_print_repo_page(item);
134 else 135 else
135 cgit_print_repolist(item); 136 cgit_print_repolist(item);
@@ -234,6 +235,7 @@ int main(int argc, const char **argv)
234 cgit_repolist.repos = NULL; 235 cgit_repolist.repos = NULL;
235 236
236 cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); 237 cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
238 cgit_repo = NULL;
237 if (getenv("SCRIPT_NAME")) 239 if (getenv("SCRIPT_NAME"))
238 cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); 240 cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
239 if (getenv("QUERY_STRING")) 241 if (getenv("QUERY_STRING"))
diff --git a/cgit.h b/cgit.h
index f402466..e5b3f5e 100644
--- a/cgit.h
+++ b/cgit.h
@@ -21,13 +21,13 @@
21/* 21/*
22 * The valid cgit repo-commands 22 * The valid cgit repo-commands
23 */ 23 */
24#define CMD_LOG = 1; 24#define CMD_LOG 1
25#define CMD_COMMIT = 1; 25#define CMD_COMMIT 2
26#define CMD_DIFF = 1; 26#define CMD_DIFF 3
27#define CMD_TREE = 1; 27#define CMD_TREE 4
28#define CMD_VIEW = 1; 28#define CMD_VIEW 5
29#define CMD_BLOB = 1; 29#define CMD_BLOB 6
30#define CMD_SNAPSHOT = 1; 30#define CMD_SNAPSHOT 7
31 31
32typedef void (*configfn)(const char *name, const char *value); 32typedef void (*configfn)(const char *name, const char *value);
33typedef void (*filepair_fn)(struct diff_filepair *pair); 33typedef void (*filepair_fn)(struct diff_filepair *pair);
@@ -82,6 +82,7 @@ extern const char cgit_version[];
82 82
83extern struct repolist cgit_repolist; 83extern struct repolist cgit_repolist;
84extern struct repoinfo *cgit_repo; 84extern struct repoinfo *cgit_repo;
85extern int cgit_cmd;
85 86
86extern char *cgit_root_title; 87extern char *cgit_root_title;
87extern char *cgit_css; 88extern char *cgit_css;
@@ -162,6 +163,7 @@ extern int cgit_read_config(const char *filename, configfn fn);
162extern int cgit_parse_query(char *txt, configfn fn); 163extern int cgit_parse_query(char *txt, configfn fn);
163extern struct commitinfo *cgit_parse_commit(struct commit *commit); 164extern struct commitinfo *cgit_parse_commit(struct commit *commit);
164extern struct taginfo *cgit_parse_tag(struct tag *tag); 165extern struct taginfo *cgit_parse_tag(struct tag *tag);
166extern void cgit_parse_url(const char *url);
165 167
166extern char *cache_safe_filename(const char *unsafe); 168extern char *cache_safe_filename(const char *unsafe);
167extern int cache_lock(struct cacheitem *item); 169extern int cache_lock(struct cacheitem *item);
diff --git a/parsing.c b/parsing.c
index 36b0f0c..a028625 100644
--- a/parsing.c
+++ b/parsing.c
@@ -132,6 +132,49 @@ int cgit_parse_query(char *txt, configfn fn)
132 return 0; 132 return 0;
133} 133}
134 134
135/*
136 * url syntax: [repo ['/' cmd [ '/' path]]]
137 * repo: any valid repo url, may contain '/'
138 * cmd: log | commit | diff | tree | view | blob | snapshot
139 * path: any valid path, may contain '/'
140 *
141 */
142void cgit_parse_url(const char *url)
143{
144 char *cmd, *p;
145
146 cgit_repo = NULL;
147 if (!url || url[0] == '\0')
148 return;
149
150 cgit_repo = cgit_get_repoinfo(url);
151 if (cgit_repo) {
152 cgit_query_repo = cgit_repo->url;
153 return;
154 }
155
156 cmd = strchr(url, '/');
157 while (!cgit_repo && cmd) {
158 cmd[0] = '\0';
159 cgit_repo = cgit_get_repoinfo(url);
160 if (cgit_repo == NULL) {
161 cmd[0] = '/';
162 cmd = strchr(cmd + 1, '/');
163 continue;
164 }
165
166 cgit_query_repo = cgit_repo->url;
167 p = strchr(cmd + 1, '/');
168 if (p) {
169 p[0] = '\0';
170 cgit_query_path = xstrdup(p + 1);
171 }
172 cgit_cmd = cgit_get_cmd_index(cmd + 1);
173 cgit_query_page = xstrdup(cmd + 1);
174 return;
175 }
176}
177
135char *substr(const char *head, const char *tail) 178char *substr(const char *head, const char *tail)
136{ 179{
137 char *buf; 180 char *buf;
diff --git a/shared.c b/shared.c
index fb05427..0b074da 100644
--- a/shared.c
+++ b/shared.c
@@ -10,6 +10,7 @@
10 10
11struct repolist cgit_repolist; 11struct repolist cgit_repolist;
12struct repoinfo *cgit_repo; 12struct repoinfo *cgit_repo;
13int cgit_cmd;
13 14
14char *cgit_root_title = "Git repository browser"; 15char *cgit_root_title = "Git repository browser";
15char *cgit_css = "/cgit.css"; 16char *cgit_css = "/cgit.css";
@@ -184,8 +185,12 @@ void cgit_querystring_cb(const char *name, const char *value)
184{ 185{
185 if (!strcmp(name,"r")) { 186 if (!strcmp(name,"r")) {
186 cgit_query_repo = xstrdup(value); 187 cgit_query_repo = xstrdup(value);
188 cgit_repo = cgit_get_repoinfo(value);
187 } else if (!strcmp(name, "p")) { 189 } else if (!strcmp(name, "p")) {
188 cgit_query_page = xstrdup(value); 190 cgit_query_page = xstrdup(value);
191 cgit_cmd = cgit_get_cmd_index(value);
192 } else if (!strcmp(name, "url")) {
193 cgit_parse_url(value);
189 } else if (!strcmp(name, "q")) { 194 } else if (!strcmp(name, "q")) {
190 cgit_query_search = xstrdup(value); 195 cgit_query_search = xstrdup(value);
191 } else if (!strcmp(name, "h")) { 196 } else if (!strcmp(name, "h")) {
diff --git a/ui-shared.c b/ui-shared.c
index 6211056..c7fbc5e 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -68,7 +68,10 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
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 {
71 return fmt("?r=%s&p=%s&%s", reponame, pagename, query); 71 if (query)
72 return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
73 else
74 return fmt("?r=%s&p=%s", reponame, pagename);
72 } 75 }
73} 76}
74 77