aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2009-03-15 17:06:20 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2009-03-15 17:06:20 (JST)
commit780d2d98598e621d12c7b23d4c68b5ddc7019838 (patch)
treeab520cb674fd07ab265693ba6f89126e7c0f823f
parent942a4c200168e110ec009c3260dc5f5f050de325 (diff)
parent6fddad7251021b307c8a3f70fdd2aa04c3f74eaa (diff)
downloadcgit-780d2d98598e621d12c7b23d4c68b5ddc7019838.zip
cgit-780d2d98598e621d12c7b23d4c68b5ddc7019838.tar.gz
Merge branch 'stable'
-rw-r--r--ui-snapshot.c23
-rw-r--r--ui-tree.c13
2 files changed, 25 insertions, 11 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index f25613e..5372f5d 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -156,20 +156,31 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
156 return NULL; 156 return NULL;
157} 157}
158 158
159void show_error(char *msg)
160{
161 ctx.page.mimetype = "text/html";
162 cgit_print_http_headers(&ctx);
163 cgit_print_docstart(&ctx);
164 cgit_print_pageheader(&ctx);
165 cgit_print_error(msg);
166 cgit_print_docend();
167}
168
159void cgit_print_snapshot(const char *head, const char *hex, 169void cgit_print_snapshot(const char *head, const char *hex,
160 const char *filename, int snapshots, int dwim) 170 const char *filename, int snapshots, int dwim)
161{ 171{
162 const struct cgit_snapshot_format* f; 172 const struct cgit_snapshot_format* f;
163 char *prefix = NULL; 173 char *prefix = NULL;
164 174
175 if (!filename) {
176 show_error("No snapshot name specified");
177 return;
178 }
179
165 f = get_format(filename); 180 f = get_format(filename);
166 if (!f) { 181 if (!f) {
167 ctx.page.mimetype = "text/html"; 182 show_error(xstrdup(fmt("Unsupported snapshot format: %s",
168 cgit_print_http_headers(&ctx); 183 filename)));
169 cgit_print_docstart(&ctx);
170 cgit_print_pageheader(&ctx);
171 cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
172 cgit_print_docend();
173 return; 184 return;
174 } 185 }
175 186
diff --git a/ui-tree.c b/ui-tree.c
index c6159ec..553dbaa 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -25,11 +25,14 @@ static void print_text_buffer(char *buf, unsigned long size)
25 html("<tr><td class='linenumbers'><pre>"); 25 html("<tr><td class='linenumbers'><pre>");
26 idx = 0; 26 idx = 0;
27 lineno = 0; 27 lineno = 0;
28 htmlf(numberfmt, ++lineno); 28
29 while(idx < size - 1) { // skip absolute last newline 29 if (size) {
30 if (buf[idx] == '\n') 30 htmlf(numberfmt, ++lineno);
31 htmlf(numberfmt, ++lineno); 31 while(idx < size - 1) { // skip absolute last newline
32 idx++; 32 if (buf[idx] == '\n')
33 htmlf(numberfmt, ++lineno);
34 idx++;
35 }
33 } 36 }
34 html("</pre></td>\n"); 37 html("</pre></td>\n");
35 html("<td class='lines'><pre><code>"); 38 html("<td class='lines'><pre><code>");