1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
diff --git a/cmd.c b/cmd.c
index 0eb75b1..be316f4 100644
--- a/cmd.c
+++ b/cmd.c
@@ -49,7 +49,7 @@ static void about_fn(void)
cgit_redirect(redirect, true);
free(currenturl);
free(redirect);
- } else if (ctx.repo->readme.nr)
+ } else if (0)
cgit_print_repo_readme(ctx.qry.path);
else if (ctx.repo->homepage)
cgit_redirect(ctx.repo->homepage, false);
diff --git a/ui-shared.c b/ui-shared.c
index 6fae72d..c5b609a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1082,7 +1082,7 @@ void cgit_print_pageheader(void)
html("<table class='tabs'><tr><td>\n");
if (ctx.env.authenticated && ctx.repo) {
- if (ctx.repo->readme.nr)
+ if (0)
reporevlink("about", "about", NULL,
hc("about"), ctx.qry.head, NULL,
NULL);
diff --git a/ui-summary.c b/ui-summary.c
index 947812a..23c07aa 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -40,31 +40,6 @@ static void print_url(const char *url)
html("</a></td></tr>\n");
}
-void cgit_print_summary(void)
-{
- int columns = 3;
-
- if (ctx.repo->enable_log_filecount)
- columns++;
- if (ctx.repo->enable_log_linecount)
- columns++;
-
- cgit_print_layout_start();
- html("<table summary='repository info' class='list nowrap'>");
- cgit_print_branches(ctx.cfg.summary_branches);
- htmlf("<tr class='nohover'><td colspan='%d'> </td></tr>", columns);
- cgit_print_tags(ctx.cfg.summary_tags);
- if (ctx.cfg.summary_log > 0) {
- htmlf("<tr class='nohover'><td colspan='%d'> </td></tr>", columns);
- cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
- NULL, NULL, 0, 0, 0);
- }
- urls = 0;
- cgit_add_clone_urls(print_url);
- html("</table>");
- cgit_print_layout_end();
-}
-
/* The caller must free the return value. */
static char* append_readme_path(const char *filename, const char *ref, const char *path)
{
@@ -99,25 +74,11 @@ static char* append_readme_path(const char *filename, const char *ref, const cha
return full_path;
}
-void cgit_print_repo_readme(const char *path)
+static void print_readme_file(const char *path)
{
- char *filename, *ref, *mimetype;
+ char *filename, *ref;
int free_filename = 0;
- mimetype = get_mimetype_for_filename(path);
- if (mimetype && (!strncmp(mimetype, "image/", 6) || !strncmp(mimetype, "video/", 6))) {
- ctx.page.mimetype = mimetype;
- ctx.page.charset = NULL;
- cgit_print_plain();
- free(mimetype);
- return;
- }
- free(mimetype);
-
- cgit_print_layout_start();
- if (ctx.repo->readme.nr == 0)
- goto done;
-
filename = ctx.repo->readme.items[0].string;
ref = ctx.repo->readme.items[0].util;
@@ -125,7 +86,7 @@ void cgit_print_repo_readme(const char *path)
free_filename = 1;
filename = append_readme_path(filename, ref, path);
if (!filename)
- goto done;
+ return;
}
/* Print the calculated readme, either from the git repo or from the
@@ -142,6 +103,54 @@ void cgit_print_repo_readme(const char *path)
html("</div>");
if (free_filename)
free(filename);
+}
+
+void cgit_print_summary(void)
+{
+ int columns = 3;
+
+ if (ctx.repo->enable_log_filecount)
+ columns++;
+ if (ctx.repo->enable_log_linecount)
+ columns++;
+
+ cgit_print_layout_start();
+ html("<table summary='repository info' class='list nowrap'>");
+ cgit_print_branches(ctx.cfg.summary_branches);
+ htmlf("<tr class='nohover'><td colspan='%d'> </td></tr>", columns);
+ cgit_print_tags(ctx.cfg.summary_tags);
+ if (ctx.cfg.summary_log > 0) {
+ htmlf("<tr class='nohover'><td colspan='%d'> </td></tr>", columns);
+ cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
+ NULL, NULL, 0, 0, 0);
+ }
+ urls = 0;
+ cgit_add_clone_urls(print_url);
+ html("</table>");
+ if (ctx.repo->readme.nr)
+ print_readme_file(ctx.qry.path);
+ cgit_print_layout_end();
+}
+
+void cgit_print_repo_readme(const char *path)
+{
+ char *mimetype;
+
+ mimetype = get_mimetype_for_filename(path);
+ if (mimetype && (!strncmp(mimetype, "image/", 6) || !strncmp(mimetype, "video/", 6))) {
+ ctx.page.mimetype = mimetype;
+ ctx.page.charset = NULL;
+ cgit_print_plain();
+ free(mimetype);
+ return;
+ }
+ free(mimetype);
+
+ cgit_print_layout_start();
+ if (ctx.repo->readme.nr == 0)
+ goto done;
+
+ print_readme_file(path);
done:
cgit_print_layout_end();
|