t0107: Skip ZIP tests if unzip(1) isn't available

[ps-cgit] / html.c

diff --git a/html.c b/html.c
index ed6cefcfea307f10e2fb72fe00b12f1e42b09c30..f7772dce1c3284c61e0c4a93dc06e533b85574aa 100644 (file)
--- a/html.c
+++ b/html.c
@@ -6,6 +6,8 @@
  *   (see COPYING for full license text)
  */
 
+#include "cgit.h"
+#include "html.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,7 +41,7 @@ static const char* url_escape_table[256] = {
        "%fe", "%ff"
 };
 
-int htmlfd = STDOUT_FILENO;
+static int htmlfd = STDOUT_FILENO;
 
 char *fmt(const char *format, ...)
 {
@@ -61,25 +63,60 @@ char *fmt(const char *format, ...)
        return buf[bufidx];
 }
 
+char *fmtalloc(const char *format, ...)
+{
+       struct strbuf sb = STRBUF_INIT;
+       va_list args;
+
+       va_start(args, format);
+       strbuf_vaddf(&sb, format, args);
+       va_end(args);
+
+       return strbuf_detach(&sb, NULL);
+}
+
 void html_raw(const char *data, size_t size)
 {
-       write(htmlfd, data, size);
+       if (write(htmlfd, data, size) != size)
+               fprintf(stderr, "[html.c] html output truncated.\n");
 }
 
 void html(const char *txt)
 {
-       write(htmlfd, txt, strlen(txt));
+       html_raw(txt, strlen(txt));
 }
 
 void htmlf(const char *format, ...)
 {
-       static char buf[65536];
+       va_list args;
+       struct strbuf buf = STRBUF_INIT;
+
+       va_start(args, format);
+       strbuf_vaddf(&buf, format, args);
+       va_end(args);
+       html(buf.buf);
+       strbuf_release(&buf);
+}
+
+void html_txtf(const char *format, ...)
+{
        va_list args;
 
        va_start(args, format);
-       vsnprintf(buf, sizeof(buf), format, args);
+       html_vtxtf(format, args);
        va_end(args);
-       html(buf);
+}
+
+void html_vtxtf(const char *format, va_list ap)
+{
+       va_list cp;
+       struct strbuf buf = STRBUF_INIT;
+
+       va_copy(cp, ap);
+       strbuf_vaddf(&buf, format, cp);
+       va_end(cp);
+       html_txt(buf.buf);
+       strbuf_release(&buf);
 }
 
 void html_status(int code, const char *msg, int more_headers)
@@ -92,7 +129,7 @@ void html_status(int code, const char *msg, int more_headers)
 void html_txt(const char *txt)
 {
        const char *t = txt;
-       while(t && *t){
+       while (t && *t) {
                int c = *t;
                if (c == '<' || c == '>' || c == '&') {
                        html_raw(txt, t - txt);
@@ -113,7 +150,7 @@ void html_txt(const char *txt)
 void html_ntxt(int len, const char *txt)
 {
        const char *t = txt;
-       while(t && *t && len--){
+       while (t && *t && len--) {
                int c = *t;
                if (c == '<' || c == '>' || c == '&') {
                        html_raw(txt, t - txt);
@@ -133,10 +170,23 @@ void html_ntxt(int len, const char *txt)
                html("...");
 }
 
+void html_attrf(const char *fmt, ...)
+{
+       va_list ap;
+       struct strbuf sb = STRBUF_INIT;
+
+       va_start(ap, fmt);
+       strbuf_vaddf(&sb, fmt, ap);
+       va_end(ap);
+
+       html_attr(sb.buf);
+       strbuf_release(&sb);
+}
+
 void html_attr(const char *txt)
 {
        const char *t = txt;
-       while(t && *t){
+       while (t && *t) {
                int c = *t;
                if (c == '<' || c == '>' || c == '\'' || c == '\"' || c == '&') {
                        html_raw(txt, t - txt);
@@ -161,7 +211,7 @@ void html_attr(const char *txt)
 void html_url_path(const char *txt)
 {
        const char *t = txt;
-       while(t && *t){
+       while (t && *t) {
                unsigned char c = *t;
                const char *e = url_escape_table[c];
                if (e && c != '+' && c != '&') {
@@ -178,7 +228,7 @@ void html_url_path(const char *txt)
 void html_url_arg(const char *txt)
 {
        const char *t = txt;
-       while(t && *t){
+       while (t && *t) {
                unsigned char c = *t;
                const char *e = url_escape_table[c];
                if (c == ' ')
@@ -260,13 +310,13 @@ int html_include(const char *filename)
                        filename, strerror(errno), errno);
                return -1;
        }
-       while((len = fread(buf, 1, 4096, f)) > 0)
+       while ((len = fread(buf, 1, 4096, f)) > 0)
                html_raw(buf, len);
        fclose(f);
        return 0;
 }
 
-int hextoint(char c)
+static int hextoint(char c)
 {
        if (c >= 'a' && c <= 'f')
                return 10 + c - 'a';
@@ -278,7 +328,7 @@ int hextoint(char c)
                return -1;
 }
 
-char *convert_query_hexchar(char *txt)
+static char *convert_query_hexchar(char *txt)
 {
        int d1, d2, n;
        n = strlen(txt);
@@ -305,12 +355,8 @@ int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const
        if (!txt_)
                return 0;
 
-       o = t = txt = strdup(txt_);
-       if (t == NULL) {
-               printf("Out of memory\n");
-               exit(1);
-       }
-       while((c=*t) != '\0') {
+       o = t = txt = xstrdup(txt_);
+       while ((c=*t) != '\0') {
                if (c == '=') {
                        *t = '\0';
                        value = t + 1;