author | Lars Hjemli <hjemli@gmail.com> | 2008-01-13 17:34:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-01-13 17:34:37 (UTC) |
commit | 2122c696a34133a616b9ec6d72abe9eb89e728aa (patch) (unidiff) | |
tree | fc3c4693f77b04c1eaf549841d5bae46d9801608 /shared.c | |
parent | f39c3c99a12154cdafcdc501a821e3fadd3c0602 (diff) | |
parent | b74cc91574a9284d2f6446fd2ef3df6298ed6992 (diff) | |
download | cgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.zip cgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.tar.gz cgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.tar.bz2 |
Merge branch 'stable'
* stable:
CGIT 0.7.2
Use GIT-1.5.3.8
Compare string lengths when parsing the snapshot mask
Default repo description to "[no description]"
-rw-r--r-- | shared.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -97,49 +97,49 @@ int chk_non_negative(int result, char *msg) | |||
97 | { | 97 | { |
98 | if (result < 0) | 98 | if (result < 0) |
99 | die("%s: %s",msg, strerror(errno)); | 99 | die("%s: %s",msg, strerror(errno)); |
100 | return result; | 100 | return result; |
101 | } | 101 | } |
102 | 102 | ||
103 | struct repoinfo *add_repo(const char *url) | 103 | struct repoinfo *add_repo(const char *url) |
104 | { | 104 | { |
105 | struct repoinfo *ret; | 105 | struct repoinfo *ret; |
106 | 106 | ||
107 | if (++cgit_repolist.count > cgit_repolist.length) { | 107 | if (++cgit_repolist.count > cgit_repolist.length) { |
108 | if (cgit_repolist.length == 0) | 108 | if (cgit_repolist.length == 0) |
109 | cgit_repolist.length = 8; | 109 | cgit_repolist.length = 8; |
110 | else | 110 | else |
111 | cgit_repolist.length *= 2; | 111 | cgit_repolist.length *= 2; |
112 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 112 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
113 | cgit_repolist.length * | 113 | cgit_repolist.length * |
114 | sizeof(struct repoinfo)); | 114 | sizeof(struct repoinfo)); |
115 | } | 115 | } |
116 | 116 | ||
117 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 117 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
118 | ret->url = trim_end(url, '/'); | 118 | ret->url = trim_end(url, '/'); |
119 | ret->name = ret->url; | 119 | ret->name = ret->url; |
120 | ret->path = NULL; | 120 | ret->path = NULL; |
121 | ret->desc = NULL; | 121 | ret->desc = "[no description]"; |
122 | ret->owner = NULL; | 122 | ret->owner = NULL; |
123 | ret->group = cgit_repo_group; | 123 | ret->group = cgit_repo_group; |
124 | ret->defbranch = "master"; | 124 | ret->defbranch = "master"; |
125 | ret->snapshots = cgit_snapshots; | 125 | ret->snapshots = cgit_snapshots; |
126 | ret->enable_log_filecount = cgit_enable_log_filecount; | 126 | ret->enable_log_filecount = cgit_enable_log_filecount; |
127 | ret->enable_log_linecount = cgit_enable_log_linecount; | 127 | ret->enable_log_linecount = cgit_enable_log_linecount; |
128 | ret->module_link = cgit_module_link; | 128 | ret->module_link = cgit_module_link; |
129 | ret->readme = NULL; | 129 | ret->readme = NULL; |
130 | return ret; | 130 | return ret; |
131 | } | 131 | } |
132 | 132 | ||
133 | struct repoinfo *cgit_get_repoinfo(const char *url) | 133 | struct repoinfo *cgit_get_repoinfo(const char *url) |
134 | { | 134 | { |
135 | int i; | 135 | int i; |
136 | struct repoinfo *repo; | 136 | struct repoinfo *repo; |
137 | 137 | ||
138 | for (i=0; i<cgit_repolist.count; i++) { | 138 | for (i=0; i<cgit_repolist.count; i++) { |
139 | repo = &cgit_repolist.repos[i]; | 139 | repo = &cgit_repolist.repos[i]; |
140 | if (!strcmp(repo->url, url)) | 140 | if (!strcmp(repo->url, url)) |
141 | return repo; | 141 | return repo; |
142 | } | 142 | } |
143 | return NULL; | 143 | return NULL; |
144 | } | 144 | } |
145 | 145 | ||