=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- mandoc/cgi.c 2011/12/07 15:12:34 1.13 +++ mandoc/cgi.c 2011/12/07 15:55:06 1.14 @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.13 2011/12/07 15:12:34 kristaps Exp $ */ +/* $Id: cgi.c,v 1.14 2011/12/07 15:55:06 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -295,8 +295,8 @@ resp_begin_html(int code, const char *msg) " \"http://www.w3.org/TR/html4/strict.dtd\">" "\n" "" "\n" " " "\n" - " " "\n" + " " "\n" " " "\n" " System Manpage Reference" "\n" @@ -339,21 +339,20 @@ resp_searchform(const struct req *req) printf("
\n"); - puts("
\n" - " or \n" - " for manuals satisfying \n" - "\n" + " or \n" + " for manuals satisfying \n" + ", section " - ", section " + ", arch " - ", arch " + ".\n" "\n" @@ -424,6 +423,7 @@ static void resp_search(struct res *r, size_t sz, void *arg) { int i; + char *cp; if (1 == sz) { /* @@ -441,23 +441,30 @@ resp_search(struct res *r, size_t sz, void *arg) resp_begin_html(200, NULL); resp_searchform((const struct req *)arg); - if (0 == sz) + if (0 == sz) { puts("

No results found.

"); + resp_end_html(); + return; + } + puts("

\n" + ""); + for (i = 0; i < (int)sz; i++) { - printf("

"); } resp_end_html();
", r[i].volume, r[i].rec); - html_print(r[i].title); + for (cp = r[i].title; '\0' != *cp; cp++) + html_putchar(toupper((unsigned char)*cp)); putchar('('); html_print(r[i].cat); if (r[i].arch && '\0' != *r[i].arch) { putchar('/'); html_print(r[i].arch); } - printf(") "); + printf(")"); html_print(r[i].desc); - puts("

"); + puts("