summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h1
-rw-r--r--cgitrc4
-rw-r--r--shared.c3
-rw-r--r--ui-repolist.c2
4 files changed, 9 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index 764225d..290401f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -84,16 +84,17 @@ extern int cgit_snapshots;
84extern int cgit_max_lock_attempts; 84extern int cgit_max_lock_attempts;
85extern int cgit_cache_root_ttl; 85extern int cgit_cache_root_ttl;
86extern int cgit_cache_repo_ttl; 86extern int cgit_cache_repo_ttl;
87extern int cgit_cache_dynamic_ttl; 87extern int cgit_cache_dynamic_ttl;
88extern int cgit_cache_static_ttl; 88extern int cgit_cache_static_ttl;
89extern int cgit_cache_max_create_time; 89extern int cgit_cache_max_create_time;
90 90
91extern int cgit_max_msg_len; 91extern int cgit_max_msg_len;
92extern int cgit_max_repodesc_len;
92extern int cgit_max_commit_count; 93extern int cgit_max_commit_count;
93 94
94extern char *cgit_repo_name; 95extern char *cgit_repo_name;
95extern char *cgit_repo_desc; 96extern char *cgit_repo_desc;
96extern char *cgit_repo_owner; 97extern char *cgit_repo_owner;
97 98
98extern int cgit_query_has_symref; 99extern int cgit_query_has_symref;
99extern int cgit_query_has_sha1; 100extern int cgit_query_has_sha1;
diff --git a/cgitrc b/cgitrc
index e7e731c..f923cc4 100644
--- a/cgitrc
+++ b/cgitrc
@@ -46,16 +46,20 @@
46## Url loaded when clicking the logo 46## Url loaded when clicking the logo
47#logo-link=http://www.kernel.org/pub/software/scm/git/docs/ 47#logo-link=http://www.kernel.org/pub/software/scm/git/docs/
48 48
49 49
50## Url loaded when clicking a submodule link 50## Url loaded when clicking a submodule link
51#module-link=./?repo=%s&page=commit&id=%s 51#module-link=./?repo=%s&page=commit&id=%s
52 52
53 53
54## Number of chars shown of repo description (in repolist view)
55#max-repodesc-length=60
56
57
54## Number of chars shown of commit subject message (in log view) 58## Number of chars shown of commit subject message (in log view)
55#max-message-length=60 59#max-message-length=60
56 60
57 61
58## Number of commits per page in log view 62## Number of commits per page in log view
59#max-commit-count=50 63#max-commit-count=50
60 64
61 65
diff --git a/shared.c b/shared.c
index a1e1acd..752ceac 100644
--- a/shared.c
+++ b/shared.c
@@ -25,16 +25,17 @@ int cgit_snapshots = 0;
25int cgit_max_lock_attempts = 5; 25int cgit_max_lock_attempts = 5;
26int cgit_cache_root_ttl = 5; 26int cgit_cache_root_ttl = 5;
27int cgit_cache_repo_ttl = 5; 27int cgit_cache_repo_ttl = 5;
28int cgit_cache_dynamic_ttl = 5; 28int cgit_cache_dynamic_ttl = 5;
29int cgit_cache_static_ttl = -1; 29int cgit_cache_static_ttl = -1;
30int cgit_cache_max_create_time = 5; 30int cgit_cache_max_create_time = 5;
31 31
32int cgit_max_msg_len = 60; 32int cgit_max_msg_len = 60;
33int cgit_max_repodesc_len = 60;
33int cgit_max_commit_count = 50; 34int cgit_max_commit_count = 50;
34 35
35int cgit_query_has_symref = 0; 36int cgit_query_has_symref = 0;
36int cgit_query_has_sha1 = 0; 37int cgit_query_has_sha1 = 0;
37 38
38char *cgit_querystring = NULL; 39char *cgit_querystring = NULL;
39char *cgit_query_repo = NULL; 40char *cgit_query_repo = NULL;
40char *cgit_query_page = NULL; 41char *cgit_query_page = NULL;
@@ -113,16 +114,18 @@ void cgit_global_config_cb(const char *name, const char *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);
diff --git a/ui-repolist.c b/ui-repolist.c
index d341193..d7311e4 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -25,17 +25,17 @@ void cgit_print_repolist(struct cacheitem *item)
25 25
26 for (i=0; i<cgit_repolist.count; i++) { 26 for (i=0; i<cgit_repolist.count; i++) {
27 repo = &cgit_repolist.repos[i]; 27 repo = &cgit_repolist.repos[i];
28 html("<tr><td>"); 28 html("<tr><td>");
29 html_link_open(cgit_repourl(repo->url), NULL, NULL); 29 html_link_open(cgit_repourl(repo->url), NULL, NULL);
30 html_txt(repo->name); 30 html_txt(repo->name);
31 html_link_close(); 31 html_link_close();
32 html("</td><td>"); 32 html("</td><td>");
33 html_txt(repo->desc); 33 html_ntxt(cgit_max_repodesc_len, repo->desc);
34 html("</td><td>"); 34 html("</td><td>");
35 html_txt(repo->owner); 35 html_txt(repo->owner);
36 html("</td><td>"); 36 html("</td><td>");
37 html_link_open(cgit_pageurl(repo->name, "commit", NULL), 37 html_link_open(cgit_pageurl(repo->name, "commit", NULL),
38 "Commit: display last commit", NULL); 38 "Commit: display last commit", NULL);
39 html("C</a> "); 39 html("C</a> ");
40 html_link_open(cgit_pageurl(repo->name, "diff", NULL), 40 html_link_open(cgit_pageurl(repo->name, "diff", NULL),
41 "Diff: see changes introduced by last commit", NULL); 41 "Diff: see changes introduced by last commit", NULL);