author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:29:22 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:29:22 (UTC) |
commit | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch) (unidiff) | |
tree | ec4a3bff9e0a47f1def3cebd2cd2212406df258a /cgit.c | |
parent | 542f6a433034935a1aa895f7ef3273968915a5d1 (diff) | |
parent | 7a8b3b4104aa5924163efd5f2af0de10b7fb5171 (diff) | |
download | cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.zip cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.gz cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.bz2 |
Merge branch 'lh/embedded'
Conflicts:
cgitrc.5.txt
ui-shared.c
-rw-r--r-- | cgit.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -42,46 +42,50 @@ void config_cb(const char *name, const char *value) | |||
42 | else if (!strcmp(name, "index-info")) | 42 | else if (!strcmp(name, "index-info")) |
43 | ctx.cfg.index_info = xstrdup(value); | 43 | ctx.cfg.index_info = xstrdup(value); |
44 | else if (!strcmp(name, "logo-link")) | 44 | else if (!strcmp(name, "logo-link")) |
45 | ctx.cfg.logo_link = xstrdup(value); | 45 | ctx.cfg.logo_link = xstrdup(value); |
46 | else if (!strcmp(name, "module-link")) | 46 | else if (!strcmp(name, "module-link")) |
47 | ctx.cfg.module_link = xstrdup(value); | 47 | ctx.cfg.module_link = xstrdup(value); |
48 | else if (!strcmp(name, "virtual-root")) { | 48 | else if (!strcmp(name, "virtual-root")) { |
49 | ctx.cfg.virtual_root = trim_end(value, '/'); | 49 | ctx.cfg.virtual_root = trim_end(value, '/'); |
50 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 50 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
51 | ctx.cfg.virtual_root = ""; | 51 | ctx.cfg.virtual_root = ""; |
52 | } else if (!strcmp(name, "nocache")) | 52 | } else if (!strcmp(name, "nocache")) |
53 | ctx.cfg.nocache = atoi(value); | 53 | ctx.cfg.nocache = atoi(value); |
54 | else if (!strcmp(name, "noheader")) | ||
55 | ctx.cfg.noheader = atoi(value); | ||
54 | else if (!strcmp(name, "snapshots")) | 56 | else if (!strcmp(name, "snapshots")) |
55 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 57 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
56 | else if (!strcmp(name, "enable-index-links")) | 58 | else if (!strcmp(name, "enable-index-links")) |
57 | ctx.cfg.enable_index_links = atoi(value); | 59 | ctx.cfg.enable_index_links = atoi(value); |
58 | else if (!strcmp(name, "enable-log-filecount")) | 60 | else if (!strcmp(name, "enable-log-filecount")) |
59 | ctx.cfg.enable_log_filecount = atoi(value); | 61 | ctx.cfg.enable_log_filecount = atoi(value); |
60 | else if (!strcmp(name, "enable-log-linecount")) | 62 | else if (!strcmp(name, "enable-log-linecount")) |
61 | ctx.cfg.enable_log_linecount = atoi(value); | 63 | ctx.cfg.enable_log_linecount = atoi(value); |
62 | else if (!strcmp(name, "max-stats")) | 64 | else if (!strcmp(name, "max-stats")) |
63 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 65 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
64 | else if (!strcmp(name, "cache-size")) | 66 | else if (!strcmp(name, "cache-size")) |
65 | ctx.cfg.cache_size = atoi(value); | 67 | ctx.cfg.cache_size = atoi(value); |
66 | else if (!strcmp(name, "cache-root")) | 68 | else if (!strcmp(name, "cache-root")) |
67 | ctx.cfg.cache_root = xstrdup(value); | 69 | ctx.cfg.cache_root = xstrdup(value); |
68 | else if (!strcmp(name, "cache-root-ttl")) | 70 | else if (!strcmp(name, "cache-root-ttl")) |
69 | ctx.cfg.cache_root_ttl = atoi(value); | 71 | ctx.cfg.cache_root_ttl = atoi(value); |
70 | else if (!strcmp(name, "cache-repo-ttl")) | 72 | else if (!strcmp(name, "cache-repo-ttl")) |
71 | ctx.cfg.cache_repo_ttl = atoi(value); | 73 | ctx.cfg.cache_repo_ttl = atoi(value); |
72 | else if (!strcmp(name, "cache-static-ttl")) | 74 | else if (!strcmp(name, "cache-static-ttl")) |
73 | ctx.cfg.cache_static_ttl = atoi(value); | 75 | ctx.cfg.cache_static_ttl = atoi(value); |
74 | else if (!strcmp(name, "cache-dynamic-ttl")) | 76 | else if (!strcmp(name, "cache-dynamic-ttl")) |
75 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 77 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
78 | else if (!strcmp(name, "embedded")) | ||
79 | ctx.cfg.embedded = atoi(value); | ||
76 | else if (!strcmp(name, "max-message-length")) | 80 | else if (!strcmp(name, "max-message-length")) |
77 | ctx.cfg.max_msg_len = atoi(value); | 81 | ctx.cfg.max_msg_len = atoi(value); |
78 | else if (!strcmp(name, "max-repodesc-length")) | 82 | else if (!strcmp(name, "max-repodesc-length")) |
79 | ctx.cfg.max_repodesc_len = atoi(value); | 83 | ctx.cfg.max_repodesc_len = atoi(value); |
80 | else if (!strcmp(name, "max-repo-count")) | 84 | else if (!strcmp(name, "max-repo-count")) |
81 | ctx.cfg.max_repo_count = atoi(value); | 85 | ctx.cfg.max_repo_count = atoi(value); |
82 | else if (!strcmp(name, "max-commit-count")) | 86 | else if (!strcmp(name, "max-commit-count")) |
83 | ctx.cfg.max_commit_count = atoi(value); | 87 | ctx.cfg.max_commit_count = atoi(value); |
84 | else if (!strcmp(name, "summary-log")) | 88 | else if (!strcmp(name, "summary-log")) |
85 | ctx.cfg.summary_log = atoi(value); | 89 | ctx.cfg.summary_log = atoi(value); |
86 | else if (!strcmp(name, "summary-branches")) | 90 | else if (!strcmp(name, "summary-branches")) |
87 | ctx.cfg.summary_branches = atoi(value); | 91 | ctx.cfg.summary_branches = atoi(value); |