summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h12
-rw-r--r--shared.c12
2 files changed, 24 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index a38981d..f402466 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,162 +1,174 @@
1#ifndef CGIT_H 1#ifndef CGIT_H
2#define CGIT_H 2#define CGIT_H
3 3
4 4
5#include <git-compat-util.h> 5#include <git-compat-util.h>
6#include <cache.h> 6#include <cache.h>
7#include <grep.h> 7#include <grep.h>
8#include <object.h> 8#include <object.h>
9#include <tree.h> 9#include <tree.h>
10#include <commit.h> 10#include <commit.h>
11#include <tag.h> 11#include <tag.h>
12#include <diff.h> 12#include <diff.h>
13#include <diffcore.h> 13#include <diffcore.h>
14#include <refs.h> 14#include <refs.h>
15#include <revision.h> 15#include <revision.h>
16#include <log-tree.h> 16#include <log-tree.h>
17#include <archive.h> 17#include <archive.h>
18#include <xdiff/xdiff.h> 18#include <xdiff/xdiff.h>
19 19
20 20
21/*
22 * The valid cgit repo-commands
23 */
24#define CMD_LOG = 1;
25#define CMD_COMMIT = 1;
26#define CMD_DIFF = 1;
27#define CMD_TREE = 1;
28#define CMD_VIEW = 1;
29#define CMD_BLOB = 1;
30#define CMD_SNAPSHOT = 1;
31
21typedef void (*configfn)(const char *name, const char *value); 32typedef void (*configfn)(const char *name, const char *value);
22typedef void (*filepair_fn)(struct diff_filepair *pair); 33typedef void (*filepair_fn)(struct diff_filepair *pair);
23typedef void (*linediff_fn)(char *line, int len); 34typedef void (*linediff_fn)(char *line, int len);
24 35
25struct cacheitem { 36struct cacheitem {
26 char *name; 37 char *name;
27 struct stat st; 38 struct stat st;
28 int ttl; 39 int ttl;
29 int fd; 40 int fd;
30}; 41};
31 42
32struct repoinfo { 43struct repoinfo {
33 char *url; 44 char *url;
34 char *name; 45 char *name;
35 char *path; 46 char *path;
36 char *desc; 47 char *desc;
37 char *owner; 48 char *owner;
38 char *defbranch; 49 char *defbranch;
39 char *module_link; 50 char *module_link;
40 int snapshots; 51 int snapshots;
41 int enable_log_filecount; 52 int enable_log_filecount;
42 int enable_log_linecount; 53 int enable_log_linecount;
43}; 54};
44 55
45struct repolist { 56struct repolist {
46 int length; 57 int length;
47 int count; 58 int count;
48 struct repoinfo *repos; 59 struct repoinfo *repos;
49}; 60};
50 61
51struct commitinfo { 62struct commitinfo {
52 struct commit *commit; 63 struct commit *commit;
53 char *author; 64 char *author;
54 char *author_email; 65 char *author_email;
55 unsigned long author_date; 66 unsigned long author_date;
56 char *committer; 67 char *committer;
57 char *committer_email; 68 char *committer_email;
58 unsigned long committer_date; 69 unsigned long committer_date;
59 char *subject; 70 char *subject;
60 char *msg; 71 char *msg;
61}; 72};
62 73
63struct taginfo { 74struct taginfo {
64 char *tagger; 75 char *tagger;
65 char *tagger_email; 76 char *tagger_email;
66 int tagger_date; 77 int tagger_date;
67 char *msg; 78 char *msg;
68}; 79};
69 80
70extern const char cgit_version[]; 81extern const char cgit_version[];
71 82
72extern struct repolist cgit_repolist; 83extern struct repolist cgit_repolist;
73extern struct repoinfo *cgit_repo; 84extern struct repoinfo *cgit_repo;
74 85
75extern char *cgit_root_title; 86extern char *cgit_root_title;
76extern char *cgit_css; 87extern char *cgit_css;
77extern char *cgit_logo; 88extern char *cgit_logo;
78extern char *cgit_logo_link; 89extern char *cgit_logo_link;
79extern char *cgit_module_link; 90extern char *cgit_module_link;
80extern char *cgit_virtual_root; 91extern char *cgit_virtual_root;
81extern char *cgit_script_name; 92extern char *cgit_script_name;
82extern char *cgit_cache_root; 93extern char *cgit_cache_root;
83 94
84extern int cgit_nocache; 95extern int cgit_nocache;
85extern int cgit_snapshots; 96extern int cgit_snapshots;
86extern int cgit_enable_log_filecount; 97extern int cgit_enable_log_filecount;
87extern int cgit_enable_log_linecount; 98extern int cgit_enable_log_linecount;
88extern int cgit_max_lock_attempts; 99extern int cgit_max_lock_attempts;
89extern int cgit_cache_root_ttl; 100extern int cgit_cache_root_ttl;
90extern int cgit_cache_repo_ttl; 101extern int cgit_cache_repo_ttl;
91extern int cgit_cache_dynamic_ttl; 102extern int cgit_cache_dynamic_ttl;
92extern int cgit_cache_static_ttl; 103extern int cgit_cache_static_ttl;
93extern int cgit_cache_max_create_time; 104extern int cgit_cache_max_create_time;
94 105
95extern int cgit_max_msg_len; 106extern int cgit_max_msg_len;
96extern int cgit_max_repodesc_len; 107extern int cgit_max_repodesc_len;
97extern int cgit_max_commit_count; 108extern int cgit_max_commit_count;
98 109
99extern int cgit_query_has_symref; 110extern int cgit_query_has_symref;
100extern int cgit_query_has_sha1; 111extern int cgit_query_has_sha1;
101 112
102extern char *cgit_querystring; 113extern char *cgit_querystring;
103extern char *cgit_query_repo; 114extern char *cgit_query_repo;
104extern char *cgit_query_page; 115extern char *cgit_query_page;
105extern char *cgit_query_search; 116extern char *cgit_query_search;
106extern char *cgit_query_head; 117extern char *cgit_query_head;
107extern char *cgit_query_sha1; 118extern char *cgit_query_sha1;
108extern char *cgit_query_sha2; 119extern char *cgit_query_sha2;
109extern char *cgit_query_path; 120extern char *cgit_query_path;
110extern char *cgit_query_name; 121extern char *cgit_query_name;
111extern int cgit_query_ofs; 122extern int cgit_query_ofs;
112 123
113extern int htmlfd; 124extern int htmlfd;
114 125
126extern int cgit_get_cmd_index(const char *cmd);
115extern struct repoinfo *cgit_get_repoinfo(const char *url); 127extern struct repoinfo *cgit_get_repoinfo(const char *url);
116extern void cgit_global_config_cb(const char *name, const char *value); 128extern void cgit_global_config_cb(const char *name, const char *value);
117extern void cgit_repo_config_cb(const char *name, const char *value); 129extern void cgit_repo_config_cb(const char *name, const char *value);
118extern void cgit_querystring_cb(const char *name, const char *value); 130extern void cgit_querystring_cb(const char *name, const char *value);
119 131
120extern int chk_zero(int result, char *msg); 132extern int chk_zero(int result, char *msg);
121extern int chk_positive(int result, char *msg); 133extern int chk_positive(int result, char *msg);
122 134
123extern int hextoint(char c); 135extern int hextoint(char c);
124 136
125extern void *cgit_free_commitinfo(struct commitinfo *info); 137extern void *cgit_free_commitinfo(struct commitinfo *info);
126 138
127extern int cgit_diff_files(const unsigned char *old_sha1, 139extern int cgit_diff_files(const unsigned char *old_sha1,
128 const unsigned char *new_sha1, 140 const unsigned char *new_sha1,
129 linediff_fn fn); 141 linediff_fn fn);
130 142
131extern void cgit_diff_tree(const unsigned char *old_sha1, 143extern void cgit_diff_tree(const unsigned char *old_sha1,
132 const unsigned char *new_sha1, 144 const unsigned char *new_sha1,
133 filepair_fn fn); 145 filepair_fn fn);
134 146
135extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 147extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
136 148
137extern char *fmt(const char *format,...); 149extern char *fmt(const char *format,...);
138 150
139extern void html(const char *txt); 151extern void html(const char *txt);
140extern void htmlf(const char *format,...); 152extern void htmlf(const char *format,...);
141extern void html_txt(char *txt); 153extern void html_txt(char *txt);
142extern void html_ntxt(int len, char *txt); 154extern void html_ntxt(int len, char *txt);
143extern void html_attr(char *txt); 155extern void html_attr(char *txt);
144extern void html_hidden(char *name, char *value); 156extern void html_hidden(char *name, char *value);
145extern void html_link_open(char *url, char *title, char *class); 157extern void html_link_open(char *url, char *title, char *class);
146extern void html_link_close(void); 158extern void html_link_close(void);
147extern void html_filemode(unsigned short mode); 159extern void html_filemode(unsigned short mode);
148 160
149extern int cgit_read_config(const char *filename, configfn fn); 161extern int cgit_read_config(const char *filename, configfn fn);
150extern int cgit_parse_query(char *txt, configfn fn); 162extern int cgit_parse_query(char *txt, configfn fn);
151extern struct commitinfo *cgit_parse_commit(struct commit *commit); 163extern struct commitinfo *cgit_parse_commit(struct commit *commit);
152extern struct taginfo *cgit_parse_tag(struct tag *tag); 164extern struct taginfo *cgit_parse_tag(struct tag *tag);
153 165
154extern char *cache_safe_filename(const char *unsafe); 166extern char *cache_safe_filename(const char *unsafe);
155extern int cache_lock(struct cacheitem *item); 167extern int cache_lock(struct cacheitem *item);
156extern int cache_unlock(struct cacheitem *item); 168extern int cache_unlock(struct cacheitem *item);
157extern int cache_cancel_lock(struct cacheitem *item); 169extern int cache_cancel_lock(struct cacheitem *item);
158extern int cache_exist(struct cacheitem *item); 170extern int cache_exist(struct cacheitem *item);
159extern int cache_expired(struct cacheitem *item); 171extern int cache_expired(struct cacheitem *item);
160 172
161extern char *cgit_repourl(const char *reponame); 173extern char *cgit_repourl(const char *reponame);
162extern char *cgit_pageurl(const char *reponame, const char *pagename, 174extern char *cgit_pageurl(const char *reponame, const char *pagename,
diff --git a/shared.c b/shared.c
index b164d81..fb05427 100644
--- a/shared.c
+++ b/shared.c
@@ -6,96 +6,108 @@
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
11struct repolist cgit_repolist; 11struct repolist cgit_repolist;
12struct repoinfo *cgit_repo; 12struct repoinfo *cgit_repo;
13 13
14char *cgit_root_title = "Git repository browser"; 14char *cgit_root_title = "Git repository browser";
15char *cgit_css = "/cgit.css"; 15char *cgit_css = "/cgit.css";
16char *cgit_logo = "/git-logo.png"; 16char *cgit_logo = "/git-logo.png";
17char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 17char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
18char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 18char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
19char *cgit_virtual_root = NULL; 19char *cgit_virtual_root = NULL;
20char *cgit_script_name = CGIT_SCRIPT_NAME; 20char *cgit_script_name = CGIT_SCRIPT_NAME;
21char *cgit_cache_root = "/var/cache/cgit"; 21char *cgit_cache_root = "/var/cache/cgit";
22 22
23int cgit_nocache = 0; 23int cgit_nocache = 0;
24int cgit_snapshots = 0; 24int cgit_snapshots = 0;
25int cgit_enable_log_filecount = 0; 25int cgit_enable_log_filecount = 0;
26int cgit_enable_log_linecount = 0; 26int cgit_enable_log_linecount = 0;
27int cgit_max_lock_attempts = 5; 27int cgit_max_lock_attempts = 5;
28int cgit_cache_root_ttl = 5; 28int cgit_cache_root_ttl = 5;
29int cgit_cache_repo_ttl = 5; 29int cgit_cache_repo_ttl = 5;
30int cgit_cache_dynamic_ttl = 5; 30int cgit_cache_dynamic_ttl = 5;
31int cgit_cache_static_ttl = -1; 31int cgit_cache_static_ttl = -1;
32int cgit_cache_max_create_time = 5; 32int cgit_cache_max_create_time = 5;
33 33
34int cgit_max_msg_len = 60; 34int cgit_max_msg_len = 60;
35int cgit_max_repodesc_len = 60; 35int cgit_max_repodesc_len = 60;
36int cgit_max_commit_count = 50; 36int cgit_max_commit_count = 50;
37 37
38int cgit_query_has_symref = 0; 38int cgit_query_has_symref = 0;
39int cgit_query_has_sha1 = 0; 39int cgit_query_has_sha1 = 0;
40 40
41char *cgit_querystring = NULL; 41char *cgit_querystring = NULL;
42char *cgit_query_repo = NULL; 42char *cgit_query_repo = NULL;
43char *cgit_query_page = NULL; 43char *cgit_query_page = NULL;
44char *cgit_query_head = NULL; 44char *cgit_query_head = NULL;
45char *cgit_query_search = NULL; 45char *cgit_query_search = NULL;
46char *cgit_query_sha1 = NULL; 46char *cgit_query_sha1 = NULL;
47char *cgit_query_sha2 = NULL; 47char *cgit_query_sha2 = NULL;
48char *cgit_query_path = NULL; 48char *cgit_query_path = NULL;
49char *cgit_query_name = NULL; 49char *cgit_query_name = NULL;
50int cgit_query_ofs = 0; 50int cgit_query_ofs = 0;
51 51
52int htmlfd = 0; 52int htmlfd = 0;
53 53
54
55int cgit_get_cmd_index(const char *cmd)
56{
57 static char *cmds[] = {"log", "commit", "diff", "tree", "view", "blob", "snapshot", NULL};
58 int i;
59
60 for(i = 0; cmds[i]; i++)
61 if (!strcmp(cmd, cmds[i]))
62 return i + 1;
63 return 0;
64}
65
54int chk_zero(int result, char *msg) 66int chk_zero(int result, char *msg)
55{ 67{
56 if (result != 0) 68 if (result != 0)
57 die("%s: %s", msg, strerror(errno)); 69 die("%s: %s", msg, strerror(errno));
58 return result; 70 return result;
59} 71}
60 72
61int chk_positive(int result, char *msg) 73int chk_positive(int result, char *msg)
62{ 74{
63 if (result <= 0) 75 if (result <= 0)
64 die("%s: %s", msg, strerror(errno)); 76 die("%s: %s", msg, strerror(errno));
65 return result; 77 return result;
66} 78}
67 79
68struct repoinfo *add_repo(const char *url) 80struct repoinfo *add_repo(const char *url)
69{ 81{
70 struct repoinfo *ret; 82 struct repoinfo *ret;
71 83
72 if (++cgit_repolist.count > cgit_repolist.length) { 84 if (++cgit_repolist.count > cgit_repolist.length) {
73 if (cgit_repolist.length == 0) 85 if (cgit_repolist.length == 0)
74 cgit_repolist.length = 8; 86 cgit_repolist.length = 8;
75 else 87 else
76 cgit_repolist.length *= 2; 88 cgit_repolist.length *= 2;
77 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 89 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
78 cgit_repolist.length * 90 cgit_repolist.length *
79 sizeof(struct repoinfo)); 91 sizeof(struct repoinfo));
80 } 92 }
81 93
82 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 94 ret = &cgit_repolist.repos[cgit_repolist.count-1];
83 ret->url = xstrdup(url); 95 ret->url = xstrdup(url);
84 ret->name = ret->url; 96 ret->name = ret->url;
85 ret->path = NULL; 97 ret->path = NULL;
86 ret->desc = NULL; 98 ret->desc = NULL;
87 ret->owner = NULL; 99 ret->owner = NULL;
88 ret->defbranch = "master"; 100 ret->defbranch = "master";
89 ret->snapshots = cgit_snapshots; 101 ret->snapshots = cgit_snapshots;
90 ret->enable_log_filecount = cgit_enable_log_filecount; 102 ret->enable_log_filecount = cgit_enable_log_filecount;
91 ret->enable_log_linecount = cgit_enable_log_linecount; 103 ret->enable_log_linecount = cgit_enable_log_linecount;
92 ret->module_link = cgit_module_link; 104 ret->module_link = cgit_module_link;
93 return ret; 105 return ret;
94} 106}
95 107
96struct repoinfo *cgit_get_repoinfo(const char *url) 108struct repoinfo *cgit_get_repoinfo(const char *url)
97{ 109{
98 int i; 110 int i;
99 struct repoinfo *repo; 111 struct repoinfo *repo;
100 112
101 for (i=0; i<cgit_repolist.count; i++) { 113 for (i=0; i<cgit_repolist.count; i++) {