author | Lars Hjemli <hjemli@gmail.com> | 2010-08-22 11:29:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-22 11:29:57 (UTC) |
commit | 6d7552bc072599313ef423d69156d824c075572a (patch) (unidiff) | |
tree | 3189efeb6ca80dc6dcf0811ff2d8011e2b3e8c7b /cgit.c | |
parent | 379e80e3a83481d3639c5d312eeddcce57c486b2 (diff) | |
download | cgit-6d7552bc072599313ef423d69156d824c075572a.zip cgit-6d7552bc072599313ef423d69156d824c075572a.tar.gz cgit-6d7552bc072599313ef423d69156d824c075572a.tar.bz2 |
Use GIT-1.7.2.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,153 +1,153 @@ | |||
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 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | 4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> |
5 | * | 5 | * |
6 | * Licensed under GNU General Public License v2 | 6 | * Licensed under GNU General Public License v2 |
7 | * (see COPYING for full license text) | 7 | * (see COPYING for full license text) |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "cgit.h" | 10 | #include "cgit.h" |
11 | #include "cache.h" | 11 | #include "cache.h" |
12 | #include "cmd.h" | 12 | #include "cmd.h" |
13 | #include "configfile.h" | 13 | #include "configfile.h" |
14 | #include "html.h" | 14 | #include "html.h" |
15 | #include "ui-shared.h" | 15 | #include "ui-shared.h" |
16 | #include "ui-stats.h" | 16 | #include "ui-stats.h" |
17 | #include "scan-tree.h" | 17 | #include "scan-tree.h" |
18 | 18 | ||
19 | const char *cgit_version = CGIT_VERSION; | 19 | const char *cgit_version = CGIT_VERSION; |
20 | 20 | ||
21 | void add_mimetype(const char *name, const char *value) | 21 | void add_mimetype(const char *name, const char *value) |
22 | { | 22 | { |
23 | struct string_list_item *item; | 23 | struct string_list_item *item; |
24 | 24 | ||
25 | item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); | 25 | item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); |
26 | item->util = xstrdup(value); | 26 | item->util = xstrdup(value); |
27 | } | 27 | } |
28 | 28 | ||
29 | struct cgit_filter *new_filter(const char *cmd, int extra_args) | 29 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
30 | { | 30 | { |
31 | struct cgit_filter *f; | 31 | struct cgit_filter *f; |
32 | 32 | ||
33 | if (!cmd || !cmd[0]) | 33 | if (!cmd || !cmd[0]) |
34 | return NULL; | 34 | return NULL; |
35 | 35 | ||
36 | f = xmalloc(sizeof(struct cgit_filter)); | 36 | f = xmalloc(sizeof(struct cgit_filter)); |
37 | f->cmd = xstrdup(cmd); | 37 | f->cmd = xstrdup(cmd); |
38 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); | 38 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
39 | f->argv[0] = f->cmd; | 39 | f->argv[0] = f->cmd; |
40 | f->argv[1] = NULL; | 40 | f->argv[1] = NULL; |
41 | return f; | 41 | return f; |
42 | } | 42 | } |
43 | 43 | ||
44 | static void process_cached_repolist(const char *path); | 44 | static void process_cached_repolist(const char *path); |
45 | 45 | ||
46 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) | 46 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
47 | { | 47 | { |
48 | if (!strcmp(name, "name")) | 48 | if (!strcmp(name, "name")) |
49 | repo->name = xstrdup(value); | 49 | repo->name = xstrdup(value); |
50 | else if (!strcmp(name, "clone-url")) | 50 | else if (!strcmp(name, "clone-url")) |
51 | repo->clone_url = xstrdup(value); | 51 | repo->clone_url = xstrdup(value); |
52 | else if (!strcmp(name, "desc")) | 52 | else if (!strcmp(name, "desc")) |
53 | repo->desc = xstrdup(value); | 53 | repo->desc = xstrdup(value); |
54 | else if (!strcmp(name, "owner")) | 54 | else if (!strcmp(name, "owner")) |
55 | repo->owner = xstrdup(value); | 55 | repo->owner = xstrdup(value); |
56 | else if (!strcmp(name, "defbranch")) | 56 | else if (!strcmp(name, "defbranch")) |
57 | repo->defbranch = xstrdup(value); | 57 | repo->defbranch = xstrdup(value); |
58 | else if (!strcmp(name, "snapshots")) | 58 | else if (!strcmp(name, "snapshots")) |
59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); | 59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
60 | else if (!strcmp(name, "enable-log-filecount")) | 60 | else if (!strcmp(name, "enable-log-filecount")) |
61 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 61 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
62 | else if (!strcmp(name, "enable-log-linecount")) | 62 | else if (!strcmp(name, "enable-log-linecount")) |
63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
64 | else if (!strcmp(name, "enable-remote-branches")) | 64 | else if (!strcmp(name, "enable-remote-branches")) |
65 | repo->enable_remote_branches = atoi(value); | 65 | repo->enable_remote_branches = atoi(value); |
66 | else if (!strcmp(name, "enable-subject-links")) | 66 | else if (!strcmp(name, "enable-subject-links")) |
67 | repo->enable_subject_links = atoi(value); | 67 | repo->enable_subject_links = atoi(value); |
68 | else if (!strcmp(name, "max-stats")) | 68 | else if (!strcmp(name, "max-stats")) |
69 | repo->max_stats = cgit_find_stats_period(value, NULL); | 69 | repo->max_stats = cgit_find_stats_period(value, NULL); |
70 | else if (!strcmp(name, "module-link")) | 70 | else if (!strcmp(name, "module-link")) |
71 | repo->module_link= xstrdup(value); | 71 | repo->module_link= xstrdup(value); |
72 | else if (!strcmp(name, "section")) | 72 | else if (!strcmp(name, "section")) |
73 | repo->section = xstrdup(value); | 73 | repo->section = xstrdup(value); |
74 | else if (!strcmp(name, "readme") && value != NULL) { | 74 | else if (!strcmp(name, "readme") && value != NULL) { |
75 | char *colon; | 75 | char *colon; |
76 | if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0')) | 76 | if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0')) |
77 | repo->readme = xstrdup(value); | 77 | repo->readme = xstrdup(value); |
78 | else | 78 | else |
79 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); | 79 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
80 | } else if (ctx.cfg.enable_filter_overrides) { | 80 | } else if (ctx.cfg.enable_filter_overrides) { |
81 | if (!strcmp(name, "about-filter")) | 81 | if (!strcmp(name, "about-filter")) |
82 | repo->about_filter = new_filter(value, 0); | 82 | repo->about_filter = new_filter(value, 0); |
83 | else if (!strcmp(name, "commit-filter")) | 83 | else if (!strcmp(name, "commit-filter")) |
84 | repo->commit_filter = new_filter(value, 0); | 84 | repo->commit_filter = new_filter(value, 0); |
85 | else if (!strcmp(name, "source-filter")) | 85 | else if (!strcmp(name, "source-filter")) |
86 | repo->source_filter = new_filter(value, 1); | 86 | repo->source_filter = new_filter(value, 1); |
87 | } | 87 | } |
88 | } | 88 | } |
89 | 89 | ||
90 | void config_cb(const char *name, const char *value) | 90 | void config_cb(const char *name, const char *value) |
91 | { | 91 | { |
92 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) | 92 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
93 | ctx.cfg.section = xstrdup(value); | 93 | ctx.cfg.section = xstrdup(value); |
94 | else if (!strcmp(name, "repo.url")) | 94 | else if (!strcmp(name, "repo.url")) |
95 | ctx.repo = cgit_add_repo(value); | 95 | ctx.repo = cgit_add_repo(value); |
96 | else if (ctx.repo && !strcmp(name, "repo.path")) | 96 | else if (ctx.repo && !strcmp(name, "repo.path")) |
97 | ctx.repo->path = trim_end(value, '/'); | 97 | ctx.repo->path = trim_end(value, '/'); |
98 | else if (ctx.repo && !prefixcmp(name, "repo.")) | 98 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
99 | repo_config(ctx.repo, name + 5, value); | 99 | repo_config(ctx.repo, name + 5, value); |
100 | else if (!strcmp(name, "root-title")) | 100 | else if (!strcmp(name, "root-title")) |
101 | ctx.cfg.root_title = xstrdup(value); | 101 | ctx.cfg.root_title = xstrdup(value); |
102 | else if (!strcmp(name, "root-desc")) | 102 | else if (!strcmp(name, "root-desc")) |
103 | ctx.cfg.root_desc = xstrdup(value); | 103 | ctx.cfg.root_desc = xstrdup(value); |
104 | else if (!strcmp(name, "root-readme")) | 104 | else if (!strcmp(name, "root-readme")) |
105 | ctx.cfg.root_readme = xstrdup(value); | 105 | ctx.cfg.root_readme = xstrdup(value); |
106 | else if (!strcmp(name, "css")) | 106 | else if (!strcmp(name, "css")) |
107 | ctx.cfg.css = xstrdup(value); | 107 | ctx.cfg.css = xstrdup(value); |
108 | else if (!strcmp(name, "favicon")) | 108 | else if (!strcmp(name, "favicon")) |
109 | ctx.cfg.favicon = xstrdup(value); | 109 | ctx.cfg.favicon = xstrdup(value); |
110 | else if (!strcmp(name, "footer")) | 110 | else if (!strcmp(name, "footer")) |
111 | ctx.cfg.footer = xstrdup(value); | 111 | ctx.cfg.footer = xstrdup(value); |
112 | else if (!strcmp(name, "head-include")) | 112 | else if (!strcmp(name, "head-include")) |
113 | ctx.cfg.head_include = xstrdup(value); | 113 | ctx.cfg.head_include = xstrdup(value); |
114 | else if (!strcmp(name, "header")) | 114 | else if (!strcmp(name, "header")) |
115 | ctx.cfg.header = xstrdup(value); | 115 | ctx.cfg.header = xstrdup(value); |
116 | else if (!strcmp(name, "logo")) | 116 | else if (!strcmp(name, "logo")) |
117 | ctx.cfg.logo = xstrdup(value); | 117 | ctx.cfg.logo = xstrdup(value); |
118 | else if (!strcmp(name, "index-header")) | 118 | else if (!strcmp(name, "index-header")) |
119 | ctx.cfg.index_header = xstrdup(value); | 119 | ctx.cfg.index_header = xstrdup(value); |
120 | else if (!strcmp(name, "index-info")) | 120 | else if (!strcmp(name, "index-info")) |
121 | ctx.cfg.index_info = xstrdup(value); | 121 | ctx.cfg.index_info = xstrdup(value); |
122 | else if (!strcmp(name, "logo-link")) | 122 | else if (!strcmp(name, "logo-link")) |
123 | ctx.cfg.logo_link = xstrdup(value); | 123 | ctx.cfg.logo_link = xstrdup(value); |
124 | else if (!strcmp(name, "module-link")) | 124 | else if (!strcmp(name, "module-link")) |
125 | ctx.cfg.module_link = xstrdup(value); | 125 | ctx.cfg.module_link = xstrdup(value); |
126 | else if (!strcmp(name, "virtual-root")) { | 126 | else if (!strcmp(name, "virtual-root")) { |
127 | ctx.cfg.virtual_root = trim_end(value, '/'); | 127 | ctx.cfg.virtual_root = trim_end(value, '/'); |
128 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 128 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
129 | ctx.cfg.virtual_root = ""; | 129 | ctx.cfg.virtual_root = ""; |
130 | } else if (!strcmp(name, "nocache")) | 130 | } else if (!strcmp(name, "nocache")) |
131 | ctx.cfg.nocache = atoi(value); | 131 | ctx.cfg.nocache = atoi(value); |
132 | else if (!strcmp(name, "noplainemail")) | 132 | else if (!strcmp(name, "noplainemail")) |
133 | ctx.cfg.noplainemail = atoi(value); | 133 | ctx.cfg.noplainemail = atoi(value); |
134 | else if (!strcmp(name, "noheader")) | 134 | else if (!strcmp(name, "noheader")) |
135 | ctx.cfg.noheader = atoi(value); | 135 | ctx.cfg.noheader = atoi(value); |
136 | else if (!strcmp(name, "snapshots")) | 136 | else if (!strcmp(name, "snapshots")) |
137 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 137 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
138 | else if (!strcmp(name, "enable-filter-overrides")) | 138 | else if (!strcmp(name, "enable-filter-overrides")) |
139 | ctx.cfg.enable_filter_overrides = atoi(value); | 139 | ctx.cfg.enable_filter_overrides = atoi(value); |
140 | else if (!strcmp(name, "enable-gitweb-owner")) | 140 | else if (!strcmp(name, "enable-gitweb-owner")) |
141 | ctx.cfg.enable_gitweb_owner = atoi(value); | 141 | ctx.cfg.enable_gitweb_owner = atoi(value); |
142 | else if (!strcmp(name, "enable-index-links")) | 142 | else if (!strcmp(name, "enable-index-links")) |
143 | ctx.cfg.enable_index_links = atoi(value); | 143 | ctx.cfg.enable_index_links = atoi(value); |
144 | else if (!strcmp(name, "enable-log-filecount")) | 144 | else if (!strcmp(name, "enable-log-filecount")) |
145 | ctx.cfg.enable_log_filecount = atoi(value); | 145 | ctx.cfg.enable_log_filecount = atoi(value); |
146 | else if (!strcmp(name, "enable-log-linecount")) | 146 | else if (!strcmp(name, "enable-log-linecount")) |
147 | ctx.cfg.enable_log_linecount = atoi(value); | 147 | ctx.cfg.enable_log_linecount = atoi(value); |
148 | else if (!strcmp(name, "enable-remote-branches")) | 148 | else if (!strcmp(name, "enable-remote-branches")) |
149 | ctx.cfg.enable_remote_branches = atoi(value); | 149 | ctx.cfg.enable_remote_branches = atoi(value); |
150 | else if (!strcmp(name, "enable-subject-links")) | 150 | else if (!strcmp(name, "enable-subject-links")) |
151 | ctx.cfg.enable_subject_links = atoi(value); | 151 | ctx.cfg.enable_subject_links = atoi(value); |
152 | else if (!strcmp(name, "enable-tree-linenumbers")) | 152 | else if (!strcmp(name, "enable-tree-linenumbers")) |
153 | ctx.cfg.enable_tree_linenumbers = atoi(value); | 153 | ctx.cfg.enable_tree_linenumbers = atoi(value); |