summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c14
-rw-r--r--cgit.h1
-rw-r--r--shared.c13
3 files changed, 14 insertions, 14 deletions
diff --git a/cgit.c b/cgit.c
index 3e7e595..431e8fb 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,51 +1,37 @@
1/* cgit.c: cgi for the git scm 1/* cgit.c: cgi for the git scm
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11const char cgit_version[] = CGIT_VERSION; 11const char cgit_version[] = CGIT_VERSION;
12 12
13 13
14static struct repoinfo *cgit_get_repoinfo(char *url)
15{
16 int i;
17 struct repoinfo *repo;
18
19 for (i=0; i<cgit_repolist.count; i++) {
20 repo = &cgit_repolist.repos[i];
21 if (!strcmp(repo->url, url))
22 return repo;
23 }
24 return NULL;
25}
26
27
28static int cgit_prepare_cache(struct cacheitem *item) 14static int cgit_prepare_cache(struct cacheitem *item)
29{ 15{
30 if (!cgit_query_repo) { 16 if (!cgit_query_repo) {
31 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); 17 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
32 item->ttl = cgit_cache_root_ttl; 18 item->ttl = cgit_cache_root_ttl;
33 return 1; 19 return 1;
34 } 20 }
35 cgit_repo = cgit_get_repoinfo(cgit_query_repo); 21 cgit_repo = cgit_get_repoinfo(cgit_query_repo);
36 if (!cgit_repo) { 22 if (!cgit_repo) {
37 char *title = fmt("%s - %s", cgit_root_title, "Bad request"); 23 char *title = fmt("%s - %s", cgit_root_title, "Bad request");
38 cgit_print_docstart(title, item); 24 cgit_print_docstart(title, item);
39 cgit_print_pageheader(title, 0); 25 cgit_print_pageheader(title, 0);
40 cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); 26 cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo));
41 cgit_print_docend(); 27 cgit_print_docend();
42 return 0; 28 return 0;
43 } 29 }
44 30
45 if (!cgit_query_page) { 31 if (!cgit_query_page) {
46 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 32 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
47 cgit_repo->url)); 33 cgit_repo->url));
48 item->ttl = cgit_cache_repo_ttl; 34 item->ttl = cgit_cache_repo_ttl;
49 } else { 35 } else {
50 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,
51 cgit_repo->url, cgit_query_page, 37 cgit_repo->url, cgit_query_page,
diff --git a/cgit.h b/cgit.h
index f3d783e..a38981d 100644
--- a/cgit.h
+++ b/cgit.h
@@ -91,48 +91,49 @@ extern int cgit_cache_repo_ttl;
91extern int cgit_cache_dynamic_ttl; 91extern int cgit_cache_dynamic_ttl;
92extern int cgit_cache_static_ttl; 92extern int cgit_cache_static_ttl;
93extern int cgit_cache_max_create_time; 93extern int cgit_cache_max_create_time;
94 94
95extern int cgit_max_msg_len; 95extern int cgit_max_msg_len;
96extern int cgit_max_repodesc_len; 96extern int cgit_max_repodesc_len;
97extern int cgit_max_commit_count; 97extern int cgit_max_commit_count;
98 98
99extern int cgit_query_has_symref; 99extern int cgit_query_has_symref;
100extern int cgit_query_has_sha1; 100extern int cgit_query_has_sha1;
101 101
102extern char *cgit_querystring; 102extern char *cgit_querystring;
103extern char *cgit_query_repo; 103extern char *cgit_query_repo;
104extern char *cgit_query_page; 104extern char *cgit_query_page;
105extern char *cgit_query_search; 105extern char *cgit_query_search;
106extern char *cgit_query_head; 106extern char *cgit_query_head;
107extern char *cgit_query_sha1; 107extern char *cgit_query_sha1;
108extern char *cgit_query_sha2; 108extern char *cgit_query_sha2;
109extern char *cgit_query_path; 109extern char *cgit_query_path;
110extern char *cgit_query_name; 110extern char *cgit_query_name;
111extern int cgit_query_ofs; 111extern int cgit_query_ofs;
112 112
113extern int htmlfd; 113extern int htmlfd;
114 114
115extern struct repoinfo *cgit_get_repoinfo(const char *url);
115extern void cgit_global_config_cb(const char *name, const char *value); 116extern void cgit_global_config_cb(const char *name, const char *value);
116extern void cgit_repo_config_cb(const char *name, const char *value); 117extern void cgit_repo_config_cb(const char *name, const char *value);
117extern void cgit_querystring_cb(const char *name, const char *value); 118extern void cgit_querystring_cb(const char *name, const char *value);
118 119
119extern int chk_zero(int result, char *msg); 120extern int chk_zero(int result, char *msg);
120extern int chk_positive(int result, char *msg); 121extern int chk_positive(int result, char *msg);
121 122
122extern int hextoint(char c); 123extern int hextoint(char c);
123 124
124extern void *cgit_free_commitinfo(struct commitinfo *info); 125extern void *cgit_free_commitinfo(struct commitinfo *info);
125 126
126extern int cgit_diff_files(const unsigned char *old_sha1, 127extern int cgit_diff_files(const unsigned char *old_sha1,
127 const unsigned char *new_sha1, 128 const unsigned char *new_sha1,
128 linediff_fn fn); 129 linediff_fn fn);
129 130
130extern void cgit_diff_tree(const unsigned char *old_sha1, 131extern void cgit_diff_tree(const unsigned char *old_sha1,
131 const unsigned char *new_sha1, 132 const unsigned char *new_sha1,
132 filepair_fn fn); 133 filepair_fn fn);
133 134
134extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 135extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
135 136
136extern char *fmt(const char *format,...); 137extern char *fmt(const char *format,...);
137 138
138extern void html(const char *txt); 139extern void html(const char *txt);
diff --git a/shared.c b/shared.c
index 53cd9b0..b164d81 100644
--- a/shared.c
+++ b/shared.c
@@ -72,48 +72,61 @@ struct repoinfo *add_repo(const char *url)
72 if (++cgit_repolist.count > cgit_repolist.length) { 72 if (++cgit_repolist.count > cgit_repolist.length) {
73 if (cgit_repolist.length == 0) 73 if (cgit_repolist.length == 0)
74 cgit_repolist.length = 8; 74 cgit_repolist.length = 8;
75 else 75 else
76 cgit_repolist.length *= 2; 76 cgit_repolist.length *= 2;
77 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 77 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
78 cgit_repolist.length * 78 cgit_repolist.length *
79 sizeof(struct repoinfo)); 79 sizeof(struct repoinfo));
80 } 80 }
81 81
82 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 82 ret = &cgit_repolist.repos[cgit_repolist.count-1];
83 ret->url = xstrdup(url); 83 ret->url = xstrdup(url);
84 ret->name = ret->url; 84 ret->name = ret->url;
85 ret->path = NULL; 85 ret->path = NULL;
86 ret->desc = NULL; 86 ret->desc = NULL;
87 ret->owner = NULL; 87 ret->owner = NULL;
88 ret->defbranch = "master"; 88 ret->defbranch = "master";
89 ret->snapshots = cgit_snapshots; 89 ret->snapshots = cgit_snapshots;
90 ret->enable_log_filecount = cgit_enable_log_filecount; 90 ret->enable_log_filecount = cgit_enable_log_filecount;
91 ret->enable_log_linecount = cgit_enable_log_linecount; 91 ret->enable_log_linecount = cgit_enable_log_linecount;
92 ret->module_link = cgit_module_link; 92 ret->module_link = cgit_module_link;
93 return ret; 93 return ret;
94} 94}
95 95
96struct repoinfo *cgit_get_repoinfo(const char *url)
97{
98 int i;
99 struct repoinfo *repo;
100
101 for (i=0; i<cgit_repolist.count; i++) {
102 repo = &cgit_repolist.repos[i];
103 if (!strcmp(repo->url, url))
104 return repo;
105 }
106 return NULL;
107}
108
96void cgit_global_config_cb(const char *name, const char *value) 109void cgit_global_config_cb(const char *name, const char *value)
97{ 110{
98 if (!strcmp(name, "root-title")) 111 if (!strcmp(name, "root-title"))
99 cgit_root_title = xstrdup(value); 112 cgit_root_title = xstrdup(value);
100 else if (!strcmp(name, "css")) 113 else if (!strcmp(name, "css"))
101 cgit_css = xstrdup(value); 114 cgit_css = xstrdup(value);
102 else if (!strcmp(name, "logo")) 115 else if (!strcmp(name, "logo"))
103 cgit_logo = xstrdup(value); 116 cgit_logo = xstrdup(value);
104 else if (!strcmp(name, "logo-link")) 117 else if (!strcmp(name, "logo-link"))
105 cgit_logo_link = xstrdup(value); 118 cgit_logo_link = xstrdup(value);
106 else if (!strcmp(name, "module-link")) 119 else if (!strcmp(name, "module-link"))
107 cgit_module_link = xstrdup(value); 120 cgit_module_link = xstrdup(value);
108 else if (!strcmp(name, "virtual-root")) 121 else if (!strcmp(name, "virtual-root"))
109 cgit_virtual_root = xstrdup(value); 122 cgit_virtual_root = xstrdup(value);
110 else if (!strcmp(name, "nocache")) 123 else if (!strcmp(name, "nocache"))
111 cgit_nocache = atoi(value); 124 cgit_nocache = atoi(value);
112 else if (!strcmp(name, "snapshots")) 125 else if (!strcmp(name, "snapshots"))
113 cgit_snapshots = atoi(value); 126 cgit_snapshots = atoi(value);
114 else if (!strcmp(name, "enable-log-filecount")) 127 else if (!strcmp(name, "enable-log-filecount"))
115 cgit_enable_log_filecount = atoi(value); 128 cgit_enable_log_filecount = atoi(value);
116 else if (!strcmp(name, "enable-log-linecount")) 129 else if (!strcmp(name, "enable-log-linecount"))
117 cgit_enable_log_linecount = atoi(value); 130 cgit_enable_log_linecount = atoi(value);
118 else if (!strcmp(name, "cache-root")) 131 else if (!strcmp(name, "cache-root"))
119 cgit_cache_root = xstrdup(value); 132 cgit_cache_root = xstrdup(value);