author | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:42:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:42:12 (UTC) |
commit | c2766deb67acb1eae2b36dc0f5811a9cabb6db20 (patch) (unidiff) | |
tree | 463ea4a4388f2c449dec9eb49b33f9c0942030d1 /cgit.c | |
parent | caf0825d97582d137387b8879867247e92cca022 (diff) | |
parent | 80476b0d2873eb212fad38487fd6189bd6629cbe (diff) | |
download | cgit-c2766deb67acb1eae2b36dc0f5811a9cabb6db20.zip cgit-c2766deb67acb1eae2b36dc0f5811a9cabb6db20.tar.gz cgit-c2766deb67acb1eae2b36dc0f5811a9cabb6db20.tar.bz2 |
Merge branch 'ag/atom-fixes'
-rw-r--r-- | cgit.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -166,12 +166,14 @@ void config_cb(const char *name, const char *value) | |||
166 | else if (!strcmp(name, "about-filter")) | 166 | else if (!strcmp(name, "about-filter")) |
167 | ctx.cfg.about_filter = new_filter(value, 0); | 167 | ctx.cfg.about_filter = new_filter(value, 0); |
168 | else if (!strcmp(name, "commit-filter")) | 168 | else if (!strcmp(name, "commit-filter")) |
169 | ctx.cfg.commit_filter = new_filter(value, 0); | 169 | ctx.cfg.commit_filter = new_filter(value, 0); |
170 | else if (!strcmp(name, "embedded")) | 170 | else if (!strcmp(name, "embedded")) |
171 | ctx.cfg.embedded = atoi(value); | 171 | ctx.cfg.embedded = atoi(value); |
172 | else if (!strcmp(name, "max-atom-items")) | ||
173 | ctx.cfg.max_atom_items = atoi(value); | ||
172 | else if (!strcmp(name, "max-message-length")) | 174 | else if (!strcmp(name, "max-message-length")) |
173 | ctx.cfg.max_msg_len = atoi(value); | 175 | ctx.cfg.max_msg_len = atoi(value); |
174 | else if (!strcmp(name, "max-repodesc-length")) | 176 | else if (!strcmp(name, "max-repodesc-length")) |
175 | ctx.cfg.max_repodesc_len = atoi(value); | 177 | ctx.cfg.max_repodesc_len = atoi(value); |
176 | else if (!strcmp(name, "max-blob-size")) | 178 | else if (!strcmp(name, "max-blob-size")) |
177 | ctx.cfg.max_blob_size = atoi(value); | 179 | ctx.cfg.max_blob_size = atoi(value); |
@@ -251,12 +253,14 @@ static void querystring_cb(const char *name, const char *value) | |||
251 | } else if (!strcmp(name, "showmsg")) { | 253 | } else if (!strcmp(name, "showmsg")) { |
252 | ctx.qry.showmsg = atoi(value); | 254 | ctx.qry.showmsg = atoi(value); |
253 | } else if (!strcmp(name, "period")) { | 255 | } else if (!strcmp(name, "period")) { |
254 | ctx.qry.period = xstrdup(value); | 256 | ctx.qry.period = xstrdup(value); |
255 | } else if (!strcmp(name, "ss")) { | 257 | } else if (!strcmp(name, "ss")) { |
256 | ctx.qry.ssdiff = atoi(value); | 258 | ctx.qry.ssdiff = atoi(value); |
259 | } else if (!strcmp(name, "all")) { | ||
260 | ctx.qry.show_all = atoi(value); | ||
257 | } | 261 | } |
258 | } | 262 | } |
259 | 263 | ||
260 | char *xstrdupn(const char *str) | 264 | char *xstrdupn(const char *str) |
261 | { | 265 | { |
262 | return (str ? xstrdup(str) : NULL); | 266 | return (str ? xstrdup(str) : NULL); |
@@ -293,12 +297,13 @@ static void prepare_context(struct cgit_context *ctx) | |||
293 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 297 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
294 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 298 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
295 | ctx->cfg.section = ""; | 299 | ctx->cfg.section = ""; |
296 | ctx->cfg.summary_branches = 10; | 300 | ctx->cfg.summary_branches = 10; |
297 | ctx->cfg.summary_log = 10; | 301 | ctx->cfg.summary_log = 10; |
298 | ctx->cfg.summary_tags = 10; | 302 | ctx->cfg.summary_tags = 10; |
303 | ctx->cfg.max_atom_items = 10; | ||
299 | ctx->cfg.ssdiff = 0; | 304 | ctx->cfg.ssdiff = 0; |
300 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); | 305 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
301 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); | 306 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
302 | ctx->env.https = xstrdupn(getenv("HTTPS")); | 307 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
303 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); | 308 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
304 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); | 309 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |