|
diff --git a/shared.c b/shared.c index 37333f0..7382609 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -13,97 +13,97 @@ 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->group = ctx.cfg.repo_group; |
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->enable_stats = ctx.cfg.enable_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 | return ret; |
64 | return ret; |
65 | } |
65 | } |
66 | |
66 | |
67 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
67 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
68 | { |
68 | { |
69 | int i; |
69 | int i; |
70 | struct cgit_repo *repo; |
70 | struct cgit_repo *repo; |
71 | |
71 | |
72 | for (i=0; i<cgit_repolist.count; i++) { |
72 | for (i=0; i<cgit_repolist.count; i++) { |
73 | repo = &cgit_repolist.repos[i]; |
73 | repo = &cgit_repolist.repos[i]; |
74 | if (!strcmp(repo->url, url)) |
74 | if (!strcmp(repo->url, url)) |
75 | return repo; |
75 | return repo; |
76 | } |
76 | } |
77 | return NULL; |
77 | return NULL; |
78 | } |
78 | } |
79 | |
79 | |
80 | void *cgit_free_commitinfo(struct commitinfo *info) |
80 | void *cgit_free_commitinfo(struct commitinfo *info) |
81 | { |
81 | { |
82 | free(info->author); |
82 | free(info->author); |
83 | free(info->author_email); |
83 | free(info->author_email); |
84 | free(info->committer); |
84 | free(info->committer); |
85 | free(info->committer_email); |
85 | free(info->committer_email); |
86 | free(info->subject); |
86 | free(info->subject); |
87 | free(info->msg); |
87 | free(info->msg); |
88 | free(info->msg_encoding); |
88 | free(info->msg_encoding); |
89 | free(info); |
89 | free(info); |
90 | return NULL; |
90 | return NULL; |
91 | } |
91 | } |
92 | |
92 | |
93 | char *trim_end(const char *str, char c) |
93 | char *trim_end(const char *str, char c) |
94 | { |
94 | { |
95 | int len; |
95 | int len; |
96 | char *s, *t; |
96 | char *s, *t; |
97 | |
97 | |
98 | if (str == NULL) |
98 | if (str == NULL) |
99 | return NULL; |
99 | return NULL; |
100 | t = (char *)str; |
100 | t = (char *)str; |
101 | len = strlen(t); |
101 | len = strlen(t); |
102 | while(len > 0 && t[len - 1] == c) |
102 | while(len > 0 && t[len - 1] == c) |
103 | len--; |
103 | len--; |
104 | |
104 | |
105 | if (len == 0) |
105 | if (len == 0) |
106 | return NULL; |
106 | return NULL; |
107 | |
107 | |
108 | c = t[len]; |
108 | c = t[len]; |
109 | t[len] = '\0'; |
109 | t[len] = '\0'; |
|