|
diff --git a/shared.c b/shared.c index 7ec2e19..3926b4a 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -55,113 +55,105 @@ struct cgit_repo *cgit_add_repo(const char *url) |
55 | ret->owner = NULL; |
55 | ret->owner = NULL; |
56 | ret->section = ctx.cfg.section; |
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_commit_graph = ctx.cfg.enable_commit_graph; |
59 | ret->enable_commit_graph = ctx.cfg.enable_commit_graph; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
63 | ret->enable_subject_links = ctx.cfg.enable_subject_links; |
63 | ret->enable_subject_links = ctx.cfg.enable_subject_links; |
64 | ret->max_stats = ctx.cfg.max_stats; |
64 | ret->max_stats = ctx.cfg.max_stats; |
65 | ret->module_link = ctx.cfg.module_link; |
65 | ret->module_link = ctx.cfg.module_link; |
66 | ret->readme = ctx.cfg.readme; |
66 | ret->readme = ctx.cfg.readme; |
67 | ret->mtime = -1; |
67 | ret->mtime = -1; |
68 | ret->about_filter = ctx.cfg.about_filter; |
68 | ret->about_filter = ctx.cfg.about_filter; |
69 | ret->commit_filter = ctx.cfg.commit_filter; |
69 | ret->commit_filter = ctx.cfg.commit_filter; |
70 | ret->source_filter = ctx.cfg.source_filter; |
70 | ret->source_filter = ctx.cfg.source_filter; |
71 | return ret; |
71 | return ret; |
72 | } |
72 | } |
73 | |
73 | |
74 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
74 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
75 | { |
75 | { |
76 | int i; |
76 | int i; |
77 | struct cgit_repo *repo; |
77 | struct cgit_repo *repo; |
78 | |
78 | |
79 | for (i=0; i<cgit_repolist.count; i++) { |
79 | for (i=0; i<cgit_repolist.count; i++) { |
80 | repo = &cgit_repolist.repos[i]; |
80 | repo = &cgit_repolist.repos[i]; |
81 | if (!strcmp(repo->url, url)) |
81 | if (!strcmp(repo->url, url)) |
82 | return repo; |
82 | return repo; |
83 | } |
83 | } |
84 | return NULL; |
84 | return NULL; |
85 | } |
85 | } |
86 | |
86 | |
87 | void *cgit_free_commitinfo(struct commitinfo *info) |
87 | void *cgit_free_commitinfo(struct commitinfo *info) |
88 | { |
88 | { |
89 | free(info->author); |
89 | free(info->author); |
90 | free(info->author_email); |
90 | free(info->author_email); |
91 | free(info->committer); |
91 | free(info->committer); |
92 | free(info->committer_email); |
92 | free(info->committer_email); |
93 | free(info->subject); |
93 | free(info->subject); |
94 | free(info->msg); |
94 | free(info->msg); |
95 | free(info->msg_encoding); |
95 | free(info->msg_encoding); |
96 | free(info); |
96 | free(info); |
97 | return NULL; |
97 | return NULL; |
98 | } |
98 | } |
99 | |
99 | |
100 | char *trim_end(const char *str, char c) |
100 | char *trim_end(const char *str, char c) |
101 | { |
101 | { |
102 | int len; |
102 | int len; |
103 | char *s, *t; |
| |
104 | |
103 | |
105 | if (str == NULL) |
104 | if (str == NULL) |
106 | return NULL; |
105 | return NULL; |
107 | t = (char *)str; |
106 | len = strlen(str); |
108 | len = strlen(t); |
107 | while(len > 0 && str[len - 1] == c) |
109 | while(len > 0 && t[len - 1] == c) |
| |
110 | len--; |
108 | len--; |
111 | |
| |
112 | if (len == 0) |
109 | if (len == 0) |
113 | return NULL; |
110 | return NULL; |
114 | |
111 | return xstrndup(str, len); |
115 | c = t[len]; |
| |
116 | t[len] = '\0'; |
| |
117 | s = xstrdup(t); |
| |
118 | t[len] = c; |
| |
119 | return s; |
| |
120 | } |
112 | } |
121 | |
113 | |
122 | char *strlpart(char *txt, int maxlen) |
114 | char *strlpart(char *txt, int maxlen) |
123 | { |
115 | { |
124 | char *result; |
116 | char *result; |
125 | |
117 | |
126 | if (!txt) |
118 | if (!txt) |
127 | return txt; |
119 | return txt; |
128 | |
120 | |
129 | if (strlen(txt) <= maxlen) |
121 | if (strlen(txt) <= maxlen) |
130 | return txt; |
122 | return txt; |
131 | result = xmalloc(maxlen + 1); |
123 | result = xmalloc(maxlen + 1); |
132 | memcpy(result, txt, maxlen - 3); |
124 | memcpy(result, txt, maxlen - 3); |
133 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
125 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
134 | result[maxlen] = '\0'; |
126 | result[maxlen] = '\0'; |
135 | return result; |
127 | return result; |
136 | } |
128 | } |
137 | |
129 | |
138 | char *strrpart(char *txt, int maxlen) |
130 | char *strrpart(char *txt, int maxlen) |
139 | { |
131 | { |
140 | char *result; |
132 | char *result; |
141 | |
133 | |
142 | if (!txt) |
134 | if (!txt) |
143 | return txt; |
135 | return txt; |
144 | |
136 | |
145 | if (strlen(txt) <= maxlen) |
137 | if (strlen(txt) <= maxlen) |
146 | return txt; |
138 | return txt; |
147 | result = xmalloc(maxlen + 1); |
139 | result = xmalloc(maxlen + 1); |
148 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
140 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
149 | result[0] = result[1] = result[2] = '.'; |
141 | result[0] = result[1] = result[2] = '.'; |
150 | return result; |
142 | return result; |
151 | } |
143 | } |
152 | |
144 | |
153 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
145 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
154 | { |
146 | { |
155 | size_t size; |
147 | size_t size; |
156 | |
148 | |
157 | if (list->count >= list->alloc) { |
149 | if (list->count >= list->alloc) { |
158 | list->alloc += (list->alloc ? list->alloc : 4); |
150 | list->alloc += (list->alloc ? list->alloc : 4); |
159 | size = list->alloc * sizeof(struct refinfo *); |
151 | size = list->alloc * sizeof(struct refinfo *); |
160 | list->refs = xrealloc(list->refs, size); |
152 | list->refs = xrealloc(list->refs, size); |
161 | } |
153 | } |
162 | list->refs[list->count++] = ref; |
154 | list->refs[list->count++] = ref; |
163 | } |
155 | } |
164 | |
156 | |
165 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
157 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
166 | { |
158 | { |
167 | struct refinfo *ref; |
159 | struct refinfo *ref; |
|