summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c1
-rw-r--r--cgit.h15
-rw-r--r--html.c31
-rw-r--r--html.h18
-rw-r--r--shared.c2
-rw-r--r--ui-blob.c9
-rw-r--r--ui-commit.c7
-rw-r--r--ui-diff.c2
-rw-r--r--ui-log.c1
-rw-r--r--ui-patch.c1
-rw-r--r--ui-refs.c4
-rw-r--r--ui-repolist.c3
-rw-r--r--ui-shared.c16
-rw-r--r--ui-snapshot.c1
-rw-r--r--ui-summary.c1
-rw-r--r--ui-tag.c2
-rw-r--r--ui-tree.c3
17 files changed, 71 insertions, 46 deletions
diff --git a/cgit.c b/cgit.c
index 2c933dc..e6b4526 100644
--- a/cgit.c
+++ b/cgit.c
@@ -288,13 +288,12 @@ static void cgit_parse_args(int argc, const char **argv)
288int main(int argc, const char **argv) 288int main(int argc, const char **argv)
289{ 289{
290 struct cacheitem item; 290 struct cacheitem item;
291 const char *cgit_config_env = getenv("CGIT_CONFIG"); 291 const char *cgit_config_env = getenv("CGIT_CONFIG");
292 292
293 cgit_prepare_context(&ctx); 293 cgit_prepare_context(&ctx);
294 htmlfd = STDOUT_FILENO;
295 item.st.st_mtime = time(NULL); 294 item.st.st_mtime = time(NULL);
296 cgit_repolist.length = 0; 295 cgit_repolist.length = 0;
297 cgit_repolist.count = 0; 296 cgit_repolist.count = 0;
298 cgit_repolist.repos = NULL; 297 cgit_repolist.repos = NULL;
299 298
300 cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 299 cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
diff --git a/cgit.h b/cgit.h
index 598d8c3..5b7ee1c 100644
--- a/cgit.h
+++ b/cgit.h
@@ -183,14 +183,12 @@ struct cgit_context {
183extern const char *cgit_version; 183extern const char *cgit_version;
184 184
185extern struct cgit_repolist cgit_repolist; 185extern struct cgit_repolist cgit_repolist;
186extern struct cgit_context ctx; 186extern struct cgit_context ctx;
187extern int cgit_cmd; 187extern int cgit_cmd;
188 188
189extern int htmlfd;
190
191extern void cgit_prepare_context(struct cgit_context *ctx); 189extern void cgit_prepare_context(struct cgit_context *ctx);
192extern int cgit_get_cmd_index(const char *cmd); 190extern int cgit_get_cmd_index(const char *cmd);
193extern struct cgit_repo *cgit_get_repoinfo(const char *url); 191extern struct cgit_repo *cgit_get_repoinfo(const char *url);
194extern void cgit_global_config_cb(const char *name, const char *value); 192extern void cgit_global_config_cb(const char *name, const char *value);
195extern void cgit_repo_config_cb(const char *name, const char *value); 193extern void cgit_repo_config_cb(const char *name, const char *value);
196extern void cgit_querystring_cb(const char *name, const char *value); 194extern void cgit_querystring_cb(const char *name, const char *value);
@@ -219,24 +217,12 @@ extern void cgit_diff_tree(const unsigned char *old_sha1,
219 filepair_fn fn, const char *prefix); 217 filepair_fn fn, const char *prefix);
220 218
221extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 219extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
222 220
223extern char *fmt(const char *format,...); 221extern char *fmt(const char *format,...);
224 222
225extern void html(const char *txt);
226extern void htmlf(const char *format,...);
227extern void html_txt(char *txt);
228extern void html_ntxt(int len, char *txt);
229extern void html_attr(char *txt);
230extern void html_hidden(char *name, char *value);
231extern void html_option(char *value, char *text, char *selected_value);
232extern void html_link_open(char *url, char *title, char *class);
233extern void html_link_close(void);
234extern void html_filemode(unsigned short mode);
235extern int html_include(const char *filename);
236
237extern int cgit_read_config(const char *filename, configfn fn); 223extern int cgit_read_config(const char *filename, configfn fn);
238extern int cgit_parse_query(char *txt, configfn fn); 224extern int cgit_parse_query(char *txt, configfn fn);
239extern struct commitinfo *cgit_parse_commit(struct commit *commit); 225extern struct commitinfo *cgit_parse_commit(struct commit *commit);
240extern struct taginfo *cgit_parse_tag(struct tag *tag); 226extern struct taginfo *cgit_parse_tag(struct tag *tag);
241extern void cgit_parse_url(const char *url); 227extern void cgit_parse_url(const char *url);
242 228
@@ -277,12 +263,13 @@ extern void cgit_print_age(time_t t, time_t max_relative, char *format);
277extern void cgit_print_docstart(char *title, struct cacheitem *item); 263extern void cgit_print_docstart(char *title, struct cacheitem *item);
278extern void cgit_print_docend(); 264extern void cgit_print_docend();
279extern void cgit_print_pageheader(char *title, int show_search); 265extern void cgit_print_pageheader(char *title, int show_search);
280extern void cgit_print_snapshot_start(const char *mimetype, 266extern void cgit_print_snapshot_start(const char *mimetype,
281 const char *filename, 267 const char *filename,
282 struct cacheitem *item); 268 struct cacheitem *item);
269extern void cgit_print_filemode(unsigned short mode);
283extern void cgit_print_branches(int maxcount); 270extern void cgit_print_branches(int maxcount);
284extern void cgit_print_tags(int maxcount); 271extern void cgit_print_tags(int maxcount);
285 272
286extern void cgit_print_repolist(struct cacheitem *item); 273extern void cgit_print_repolist(struct cacheitem *item);
287extern void cgit_print_summary(); 274extern void cgit_print_summary();
288extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, 275extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
diff --git a/html.c b/html.c
index eb163d9..0962e71 100644
--- a/html.c
+++ b/html.c
@@ -3,13 +3,19 @@
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 <unistd.h>
10#include <stdio.h>
11#include <stdlib.h>
12#include <stdarg.h>
13#include <string.h>
14
15int htmlfd = STDOUT_FILENO;
10 16
11char *fmt(const char *format, ...) 17char *fmt(const char *format, ...)
12{ 18{
13 static char buf[8][1024]; 19 static char buf[8][1024];
14 static int bufidx; 20 static int bufidx;
15 int len; 21 int len;
@@ -18,14 +24,16 @@ char *fmt(const char *format, ...)
18 bufidx++; 24 bufidx++;
19 bufidx &= 7; 25 bufidx &= 7;
20 26
21 va_start(args, format); 27 va_start(args, format);
22 len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); 28 len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
23 va_end(args); 29 va_end(args);
24 if (len>sizeof(buf[bufidx])) 30 if (len>sizeof(buf[bufidx])) {
25 die("[html.c] string truncated: %s", format); 31 fprintf(stderr, "[html.c] string truncated: %s\n", format);
32 exit(1);
33 }
26 return buf[bufidx]; 34 return buf[bufidx];
27} 35}
28 36
29void html(const char *txt) 37void html(const char *txt)
30{ 38{
31 write(htmlfd, txt, strlen(txt)); 39 write(htmlfd, txt, strlen(txt));
@@ -157,31 +165,16 @@ void html_link_close(void)
157{ 165{
158 html("</a>"); 166 html("</a>");
159} 167}
160 168
161void html_fileperm(unsigned short mode) 169void html_fileperm(unsigned short mode)
162{ 170{
163 htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), 171 htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
164 (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); 172 (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
165} 173}
166 174
167void html_filemode(unsigned short mode)
168{
169 if (S_ISDIR(mode))
170 html("d");
171 else if (S_ISLNK(mode))
172 html("l");
173 else if (S_ISGITLINK(mode))
174 html("m");
175 else
176 html("-");
177 html_fileperm(mode >> 6);
178 html_fileperm(mode >> 3);
179 html_fileperm(mode);
180}
181
182int html_include(const char *filename) 175int html_include(const char *filename)
183{ 176{
184 FILE *f; 177 FILE *f;
185 char buf[4096]; 178 char buf[4096];
186 size_t len; 179 size_t len;
187 180
diff --git a/html.h b/html.h
new file mode 100644
index 0000000..63f4551
--- a/dev/null
+++ b/html.h
@@ -0,0 +1,18 @@
1#ifndef HTML_H
2#define HTML_H
3
4extern int htmlfd;
5
6extern void html(const char *txt);
7extern void htmlf(const char *format,...);
8extern void html_txt(char *txt);
9extern void html_ntxt(int len, char *txt);
10extern void html_attr(char *txt);
11extern void html_hidden(char *name, char *value);
12extern void html_option(char *value, char *text, char *selected_value);
13extern void html_link_open(char *url, char *title, char *class);
14extern void html_link_close(void);
15extern void html_fileperm(unsigned short mode);
16extern int html_include(const char *filename);
17
18#endif /* HTML_H */
diff --git a/shared.c b/shared.c
index 808e674..76e10d0 100644
--- a/shared.c
+++ b/shared.c
@@ -11,14 +11,12 @@
11struct cgit_repolist cgit_repolist; 11struct cgit_repolist cgit_repolist;
12struct cgit_context ctx; 12struct cgit_context ctx;
13int cgit_cmd; 13int cgit_cmd;
14 14
15const char *cgit_version = CGIT_VERSION; 15const char *cgit_version = CGIT_VERSION;
16 16
17int htmlfd = 0;
18
19void cgit_prepare_context(struct cgit_context *ctx) 17void cgit_prepare_context(struct cgit_context *ctx)
20{ 18{
21 memset(ctx, 0, sizeof(ctx)); 19 memset(ctx, 0, sizeof(ctx));
22 ctx->cfg.agefile = "info/web/last-modified"; 20 ctx->cfg.agefile = "info/web/last-modified";
23 ctx->cfg.cache_dynamic_ttl = 5; 21 ctx->cfg.cache_dynamic_ttl = 5;
24 ctx->cfg.cache_max_create_time = 5; 22 ctx->cfg.cache_max_create_time = 5;
diff --git a/ui-blob.c b/ui-blob.c
index f5b844b..be4fb88 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,7 +1,16 @@
1/* ui-blob.c: show blob content
2 *
3 * Copyright (C) 2008 Lars Hjemli
4 *
5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text)
7 */
8
1#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
2 11
3void cgit_print_blob(struct cacheitem *item, const char *hex, char *path) 12void cgit_print_blob(struct cacheitem *item, const char *hex, char *path)
4{ 13{
5 14
6 unsigned char sha1[20]; 15 unsigned char sha1[20];
7 enum object_type type; 16 enum object_type type;
diff --git a/ui-commit.c b/ui-commit.c
index 25721ca..ed25824 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -4,12 +4,13 @@
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#include "html.h"
10 11
11static int files, slots; 12static int files, slots;
12static int total_adds, total_rems, max_changes; 13static int total_adds, total_rems, max_changes;
13static int lines_added, lines_removed; 14static int lines_added, lines_removed;
14static char *curr_rev; 15static char *curr_rev;
15 16
@@ -59,22 +60,22 @@ void print_fileinfo(struct fileinfo *info)
59 die("bug: unhandled diff status %c", info->status); 60 die("bug: unhandled diff status %c", info->status);
60 } 61 }
61 62
62 html("<tr>"); 63 html("<tr>");
63 htmlf("<td class='mode'>"); 64 htmlf("<td class='mode'>");
64 if (is_null_sha1(info->new_sha1)) { 65 if (is_null_sha1(info->new_sha1)) {
65 html_filemode(info->old_mode); 66 cgit_print_filemode(info->old_mode);
66 } else { 67 } else {
67 html_filemode(info->new_mode); 68 cgit_print_filemode(info->new_mode);
68 } 69 }
69 70
70 if (info->old_mode != info->new_mode && 71 if (info->old_mode != info->new_mode &&
71 !is_null_sha1(info->old_sha1) && 72 !is_null_sha1(info->old_sha1) &&
72 !is_null_sha1(info->new_sha1)) { 73 !is_null_sha1(info->new_sha1)) {
73 html("<span class='modechange'>["); 74 html("<span class='modechange'>[");
74 html_filemode(info->old_mode); 75 cgit_print_filemode(info->old_mode);
75 html("]</span>"); 76 html("]</span>");
76 } 77 }
77 htmlf("</td><td class='%s'>", class); 78 htmlf("</td><td class='%s'>", class);
78 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev, 79 cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, curr_rev,
79 NULL, info->new_path); 80 NULL, info->new_path);
80 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) 81 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
diff --git a/ui-diff.c b/ui-diff.c
index 263a7ba..5c3bc98 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -4,13 +4,13 @@
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#include "html.h"
11 11
12unsigned char old_rev_sha1[20]; 12unsigned char old_rev_sha1[20];
13unsigned char new_rev_sha1[20]; 13unsigned char new_rev_sha1[20];
14 14
15/* 15/*
16 * print a single line returned from xdiff 16 * print a single line returned from xdiff
diff --git a/ui-log.c b/ui-log.c
index 72e2a4b..e1d324d 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -4,12 +4,13 @@
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#include "html.h"
10 11
11int files, add_lines, rem_lines; 12int files, add_lines, rem_lines;
12 13
13void count_lines(char *line, int size) 14void count_lines(char *line, int size)
14{ 15{
15 if (size <= 0) 16 if (size <= 0)
diff --git a/ui-patch.c b/ui-patch.c
index 1da0a27..d93426b 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -4,12 +4,13 @@
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#include "html.h"
10 11
11static void print_line(char *line, int len) 12static void print_line(char *line, int len)
12{ 13{
13 char c = line[len-1]; 14 char c = line[len-1];
14 15
15 line[len-1] = '\0'; 16 line[len-1] = '\0';
diff --git a/ui-refs.c b/ui-refs.c
index ba513c1..e2a16f4 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -4,15 +4,13 @@
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#include "html.h"
11
12
13 11
14void cgit_print_refs() 12void cgit_print_refs()
15{ 13{
16 14
17 html("<table class='list nowrap'>"); 15 html("<table class='list nowrap'>");
18 16
diff --git a/ui-repolist.c b/ui-repolist.c
index 5fde174..cd4e41d 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -3,15 +3,16 @@
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"
10#include <time.h> 9#include <time.h>
11 10
11#include "cgit.h"
12#include "html.h"
12 13
13time_t read_agefile(char *path) 14time_t read_agefile(char *path)
14{ 15{
15 FILE *f; 16 FILE *f;
16 static char buf[64], buf2[64]; 17 static char buf[64], buf2[64];
17 18
diff --git a/ui-shared.c b/ui-shared.c
index cc1ab8b..2eff79d 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -4,12 +4,13 @@
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#include "html.h"
10 11
11const char cgit_doctype[] = 12const char cgit_doctype[] =
12"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" 13"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
13" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; 14" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
14 15
15static char *http_date(time_t t) 16static char *http_date(time_t t)
@@ -564,7 +565,22 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
564 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); 565 htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
565 htmlf("Expires: %s\n", http_date(item->st.st_mtime + 566 htmlf("Expires: %s\n", http_date(item->st.st_mtime +
566 ttl_seconds(item->ttl))); 567 ttl_seconds(item->ttl)));
567 html("\n"); 568 html("\n");
568} 569}
569 570
571void cgit_print_filemode(unsigned short mode)
572{
573 if (S_ISDIR(mode))
574 html("d");
575 else if (S_ISLNK(mode))
576 html("l");
577 else if (S_ISGITLINK(mode))
578 html("m");
579 else
580 html("-");
581 html_fileperm(mode >> 6);
582 html_fileperm(mode >> 3);
583 html_fileperm(mode);
584}
585
570/* vim:set sw=8: */ 586/* vim:set sw=8: */
diff --git a/ui-snapshot.c b/ui-snapshot.c
index dfedd8f..67dbbdd 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -4,12 +4,13 @@
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#include "html.h"
10 11
11static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) 12static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
12{ 13{
13 int rw[2]; 14 int rw[2];
14 pid_t gzpid; 15 pid_t gzpid;
15 int stdout2; 16 int stdout2;
diff --git a/ui-summary.c b/ui-summary.c
index 3baac08..0afa0a3 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -4,12 +4,13 @@
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#include "html.h"
10 11
11static int header; 12static int header;
12 13
13static int cmp_age(int age1, int age2) 14static int cmp_age(int age1, int age2)
14{ 15{
15 if (age1 != 0 && age2 != 0) 16 if (age1 != 0 && age2 != 0)
diff --git a/ui-tag.c b/ui-tag.c
index 6d761f3..2998d02 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -4,13 +4,13 @@
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#include "html.h"
11 11
12static void print_tag_content(char *buf) 12static void print_tag_content(char *buf)
13{ 13{
14 char *p; 14 char *p;
15 15
16 if (!buf) 16 if (!buf)
diff --git a/ui-tree.c b/ui-tree.c
index df05ad3..7912784 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -4,12 +4,13 @@
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#include "html.h"
10 11
11char *curr_rev; 12char *curr_rev;
12char *match_path; 13char *match_path;
13int header = 0; 14int header = 0;
14 15
15static void print_object(const unsigned char *sha1, char *path) 16static void print_object(const unsigned char *sha1, char *path)
@@ -76,13 +77,13 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
76 name, 77 name,
77 sha1_to_hex(sha1)); 78 sha1_to_hex(sha1));
78 return 0; 79 return 0;
79 } 80 }
80 81
81 html("<tr><td class='ls-mode'>"); 82 html("<tr><td class='ls-mode'>");
82 html_filemode(mode); 83 cgit_print_filemode(mode);
83 html("</td><td>"); 84 html("</td><td>");
84 if (S_ISGITLINK(mode)) { 85 if (S_ISGITLINK(mode)) {
85 htmlf("<a class='ls-mod' href='"); 86 htmlf("<a class='ls-mod' href='");
86 html_attr(fmt(ctx.repo->module_link, 87 html_attr(fmt(ctx.repo->module_link,
87 name, 88 name,
88 sha1_to_hex(sha1))); 89 sha1_to_hex(sha1)));