summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-02-23 21:45:33 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-03-18 07:13:10 (UTC)
commitb1f9b9c1459cb9a30ebf80721aff6ef788d1f891 (patch) (unidiff)
tree05796a741faef90c12aadd3a5c92b702ec870c48
parentb88fb016d0209f7041ac7d3b4d2c077318407a4d (diff)
downloadcgit-b1f9b9c1459cb9a30ebf80721aff6ef788d1f891.zip
cgit-b1f9b9c1459cb9a30ebf80721aff6ef788d1f891.tar.gz
cgit-b1f9b9c1459cb9a30ebf80721aff6ef788d1f891.tar.bz2
Introduce html.h
All html-functions can be quite easily separated from the rest of cgit, so lets do it; the only issue was html_filemode which uses some git-defined macros so the function is moved into ui-shared.c::cgit_print_filemode(). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
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
@@ -293,3 +293,2 @@ int main(int argc, const char **argv)
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);
diff --git a/cgit.h b/cgit.h
index 598d8c3..5b7ee1c 100644
--- a/cgit.h
+++ b/cgit.h
@@ -188,4 +188,2 @@ extern 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);
@@ -224,14 +222,2 @@ extern 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);
@@ -282,2 +268,3 @@ extern void cgit_print_snapshot_start(const char *mimetype,
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);
diff --git a/html.c b/html.c
index eb163d9..0962e71 100644
--- a/html.c
+++ b/html.c
@@ -8,3 +8,9 @@
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
@@ -23,4 +29,6 @@ char *fmt(const char *format, ...)
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];
@@ -162,3 +170,3 @@ void 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' : '-'));
@@ -166,17 +174,2 @@ void html_fileperm(unsigned short mode)
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)
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
@@ -16,4 +16,2 @@ const 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)
diff --git a/ui-blob.c b/ui-blob.c
index f5b844b..be4fb88 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,2 +1,11 @@
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
diff --git a/ui-commit.c b/ui-commit.c
index 25721ca..ed25824 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -9,2 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
10 11
@@ -64,5 +65,5 @@ void print_fileinfo(struct fileinfo *info)
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 }
@@ -73,3 +74,3 @@ void print_fileinfo(struct fileinfo *info)
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>");
diff --git a/ui-diff.c b/ui-diff.c
index 263a7ba..5c3bc98 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -9,3 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10 10#include "html.h"
11 11
diff --git a/ui-log.c b/ui-log.c
index 72e2a4b..e1d324d 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -9,2 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
10 11
diff --git a/ui-patch.c b/ui-patch.c
index 1da0a27..d93426b 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -9,2 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
10 11
diff --git a/ui-refs.c b/ui-refs.c
index ba513c1..e2a16f4 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -9,5 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10 10#include "html.h"
11
12
13 11
diff --git a/ui-repolist.c b/ui-repolist.c
index 5fde174..cd4e41d 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -8,5 +8,6 @@
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
diff --git a/ui-shared.c b/ui-shared.c
index cc1ab8b..2eff79d 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -9,2 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
10 11
@@ -569,2 +570,17 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
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
@@ -9,2 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
10 11
diff --git a/ui-summary.c b/ui-summary.c
index 3baac08..0afa0a3 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -9,2 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
10 11
diff --git a/ui-tag.c b/ui-tag.c
index 6d761f3..2998d02 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -9,3 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10 10#include "html.h"
11 11
diff --git a/ui-tree.c b/ui-tree.c
index df05ad3..7912784 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -9,2 +9,3 @@
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h"
10 11
@@ -81,3 +82,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
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>");