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>

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)
 	cgit_prepare_context(&ctx);
-	htmlfd = STDOUT_FILENO;
 	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;
 
-extern int htmlfd;
-
 extern void cgit_prepare_context(struct cgit_context *ctx);
@@ -224,14 +222,2 @@ extern char *fmt(const char *format,...);
 
-extern void html(const char *txt);
-extern void htmlf(const char *format,...);
-extern void html_txt(char *txt);
-extern void html_ntxt(int len, char *txt);
-extern void html_attr(char *txt);
-extern void html_hidden(char *name, char *value);
-extern void html_option(char *value, char *text, char *selected_value);
-extern void html_link_open(char *url, char *title, char *class);
-extern void html_link_close(void);
-extern void html_filemode(unsigned short mode);
-extern int html_include(const char *filename);
-
 extern int cgit_read_config(const char *filename, configfn fn);
@@ -282,2 +268,3 @@ extern void cgit_print_snapshot_start(const char *mimetype,
 				      struct cacheitem *item);
+extern void cgit_print_filemode(unsigned short mode);
 extern 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 @@
 
-#include "cgit.h"
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+
+int htmlfd = STDOUT_FILENO;
 
@@ -23,4 +29,6 @@ char *fmt(const char *format, ...)
 	va_end(args);
-	if (len>sizeof(buf[bufidx]))
-		die("[html.c] string truncated: %s", format);
+	if (len>sizeof(buf[bufidx])) {
+		fprintf(stderr, "[html.c] string truncated: %s\n", format);
+		exit(1);
+	}
 	return buf[bufidx];
@@ -162,3 +170,3 @@ void html_fileperm(unsigned short mode)
 {
-	htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), 
+	htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
 	      (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
@@ -166,17 +174,2 @@ void html_fileperm(unsigned short mode)
 
-void html_filemode(unsigned short mode)
-{
-	if (S_ISDIR(mode))
-		html("d");
-	else if (S_ISLNK(mode))
-		html("l");
-	else if (S_ISGITLINK(mode))
-		html("m");
-	else
-		html("-");
-	html_fileperm(mode >> 6);
-	html_fileperm(mode >> 3);
-	html_fileperm(mode);
-}
-
 int 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 @@
+#ifndef HTML_H
+#define HTML_H
+
+extern int htmlfd;
+
+extern void html(const char *txt);
+extern void htmlf(const char *format,...);
+extern void html_txt(char *txt);
+extern void html_ntxt(int len, char *txt);
+extern void html_attr(char *txt);
+extern void html_hidden(char *name, char *value);
+extern void html_option(char *value, char *text, char *selected_value);
+extern void html_link_open(char *url, char *title, char *class);
+extern void html_link_close(void);
+extern void html_fileperm(unsigned short mode);
+extern int html_include(const char *filename);
+
+#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;
 
-int htmlfd = 0;
-
 void 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 @@
+/* ui-blob.c: show blob content
+ *
+ * Copyright (C) 2008 Lars Hjemli
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
 #include "cgit.h"
+#include "html.h"
 
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 @@
 #include "cgit.h"
+#include "html.h"
 
@@ -64,5 +65,5 @@ void print_fileinfo(struct fileinfo *info)
 	if (is_null_sha1(info->new_sha1)) {
-		html_filemode(info->old_mode);
+		cgit_print_filemode(info->old_mode);
 	} else {
-		html_filemode(info->new_mode);
+		cgit_print_filemode(info->new_mode);
 	}
@@ -73,3 +74,3 @@ void print_fileinfo(struct fileinfo *info)
 		html("<span class='modechange'>[");
-		html_filemode(info->old_mode);
+		cgit_print_filemode(info->old_mode);
 		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 @@
 #include "cgit.h"
-
+#include "html.h"
 
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 @@
 #include "cgit.h"
+#include "html.h"
 
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 @@
 #include "cgit.h"
+#include "html.h"
 
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 @@
 #include "cgit.h"
-
-
-
+#include "html.h"
 
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 @@
 
-#include "cgit.h"
 #include <time.h>
 
+#include "cgit.h"
+#include "html.h"
 
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 @@
 #include "cgit.h"
+#include "html.h"
 
@@ -569,2 +570,17 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
 
+void cgit_print_filemode(unsigned short mode)
+{
+	if (S_ISDIR(mode))
+		html("d");
+	else if (S_ISLNK(mode))
+		html("l");
+	else if (S_ISGITLINK(mode))
+		html("m");
+	else
+		html("-");
+	html_fileperm(mode >> 6);
+	html_fileperm(mode >> 3);
+	html_fileperm(mode);
+}
+
 /* 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 @@
 #include "cgit.h"
+#include "html.h"
 
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 @@
 #include "cgit.h"
+#include "html.h"
 
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 @@
 #include "cgit.h"
-
+#include "html.h"
 
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 @@
 #include "cgit.h"
+#include "html.h"
 
@@ -81,3 +82,3 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 	html("<tr><td class='ls-mode'>");
-	html_filemode(mode);
+	cgit_print_filemode(mode);
 	html("</td><td>");