aboutsummaryrefslogtreecommitdiff
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat
-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, 46 insertions, 71 deletions
diff --git a/cgit.c b/cgit.c
index e6b4526..2c933dc 100644
--- a/cgit.c
+++ b/cgit.c
@@ -291,6 +291,7 @@ int main(int argc, const char **argv)
const char *cgit_config_env = getenv("CGIT_CONFIG");
cgit_prepare_context(&ctx);
+ htmlfd = STDOUT_FILENO;
item.st.st_mtime = time(NULL);
cgit_repolist.length = 0;
cgit_repolist.count = 0;
diff --git a/cgit.h b/cgit.h
index 5b7ee1c..598d8c3 100644
--- a/cgit.h
+++ b/cgit.h
@@ -186,6 +186,8 @@ extern struct cgit_repolist cgit_repolist;
extern struct cgit_context ctx;
extern int cgit_cmd;
+extern int htmlfd;
+
extern void cgit_prepare_context(struct cgit_context *ctx);
extern int cgit_get_cmd_index(const char *cmd);
extern struct cgit_repo *cgit_get_repoinfo(const char *url);
@@ -220,6 +222,18 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
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);
extern int cgit_parse_query(char *txt, configfn fn);
extern struct commitinfo *cgit_parse_commit(struct commit *commit);
@@ -266,7 +280,6 @@ extern void cgit_print_pageheader(char *title, int show_search);
extern void cgit_print_snapshot_start(const char *mimetype,
const char *filename,
struct cacheitem *item);
-extern void cgit_print_filemode(unsigned short mode);
extern void cgit_print_branches(int maxcount);
extern void cgit_print_tags(int maxcount);
diff --git a/html.c b/html.c
index 0962e71..eb163d9 100644
--- a/html.c
+++ b/html.c
@@ -6,13 +6,7 @@
* (see COPYING for full license text)
*/
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-
-int htmlfd = STDOUT_FILENO;
+#include "cgit.h"
char *fmt(const char *format, ...)
{
@@ -27,10 +21,8 @@ char *fmt(const char *format, ...)
va_start(args, format);
len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
va_end(args);
- if (len>sizeof(buf[bufidx])) {
- fprintf(stderr, "[html.c] string truncated: %s\n", format);
- exit(1);
- }
+ if (len>sizeof(buf[bufidx]))
+ die("[html.c] string truncated: %s", format);
return buf[bufidx];
}
@@ -168,10 +160,25 @@ void html_link_close(void)
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' : '-'));
}
+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)
{
FILE *f;
diff --git a/html.h b/html.h
deleted file mode 100644
index 63f4551..0000000
--- a/html.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#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 76e10d0..808e674 100644
--- a/shared.c
+++ b/shared.c
@@ -14,6 +14,8 @@ int cgit_cmd;
const char *cgit_version = CGIT_VERSION;
+int htmlfd = 0;
+
void cgit_prepare_context(struct cgit_context *ctx)
{
memset(ctx, 0, sizeof(ctx));
diff --git a/ui-blob.c b/ui-blob.c
index be4fb88..f5b844b 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,13 +1,4 @@
-/* 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"
void cgit_print_blob(struct cacheitem *item, const char *hex, char *path)
{
diff --git a/ui-commit.c b/ui-commit.c
index ed25824..25721ca 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -7,7 +7,6 @@
*/
#include "cgit.h"
-#include "html.h"
static int files, slots;
static int total_adds, total_rems, max_changes;
@@ -63,16 +62,16 @@ void print_fileinfo(struct fileinfo *info)
html("<tr>");
htmlf("<td class='mode'>");
if (is_null_sha1(info->new_sha1)) {
- cgit_print_filemode(info->old_mode);
+ html_filemode(info->old_mode);
} else {
- cgit_print_filemode(info->new_mode);
+ html_filemode(info->new_mode);
}
if (info->old_mode != info->new_mode &&
!is_null_sha1(info->old_sha1) &&
!is_null_sha1(info->new_sha1)) {
html("<span class='modechange'>[");
- cgit_print_filemode(info->old_mode);
+ html_filemode(info->old_mode);
html("]</span>");
}
htmlf("</td><td class='%s'>", class);
diff --git a/ui-diff.c b/ui-diff.c
index 5c3bc98..263a7ba 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,7 +7,7 @@
*/
#include "cgit.h"
-#include "html.h"
+
unsigned char old_rev_sha1[20];
unsigned char new_rev_sha1[20];
diff --git a/ui-log.c b/ui-log.c
index e1d324d..72e2a4b 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,7 +7,6 @@
*/
#include "cgit.h"
-#include "html.h"
int files, add_lines, rem_lines;
diff --git a/ui-patch.c b/ui-patch.c
index d93426b..1da0a27 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -7,7 +7,6 @@
*/
#include "cgit.h"
-#include "html.h"
static void print_line(char *line, int len)
{
diff --git a/ui-refs.c b/ui-refs.c
index e2a16f4..ba513c1 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -7,7 +7,9 @@
*/
#include "cgit.h"
-#include "html.h"
+
+
+
void cgit_print_refs()
{
diff --git a/ui-repolist.c b/ui-repolist.c
index cd4e41d..5fde174 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -6,10 +6,9 @@
* (see COPYING for full license text)
*/
+#include "cgit.h"
#include <time.h>
-#include "cgit.h"
-#include "html.h"
time_t read_agefile(char *path)
{
diff --git a/ui-shared.c b/ui-shared.c
index 2eff79d..cc1ab8b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,7 +7,6 @@
*/
#include "cgit.h"
-#include "html.h"
const char cgit_doctype[] =
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
@@ -568,19 +567,4 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
html("\n");
}
-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 67dbbdd..dfedd8f 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -7,7 +7,6 @@
*/
#include "cgit.h"
-#include "html.h"
static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
{
diff --git a/ui-summary.c b/ui-summary.c
index 0afa0a3..3baac08 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -7,7 +7,6 @@
*/
#include "cgit.h"
-#include "html.h"
static int header;
diff --git a/ui-tag.c b/ui-tag.c
index 2998d02..6d761f3 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -7,7 +7,7 @@
*/
#include "cgit.h"
-#include "html.h"
+
static void print_tag_content(char *buf)
{
diff --git a/ui-tree.c b/ui-tree.c
index 7912784..df05ad3 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -7,7 +7,6 @@
*/
#include "cgit.h"
-#include "html.h"
char *curr_rev;
char *match_path;
@@ -80,7 +79,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
}
html("<tr><td class='ls-mode'>");
- cgit_print_filemode(mode);
+ html_filemode(mode);
html("</td><td>");
if (S_ISGITLINK(mode)) {
htmlf("<a class='ls-mod' href='");
generated by cgitext v1.3.1+17 (git 2.54.0) at 2026-09-13 21:55:54 +0000