author | Lars Hjemli <hjemli@gmail.com> | 2007-05-16 08:45:45 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-16 08:46:59 (UTC) |
commit | c1ad6cb77889880ad0189a689840fbfa6e5cbc80 (patch) (unidiff) | |
tree | 352c32898316a388b582385a5fb3c6c534eaa30a /shared.c | |
parent | f4f1339fe62fb1a28c147567195a86dd99485e25 (diff) | |
download | cgit-c1ad6cb77889880ad0189a689840fbfa6e5cbc80.zip cgit-c1ad6cb77889880ad0189a689840fbfa6e5cbc80.tar.gz cgit-c1ad6cb77889880ad0189a689840fbfa6e5cbc80.tar.bz2 |
Restrict length of repo description on repolist page
If any repo has a very long description, all repos suffer since the
repo-links in the right-most column gets pushed out of sight.
Fix it by introducing max-repodesc-length parameter in cgitrc, and default
to 60 chars.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,168 +1,171 @@ | |||
1 | /* shared.c: global vars + some callback functions | 1 | /* shared.c: global vars + some callback functions |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | struct repolist cgit_repolist; | 11 | struct repolist cgit_repolist; |
12 | struct repoinfo *cgit_repo; | 12 | struct repoinfo *cgit_repo; |
13 | 13 | ||
14 | char *cgit_root_title = "Git repository browser"; | 14 | char *cgit_root_title = "Git repository browser"; |
15 | char *cgit_css = "/cgit.css"; | 15 | char *cgit_css = "/cgit.css"; |
16 | char *cgit_logo = "/git-logo.png"; | 16 | char *cgit_logo = "/git-logo.png"; |
17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
19 | char *cgit_virtual_root = NULL; | 19 | char *cgit_virtual_root = NULL; |
20 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 20 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
21 | char *cgit_cache_root = "/var/cache/cgit"; | 21 | char *cgit_cache_root = "/var/cache/cgit"; |
22 | 22 | ||
23 | int cgit_nocache = 0; | 23 | int cgit_nocache = 0; |
24 | int cgit_snapshots = 0; | 24 | int cgit_snapshots = 0; |
25 | int cgit_max_lock_attempts = 5; | 25 | int cgit_max_lock_attempts = 5; |
26 | int cgit_cache_root_ttl = 5; | 26 | int cgit_cache_root_ttl = 5; |
27 | int cgit_cache_repo_ttl = 5; | 27 | int cgit_cache_repo_ttl = 5; |
28 | int cgit_cache_dynamic_ttl = 5; | 28 | int cgit_cache_dynamic_ttl = 5; |
29 | int cgit_cache_static_ttl = -1; | 29 | int cgit_cache_static_ttl = -1; |
30 | int cgit_cache_max_create_time = 5; | 30 | int cgit_cache_max_create_time = 5; |
31 | 31 | ||
32 | int cgit_max_msg_len = 60; | 32 | int cgit_max_msg_len = 60; |
33 | int cgit_max_repodesc_len = 60; | ||
33 | int cgit_max_commit_count = 50; | 34 | int cgit_max_commit_count = 50; |
34 | 35 | ||
35 | int cgit_query_has_symref = 0; | 36 | int cgit_query_has_symref = 0; |
36 | int cgit_query_has_sha1 = 0; | 37 | int cgit_query_has_sha1 = 0; |
37 | 38 | ||
38 | char *cgit_querystring = NULL; | 39 | char *cgit_querystring = NULL; |
39 | char *cgit_query_repo = NULL; | 40 | char *cgit_query_repo = NULL; |
40 | char *cgit_query_page = NULL; | 41 | char *cgit_query_page = NULL; |
41 | char *cgit_query_head = NULL; | 42 | char *cgit_query_head = NULL; |
42 | char *cgit_query_search = NULL; | 43 | char *cgit_query_search = NULL; |
43 | char *cgit_query_sha1 = NULL; | 44 | char *cgit_query_sha1 = NULL; |
44 | char *cgit_query_sha2 = NULL; | 45 | char *cgit_query_sha2 = NULL; |
45 | char *cgit_query_path = NULL; | 46 | char *cgit_query_path = NULL; |
46 | char *cgit_query_name = NULL; | 47 | char *cgit_query_name = NULL; |
47 | int cgit_query_ofs = 0; | 48 | int cgit_query_ofs = 0; |
48 | 49 | ||
49 | int htmlfd = 0; | 50 | int htmlfd = 0; |
50 | 51 | ||
51 | int chk_zero(int result, char *msg) | 52 | int chk_zero(int result, char *msg) |
52 | { | 53 | { |
53 | if (result != 0) | 54 | if (result != 0) |
54 | die("%s: %s", msg, strerror(errno)); | 55 | die("%s: %s", msg, strerror(errno)); |
55 | return result; | 56 | return result; |
56 | } | 57 | } |
57 | 58 | ||
58 | int chk_positive(int result, char *msg) | 59 | int chk_positive(int result, char *msg) |
59 | { | 60 | { |
60 | if (result <= 0) | 61 | if (result <= 0) |
61 | die("%s: %s", msg, strerror(errno)); | 62 | die("%s: %s", msg, strerror(errno)); |
62 | return result; | 63 | return result; |
63 | } | 64 | } |
64 | 65 | ||
65 | struct repoinfo *add_repo(const char *url) | 66 | struct repoinfo *add_repo(const char *url) |
66 | { | 67 | { |
67 | struct repoinfo *ret; | 68 | struct repoinfo *ret; |
68 | 69 | ||
69 | if (++cgit_repolist.count > cgit_repolist.length) { | 70 | if (++cgit_repolist.count > cgit_repolist.length) { |
70 | if (cgit_repolist.length == 0) | 71 | if (cgit_repolist.length == 0) |
71 | cgit_repolist.length = 8; | 72 | cgit_repolist.length = 8; |
72 | else | 73 | else |
73 | cgit_repolist.length *= 2; | 74 | cgit_repolist.length *= 2; |
74 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 75 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
75 | cgit_repolist.length * | 76 | cgit_repolist.length * |
76 | sizeof(struct repoinfo)); | 77 | sizeof(struct repoinfo)); |
77 | } | 78 | } |
78 | 79 | ||
79 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 80 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
80 | ret->url = xstrdup(url); | 81 | ret->url = xstrdup(url); |
81 | ret->name = ret->url; | 82 | ret->name = ret->url; |
82 | ret->path = NULL; | 83 | ret->path = NULL; |
83 | ret->desc = NULL; | 84 | ret->desc = NULL; |
84 | ret->owner = NULL; | 85 | ret->owner = NULL; |
85 | ret->defbranch = "master"; | 86 | ret->defbranch = "master"; |
86 | ret->snapshots = cgit_snapshots; | 87 | ret->snapshots = cgit_snapshots; |
87 | ret->module_link = cgit_module_link; | 88 | ret->module_link = cgit_module_link; |
88 | return ret; | 89 | return ret; |
89 | } | 90 | } |
90 | 91 | ||
91 | void cgit_global_config_cb(const char *name, const char *value) | 92 | void cgit_global_config_cb(const char *name, const char *value) |
92 | { | 93 | { |
93 | if (!strcmp(name, "root-title")) | 94 | if (!strcmp(name, "root-title")) |
94 | cgit_root_title = xstrdup(value); | 95 | cgit_root_title = xstrdup(value); |
95 | else if (!strcmp(name, "css")) | 96 | else if (!strcmp(name, "css")) |
96 | cgit_css = xstrdup(value); | 97 | cgit_css = xstrdup(value); |
97 | else if (!strcmp(name, "logo")) | 98 | else if (!strcmp(name, "logo")) |
98 | cgit_logo = xstrdup(value); | 99 | cgit_logo = xstrdup(value); |
99 | else if (!strcmp(name, "logo-link")) | 100 | else if (!strcmp(name, "logo-link")) |
100 | cgit_logo_link = xstrdup(value); | 101 | cgit_logo_link = xstrdup(value); |
101 | else if (!strcmp(name, "module-link")) | 102 | else if (!strcmp(name, "module-link")) |
102 | cgit_module_link = xstrdup(value); | 103 | cgit_module_link = xstrdup(value); |
103 | else if (!strcmp(name, "virtual-root")) | 104 | else if (!strcmp(name, "virtual-root")) |
104 | cgit_virtual_root = xstrdup(value); | 105 | cgit_virtual_root = xstrdup(value); |
105 | else if (!strcmp(name, "nocache")) | 106 | else if (!strcmp(name, "nocache")) |
106 | cgit_nocache = atoi(value); | 107 | cgit_nocache = atoi(value); |
107 | else if (!strcmp(name, "snapshots")) | 108 | else if (!strcmp(name, "snapshots")) |
108 | cgit_snapshots = atoi(value); | 109 | cgit_snapshots = atoi(value); |
109 | else if (!strcmp(name, "cache-root")) | 110 | else if (!strcmp(name, "cache-root")) |
110 | cgit_cache_root = xstrdup(value); | 111 | cgit_cache_root = xstrdup(value); |
111 | else if (!strcmp(name, "cache-root-ttl")) | 112 | else if (!strcmp(name, "cache-root-ttl")) |
112 | cgit_cache_root_ttl = atoi(value); | 113 | cgit_cache_root_ttl = atoi(value); |
113 | else if (!strcmp(name, "cache-repo-ttl")) | 114 | else if (!strcmp(name, "cache-repo-ttl")) |
114 | cgit_cache_repo_ttl = atoi(value); | 115 | cgit_cache_repo_ttl = atoi(value); |
115 | else if (!strcmp(name, "cache-static-ttl")) | 116 | else if (!strcmp(name, "cache-static-ttl")) |
116 | cgit_cache_static_ttl = atoi(value); | 117 | cgit_cache_static_ttl = atoi(value); |
117 | else if (!strcmp(name, "cache-dynamic-ttl")) | 118 | else if (!strcmp(name, "cache-dynamic-ttl")) |
118 | cgit_cache_dynamic_ttl = atoi(value); | 119 | cgit_cache_dynamic_ttl = atoi(value); |
119 | else if (!strcmp(name, "max-message-length")) | 120 | else if (!strcmp(name, "max-message-length")) |
120 | cgit_max_msg_len = atoi(value); | 121 | cgit_max_msg_len = atoi(value); |
122 | else if (!strcmp(name, "max-repodesc-length")) | ||
123 | cgit_max_repodesc_len = atoi(value); | ||
121 | else if (!strcmp(name, "max-commit-count")) | 124 | else if (!strcmp(name, "max-commit-count")) |
122 | cgit_max_commit_count = atoi(value); | 125 | cgit_max_commit_count = atoi(value); |
123 | else if (!strcmp(name, "repo.url")) | 126 | else if (!strcmp(name, "repo.url")) |
124 | cgit_repo = add_repo(value); | 127 | cgit_repo = add_repo(value); |
125 | else if (!strcmp(name, "repo.name")) | 128 | else if (!strcmp(name, "repo.name")) |
126 | cgit_repo->name = xstrdup(value); | 129 | cgit_repo->name = xstrdup(value); |
127 | else if (cgit_repo && !strcmp(name, "repo.path")) | 130 | else if (cgit_repo && !strcmp(name, "repo.path")) |
128 | cgit_repo->path = xstrdup(value); | 131 | cgit_repo->path = xstrdup(value); |
129 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 132 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
130 | cgit_repo->desc = xstrdup(value); | 133 | cgit_repo->desc = xstrdup(value); |
131 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 134 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
132 | cgit_repo->owner = xstrdup(value); | 135 | cgit_repo->owner = xstrdup(value); |
133 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 136 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
134 | cgit_repo->defbranch = xstrdup(value); | 137 | cgit_repo->defbranch = xstrdup(value); |
135 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 138 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
136 | cgit_repo->snapshots = atoi(value); | 139 | cgit_repo->snapshots = atoi(value); |
137 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 140 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
138 | cgit_repo->module_link= xstrdup(value); | 141 | cgit_repo->module_link= xstrdup(value); |
139 | else if (!strcmp(name, "include")) | 142 | else if (!strcmp(name, "include")) |
140 | cgit_read_config(value, cgit_global_config_cb); | 143 | cgit_read_config(value, cgit_global_config_cb); |
141 | } | 144 | } |
142 | 145 | ||
143 | void cgit_querystring_cb(const char *name, const char *value) | 146 | void cgit_querystring_cb(const char *name, const char *value) |
144 | { | 147 | { |
145 | if (!strcmp(name,"r")) { | 148 | if (!strcmp(name,"r")) { |
146 | cgit_query_repo = xstrdup(value); | 149 | cgit_query_repo = xstrdup(value); |
147 | } else if (!strcmp(name, "p")) { | 150 | } else if (!strcmp(name, "p")) { |
148 | cgit_query_page = xstrdup(value); | 151 | cgit_query_page = xstrdup(value); |
149 | } else if (!strcmp(name, "q")) { | 152 | } else if (!strcmp(name, "q")) { |
150 | cgit_query_search = xstrdup(value); | 153 | cgit_query_search = xstrdup(value); |
151 | } else if (!strcmp(name, "h")) { | 154 | } else if (!strcmp(name, "h")) { |
152 | cgit_query_head = xstrdup(value); | 155 | cgit_query_head = xstrdup(value); |
153 | cgit_query_has_symref = 1; | 156 | cgit_query_has_symref = 1; |
154 | } else if (!strcmp(name, "id")) { | 157 | } else if (!strcmp(name, "id")) { |
155 | cgit_query_sha1 = xstrdup(value); | 158 | cgit_query_sha1 = xstrdup(value); |
156 | cgit_query_has_sha1 = 1; | 159 | cgit_query_has_sha1 = 1; |
157 | } else if (!strcmp(name, "id2")) { | 160 | } else if (!strcmp(name, "id2")) { |
158 | cgit_query_sha2 = xstrdup(value); | 161 | cgit_query_sha2 = xstrdup(value); |
159 | cgit_query_has_sha1 = 1; | 162 | cgit_query_has_sha1 = 1; |
160 | } else if (!strcmp(name, "ofs")) { | 163 | } else if (!strcmp(name, "ofs")) { |
161 | cgit_query_ofs = atoi(value); | 164 | cgit_query_ofs = atoi(value); |
162 | } else if (!strcmp(name, "path")) { | 165 | } else if (!strcmp(name, "path")) { |
163 | cgit_query_path = xstrdup(value); | 166 | cgit_query_path = xstrdup(value); |
164 | } else if (!strcmp(name, "name")) { | 167 | } else if (!strcmp(name, "name")) { |
165 | cgit_query_name = xstrdup(value); | 168 | cgit_query_name = xstrdup(value); |
166 | } | 169 | } |
167 | } | 170 | } |
168 | 171 | ||