12 files changed, 42 insertions, 30 deletions

diff --git a/Makefile b/Makefile
index 23fdd53..6a47ed2 100644
--- a/Makefile
+++ b/Makefile
@@ -17,4 +17,9 @@ INSTALL = install
 # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
 #
+# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
+# do not support the 'size specifiers' introduced by C99, namely ll, hh,
+# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
+# some C compilers supported these specifiers prior to C99 as an extension.
+#
 
 #-include config.mak
@@ -128,4 +133,7 @@ ifdef NO_STRCASESTR
         CFLAGS += -DNO_STRCASESTR
 endif
+ifdef NO_C99_FORMAT
+        CFLAGS += -DNO_C99_FORMAT
+endif
 ifdef NO_OPENSSL
         CFLAGS += -DNO_OPENSSL
diff --git a/cache.h b/cache.h
index ac9276b..5cfdb4f 100644
--- a/cache.h
+++ b/cache.h
@@ -31,4 +31,5 @@ extern int cache_ls(const char *path);
 
 /* Print a message to stdout */
+__attribute__((format (printf,1,2)))
 extern void cache_log(const char *format, ...);
 
diff --git a/cgit.c b/cgit.c
index e1d2216..96900bb 100644
--- a/cgit.c
+++ b/cgit.c
@@ -611,5 +611,5 @@ static void process_cached_repolist(const char *path)
         if (ctx.cfg.project_list)
                 hash += hash_str(ctx.cfg.project_list);
-        cached_rc = xstrdup(fmt("%s/rc-%8x", ctx.cfg.cache_root, hash));
+        cached_rc = xstrdup(fmt("%s/rc-%8lx", ctx.cfg.cache_root, hash));
 
         if (stat(cached_rc, &st)) {
diff --git a/cgit.h b/cgit.h
index f8076c5..8f5dd2a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -296,4 +296,5 @@ extern void cgit_diff_tree(const unsigned char *old_sha1,
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
+__attribute__((format (printf,1,2)))
 extern char *fmt(const char *format,...);
 
diff --git a/html.c b/html.c
index eaabf72..1305910 100644
--- a/html.c
+++ b/html.c
@@ -96,5 +96,5 @@ void html_txt(const char *txt)
                 int c = *t;
                 if (c=='<' || c=='>' || c=='&') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
                         if (c=='>')
                                 html("&gt;");
@@ -117,5 +117,5 @@ void html_ntxt(int len, const char *txt)
                 int c = *t;
                 if (c=='<' || c=='>' || c=='&') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
                         if (c=='>')
                                 html("&gt;");
@@ -129,5 +129,5 @@ void html_ntxt(int len, const char *txt)
         }
         if (t!=txt)
-                write(htmlfd, txt, t - txt);
+                html_raw(txt, t - txt);
         if (len<0)
                 html("...");
@@ -140,5 +140,5 @@ void html_attr(const char *txt)
                 int c = *t;
                 if (c=='<' || c=='>' || c=='\'' || c=='\"') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
                         if (c=='>')
                                 html("&gt;");
@@ -164,6 +164,6 @@ void html_url_path(const char *txt)
                 const char *e = url_escape_table[c];
                 if (e && c!='+' && c!='&' && c!='+') {
-                        write(htmlfd, txt, t - txt);
-                        write(htmlfd, e, 3);
+                        html_raw(txt, t - txt);
+                        html_raw(e, 3);
                         txt = t+1;
                 }
@@ -181,6 +181,6 @@ void html_url_arg(const char *txt)
                 const char *e = url_escape_table[c];
                 if (e) {
-                        write(htmlfd, txt, t - txt);
-                        write(htmlfd, e, 3);
+                        html_raw(txt, t - txt);
+                        html_raw(e, 3);
                         txt = t+1;
                 }
@@ -250,5 +250,5 @@ int html_include(const char *filename)
         }
         while((len = fread(buf, 1, 4096, f)) > 0)
-                write(htmlfd, buf, len);
+                html_raw(buf, len);
         fclose(f);
         return 0;
diff --git a/html.h b/html.h
index 16d55ec..1135fb8 100644
--- a/html.h
+++ b/html.h
@@ -6,5 +6,8 @@ extern int htmlfd;
 extern void html_raw(const char *txt, size_t size);
 extern void html(const char *txt);
+
+__attribute__((format (printf,1,2)))
 extern void htmlf(const char *format,...);
+
 extern void html_status(int code, const char *msg, int more_headers);
 extern void html_txt(const char *txt);
diff --git a/ui-blob.c b/ui-blob.c
index 667a451..ec435e1 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -53,5 +53,5 @@ int cgit_print_file(char *path, const char *head)
                 return -1;
         buf[size] = '\0';
-        write(htmlfd, buf, size);
+        html_raw(buf, size);
         return 0;
 }
@@ -109,4 +109,4 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
         ctx.page.filename = path;
         cgit_print_http_headers(&ctx);
-        write(htmlfd, buf, size);
+        html_raw(buf, size);
 }
diff --git a/ui-diff.c b/ui-diff.c
index 0dcabe9..7ff7e46 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -93,5 +93,5 @@ static void print_fileinfo(struct fileinfo *info)
         html("</td><td class='right'>");
         if (info->binary) {
-                htmlf("bin</td><td class='graph'>%d -> %d bytes",
+                htmlf("bin</td><td class='graph'>%ld -> %ld bytes",
                       info->old_size, info->new_size);
                 return;
diff --git a/ui-log.c b/ui-log.c
index 0536b23..41b5225 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -229,6 +229,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
         }
         if (pager) {
-                htmlf("</table><div class='pager'>",
-                     columns);
+                html("</table><div class='pager'>");
                 if (ofs > 0) {
                         cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
diff --git a/ui-repolist.c b/ui-repolist.c
index 0a0b6ca..2c98668 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -7,10 +7,4 @@
  */
 
-/* This is needed for strcasestr to be defined by <string.h> */
-#define _GNU_SOURCE 1
-#include <string.h>
-
-#include <time.h>
-
 #include "cgit.h"
 #include "html.h"
diff --git a/ui-stats.c b/ui-stats.c
index 50c2540..946a6ea 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -6,4 +6,10 @@
 #include "ui-stats.h"
 
+#ifdef NO_C99_FORMAT
+#define SZ_FMT "%u"
+#else
+#define SZ_FMT "%zu"
+#endif
+
 #define MONTHS 6
 
@@ -284,8 +290,8 @@ void print_combined_authorrow(struct string_list *authors, int from, int to,
                                 subtotal += (size_t)date->util;
                 }
-                htmlf("<td class='%s'>%d</td>", centerclass, subtotal);
+                htmlf("<td class='%s'>%ld</td>", centerclass, subtotal);
                 total += subtotal;
         }
-        htmlf("<td class='%s'>%d</td></tr>", rightclass, total);
+        htmlf("<td class='%s'>%ld</td></tr>", rightclass, total);
 }
 
@@ -336,14 +342,14 @@ void print_authors(struct string_list *authors, int top,
                                 html("<td>0</td>");
                         else {
-                                htmlf("<td>%d</td>", date->util);
+                                htmlf("<td>"SZ_FMT"</td>", (size_t)date->util);
                                 total += (size_t)date->util;
                         }
                 }
-                htmlf("<td class='sum'>%d</td></tr>", total);
+                htmlf("<td class='sum'>%ld</td></tr>", total);
         }
 
         if (top < authors->nr)
                 print_combined_authorrow(authors, top, authors->nr - 1,
-                        "Others (%d)", "left", "", "sum", period);
+                        "Others (%ld)", "left", "", "sum", period);
 
         print_combined_authorrow(authors, 0, authors->nr - 1, "Total",
@@ -368,5 +374,5 @@ void cgit_show_stats(struct cgit_context *ctx)
         i = cgit_find_stats_period(code, &period);
         if (!i) {
-                cgit_print_error(fmt("Unknown statistics type: %c", code));
+                cgit_print_error(fmt("Unknown statistics type: %c", code[0]));
                 return;
         }
diff --git a/ui-tree.c b/ui-tree.c
index 75ec9cb..0b1b531 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -47,5 +47,5 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
                 ctx.repo->source_filter->argv[1] = xstrdup(name);
                 cgit_open_filter(ctx.repo->source_filter);
-                write(STDOUT_FILENO, buf, size);
+                html_raw(buf, size);
                 cgit_close_filter(ctx.repo->source_filter);
                 html("</code></pre></td></tr></table>\n");
@@ -68,5 +68,5 @@ static void print_binary_buffer(char *buf, unsigned long size)
         html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>");
         for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) {
-                htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs);
+                htmlf("<tr><td class='right'>%04lx</td><td class='hex'>", ofs);
                 for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
                         htmlf("%*s%02x",
@@ -109,5 +109,5 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
 
         if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
-                htmlf("<div class='error'>blob size (%dKB) exceeds display size limit (%dKB).</div>",
+                htmlf("<div class='error'>blob size (%ldKB) exceeds display size limit (%dKB).</div>",
                                 size / 1024, ctx.cfg.max_blob_size);
                 return;