author | Lars Hjemli <hjemli@gmail.com> | 2009-08-23 20:58:39 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 08:22:58 (UTC) |
commit | e7af002d5c405c82652f739d08ced3908d1f57e7 (patch) (unidiff) | |
tree | 1e31e5dd8d33ca4a8392c4d6207b2ff6bf8a0d76 /shared.c | |
parent | 50d5af3adcdd90424b70e9472af24356ed50aa9b (diff) | |
download | cgit-e7af002d5c405c82652f739d08ced3908d1f57e7.zip cgit-e7af002d5c405c82652f739d08ced3908d1f57e7.tar.gz cgit-e7af002d5c405c82652f739d08ced3908d1f57e7.tar.bz2 |
Introduce 'section' as canonical spelling for 'repo.group'
The 'repo.' prefix should be reserved for repo-specific options, but
the option 'repo.group' must still be honored to stay backwards
compatible.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,152 +1,152 @@ | |||
1 | /* shared.c: global vars + some callback functions | 1 | /* shared.c: global vars + some callback functions |
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 | ||
11 | struct cgit_repolist cgit_repolist; | 11 | struct cgit_repolist cgit_repolist; |
12 | struct cgit_context ctx; | 12 | struct cgit_context ctx; |
13 | int cgit_cmd; | 13 | int cgit_cmd; |
14 | 14 | ||
15 | int chk_zero(int result, char *msg) | 15 | int chk_zero(int result, char *msg) |
16 | { | 16 | { |
17 | if (result != 0) | 17 | if (result != 0) |
18 | die("%s: %s", msg, strerror(errno)); | 18 | die("%s: %s", msg, strerror(errno)); |
19 | return result; | 19 | return result; |
20 | } | 20 | } |
21 | 21 | ||
22 | int chk_positive(int result, char *msg) | 22 | int chk_positive(int result, char *msg) |
23 | { | 23 | { |
24 | if (result <= 0) | 24 | if (result <= 0) |
25 | die("%s: %s", msg, strerror(errno)); | 25 | die("%s: %s", msg, strerror(errno)); |
26 | return result; | 26 | return result; |
27 | } | 27 | } |
28 | 28 | ||
29 | int chk_non_negative(int result, char *msg) | 29 | int chk_non_negative(int result, char *msg) |
30 | { | 30 | { |
31 | if (result < 0) | 31 | if (result < 0) |
32 | die("%s: %s",msg, strerror(errno)); | 32 | die("%s: %s",msg, strerror(errno)); |
33 | return result; | 33 | return result; |
34 | } | 34 | } |
35 | 35 | ||
36 | struct cgit_repo *cgit_add_repo(const char *url) | 36 | struct cgit_repo *cgit_add_repo(const char *url) |
37 | { | 37 | { |
38 | struct cgit_repo *ret; | 38 | struct cgit_repo *ret; |
39 | 39 | ||
40 | if (++cgit_repolist.count > cgit_repolist.length) { | 40 | if (++cgit_repolist.count > cgit_repolist.length) { |
41 | if (cgit_repolist.length == 0) | 41 | if (cgit_repolist.length == 0) |
42 | cgit_repolist.length = 8; | 42 | cgit_repolist.length = 8; |
43 | else | 43 | else |
44 | cgit_repolist.length *= 2; | 44 | cgit_repolist.length *= 2; |
45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
46 | cgit_repolist.length * | 46 | cgit_repolist.length * |
47 | sizeof(struct cgit_repo)); | 47 | sizeof(struct cgit_repo)); |
48 | } | 48 | } |
49 | 49 | ||
50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
51 | ret->url = trim_end(url, '/'); | 51 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; | 52 | ret->name = ret->url; |
53 | ret->path = NULL; | 53 | ret->path = NULL; |
54 | ret->desc = "[no description]"; | 54 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; | 55 | ret->owner = NULL; |
56 | ret->group = ctx.cfg.repo_group; | 56 | ret->section = ctx.cfg.section; |
57 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->max_stats = ctx.cfg.max_stats; | 61 | ret->max_stats = ctx.cfg.max_stats; |
62 | ret->module_link = ctx.cfg.module_link; | 62 | ret->module_link = ctx.cfg.module_link; |
63 | ret->readme = NULL; | 63 | ret->readme = NULL; |
64 | ret->mtime = -1; | 64 | ret->mtime = -1; |
65 | ret->about_filter = ctx.cfg.about_filter; | 65 | ret->about_filter = ctx.cfg.about_filter; |
66 | ret->commit_filter = ctx.cfg.commit_filter; | 66 | ret->commit_filter = ctx.cfg.commit_filter; |
67 | ret->source_filter = ctx.cfg.source_filter; | 67 | ret->source_filter = ctx.cfg.source_filter; |
68 | return ret; | 68 | return ret; |
69 | } | 69 | } |
70 | 70 | ||
71 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 71 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
72 | { | 72 | { |
73 | int i; | 73 | int i; |
74 | struct cgit_repo *repo; | 74 | struct cgit_repo *repo; |
75 | 75 | ||
76 | for (i=0; i<cgit_repolist.count; i++) { | 76 | for (i=0; i<cgit_repolist.count; i++) { |
77 | repo = &cgit_repolist.repos[i]; | 77 | repo = &cgit_repolist.repos[i]; |
78 | if (!strcmp(repo->url, url)) | 78 | if (!strcmp(repo->url, url)) |
79 | return repo; | 79 | return repo; |
80 | } | 80 | } |
81 | return NULL; | 81 | return NULL; |
82 | } | 82 | } |
83 | 83 | ||
84 | void *cgit_free_commitinfo(struct commitinfo *info) | 84 | void *cgit_free_commitinfo(struct commitinfo *info) |
85 | { | 85 | { |
86 | free(info->author); | 86 | free(info->author); |
87 | free(info->author_email); | 87 | free(info->author_email); |
88 | free(info->committer); | 88 | free(info->committer); |
89 | free(info->committer_email); | 89 | free(info->committer_email); |
90 | free(info->subject); | 90 | free(info->subject); |
91 | free(info->msg); | 91 | free(info->msg); |
92 | free(info->msg_encoding); | 92 | free(info->msg_encoding); |
93 | free(info); | 93 | free(info); |
94 | return NULL; | 94 | return NULL; |
95 | } | 95 | } |
96 | 96 | ||
97 | char *trim_end(const char *str, char c) | 97 | char *trim_end(const char *str, char c) |
98 | { | 98 | { |
99 | int len; | 99 | int len; |
100 | char *s, *t; | 100 | char *s, *t; |
101 | 101 | ||
102 | if (str == NULL) | 102 | if (str == NULL) |
103 | return NULL; | 103 | return NULL; |
104 | t = (char *)str; | 104 | t = (char *)str; |
105 | len = strlen(t); | 105 | len = strlen(t); |
106 | while(len > 0 && t[len - 1] == c) | 106 | while(len > 0 && t[len - 1] == c) |
107 | len--; | 107 | len--; |
108 | 108 | ||
109 | if (len == 0) | 109 | if (len == 0) |
110 | return NULL; | 110 | return NULL; |
111 | 111 | ||
112 | c = t[len]; | 112 | c = t[len]; |
113 | t[len] = '\0'; | 113 | t[len] = '\0'; |
114 | s = xstrdup(t); | 114 | s = xstrdup(t); |
115 | t[len] = c; | 115 | t[len] = c; |
116 | return s; | 116 | return s; |
117 | } | 117 | } |
118 | 118 | ||
119 | char *strlpart(char *txt, int maxlen) | 119 | char *strlpart(char *txt, int maxlen) |
120 | { | 120 | { |
121 | char *result; | 121 | char *result; |
122 | 122 | ||
123 | if (!txt) | 123 | if (!txt) |
124 | return txt; | 124 | return txt; |
125 | 125 | ||
126 | if (strlen(txt) <= maxlen) | 126 | if (strlen(txt) <= maxlen) |
127 | return txt; | 127 | return txt; |
128 | result = xmalloc(maxlen + 1); | 128 | result = xmalloc(maxlen + 1); |
129 | memcpy(result, txt, maxlen - 3); | 129 | memcpy(result, txt, maxlen - 3); |
130 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; | 130 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
131 | result[maxlen] = '\0'; | 131 | result[maxlen] = '\0'; |
132 | return result; | 132 | return result; |
133 | } | 133 | } |
134 | 134 | ||
135 | char *strrpart(char *txt, int maxlen) | 135 | char *strrpart(char *txt, int maxlen) |
136 | { | 136 | { |
137 | char *result; | 137 | char *result; |
138 | 138 | ||
139 | if (!txt) | 139 | if (!txt) |
140 | return txt; | 140 | return txt; |
141 | 141 | ||
142 | if (strlen(txt) <= maxlen) | 142 | if (strlen(txt) <= maxlen) |
143 | return txt; | 143 | return txt; |
144 | result = xmalloc(maxlen + 1); | 144 | result = xmalloc(maxlen + 1); |
145 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); | 145 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
146 | result[0] = result[1] = result[2] = '.'; | 146 | result[0] = result[1] = result[2] = '.'; |
147 | return result; | 147 | return result; |
148 | } | 148 | } |
149 | 149 | ||
150 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) | 150 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
151 | { | 151 | { |
152 | size_t size; | 152 | size_t size; |