author | Lars Hjemli <hjemli@gmail.com> | 2009-09-13 20:02:07 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-09-13 20:02:07 (UTC) |
commit | 92f6940975f6771f3a08d497c02575ee5bdc79da (patch) (unidiff) | |
tree | c1c538b24e50be3bf63356acf246cda76b91c519 /shared.c | |
parent | 5f12e45fe3338095916a444ff106dd9fc9991d84 (diff) | |
parent | ee554849ac7209fa8f7486327ec9f3b370e4c876 (diff) | |
download | cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.zip cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.tar.gz cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.tar.bz2 |
Merge branch 'lh/repo-scan'
-rw-r--r-- | shared.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -27,54 +27,55 @@ int chk_positive(int result, char *msg) | |||
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 | memset(ret, 0, sizeof(struct cgit_repo)); | ||
51 | ret->url = trim_end(url, '/'); | 52 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; | 53 | ret->name = ret->url; |
53 | ret->path = NULL; | 54 | ret->path = NULL; |
54 | ret->desc = "[no description]"; | 55 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; | 56 | ret->owner = NULL; |
56 | ret->group = ctx.cfg.repo_group; | 57 | ret->section = ctx.cfg.section; |
57 | ret->defbranch = "master"; | 58 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; | 59 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->max_stats = ctx.cfg.max_stats; | 62 | ret->max_stats = ctx.cfg.max_stats; |
62 | ret->module_link = ctx.cfg.module_link; | 63 | ret->module_link = ctx.cfg.module_link; |
63 | ret->readme = NULL; | 64 | ret->readme = NULL; |
64 | ret->mtime = -1; | 65 | ret->mtime = -1; |
65 | ret->about_filter = ctx.cfg.about_filter; | 66 | ret->about_filter = ctx.cfg.about_filter; |
66 | ret->commit_filter = ctx.cfg.commit_filter; | 67 | ret->commit_filter = ctx.cfg.commit_filter; |
67 | ret->source_filter = ctx.cfg.source_filter; | 68 | ret->source_filter = ctx.cfg.source_filter; |
68 | return ret; | 69 | return ret; |
69 | } | 70 | } |
70 | 71 | ||
71 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 72 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
72 | { | 73 | { |
73 | int i; | 74 | int i; |
74 | struct cgit_repo *repo; | 75 | struct cgit_repo *repo; |
75 | 76 | ||
76 | for (i=0; i<cgit_repolist.count; i++) { | 77 | for (i=0; i<cgit_repolist.count; i++) { |
77 | repo = &cgit_repolist.repos[i]; | 78 | repo = &cgit_repolist.repos[i]; |
78 | if (!strcmp(repo->url, url)) | 79 | if (!strcmp(repo->url, url)) |
79 | return repo; | 80 | return repo; |
80 | } | 81 | } |