=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/cgi.c,v retrieving revision 1.52 retrieving revision 1.53 diff -c -r1.52 -r1.53 *** src/usr.bin/mandoc/cgi.c 2015/11/05 17:47:53 1.52 --- src/usr.bin/mandoc/cgi.c 2015/11/05 20:55:46 1.53 *************** *** 1,4 **** ! /* $OpenBSD: cgi.c,v 1.52 2015/11/05 17:47:53 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2014, 2015 Ingo Schwarze --- 1,4 ---- ! /* $OpenBSD: cgi.c,v 1.53 2015/11/05 20:55:46 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2014, 2015 Ingo Schwarze *************** *** 75,80 **** --- 75,81 ---- static void pg_show(struct req *, const char *); static void resp_begin_html(int, const char *); static void resp_begin_http(int, const char *); + static void resp_copy(const char *); static void resp_end_html(void); static void resp_searchform(const struct req *); static void resp_show(const struct req *, const char *); *************** *** 366,371 **** --- 367,386 ---- } static void + resp_copy(const char *filename) + { + char buf[4096]; + ssize_t sz; + int fd; + + if ((fd = open(filename, O_RDONLY)) != -1) { + fflush(stdout); + while ((sz = read(fd, buf, sizeof(buf))) > 0) + write(STDOUT_FILENO, buf, sz); + } + } + + static void resp_begin_html(int code, const char *msg) { *************** *** 382,393 **** --- 397,412 ---- "\n" "\n", CSS_DIR, CUSTOMIZE_TITLE); + + resp_copy(MAN_DIR "/header.html"); } static void resp_end_html(void) { + resp_copy(MAN_DIR "/footer.html"); + puts("\n" ""); } *************** *** 397,403 **** { int i; - puts(CUSTOMIZE_BEGIN); puts(""); printf("
\n" "
\n" --- 416,421 ----