=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.47 retrieving revision 1.63 diff -u -p -r1.47 -r1.63 --- mandoc/cgi.c 2014/01/05 20:41:04 1.47 +++ mandoc/cgi.c 2014/07/11 22:27:35 1.63 @@ -1,6 +1,7 @@ -/* $Id: cgi.c,v 1.47 2014/01/05 20:41:04 schwarze Exp $ */ +/* $Id: cgi.c,v 1.63 2014/07/11 22:27:35 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons + * Copyright (c) 2014 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -18,43 +19,21 @@ #include "config.h" #endif -#include - -#include #include #include -#include #include #include -#include #include -#include -#include #include #include #include -#if defined(__sun) -/* for stat() */ -#include -#include -#include -#endif - -#include "apropos_db.h" #include "mandoc.h" -#include "mdoc.h" -#include "man.h" +#include "mandoc_aux.h" #include "main.h" #include "manpath.h" -#include "mandocdb.h" +#include "mansearch.h" -#if defined(__linux__) || defined(__sun) -# include -#else -# include -#endif - enum page { PAGE_INDEX, PAGE_SEARCH, @@ -62,30 +41,24 @@ enum page { PAGE__MAX }; -struct paths { - char *name; - char *path; -}; - /* * A query as passed to the search function. */ struct query { + const char *manpath; /* desired manual directory */ const char *arch; /* architecture */ const char *sec; /* manual section */ const char *expr; /* unparsed expression string */ - int manroot; /* manroot index (or -1)*/ int legacy; /* whether legacy mode */ }; struct req { - struct query q; - struct paths *p; - size_t psz; - enum page page; + struct query q; + char **p; /* array of available manpaths */ + size_t psz; /* number of available manpaths */ + enum page page; }; -static int atou(const char *, unsigned *); static void catman(const struct req *, const char *); static int cmp(const void *, const void *); static void format(const struct req *, const char *); @@ -97,26 +70,27 @@ static void http_parse(struct req *, char *); static void http_print(const char *); static void http_putchar(char); static void http_printquery(const struct req *); -static int pathstop(DIR *); -static void pathgen(DIR *, char *, struct req *); +static void pathgen(struct req *); static void pg_index(const struct req *, char *); static void pg_search(const struct req *, char *); static void pg_show(const struct req *, char *); -static void resp_bad(void); -static void resp_baddb(void); -static void resp_error400(void); -static void resp_error404(const char *); static void resp_begin_html(int, const char *); static void resp_begin_http(int, const char *); static void resp_end_html(void); +static void resp_error_badrequest(const char *); +static void resp_error_internal(void); +static void resp_error_notfound(const char *); static void resp_index(const struct req *); -static void resp_search(struct res *, size_t, void *); +static void resp_noresult(const struct req *, + const char *); +static void resp_search(const struct req *, + struct manpage *, size_t); static void resp_searchform(const struct req *); -static const char *progname; /* cgi script name */ -static const char *cache; /* cache directory */ -static const char *css; /* css directory */ -static const char *host; /* hostname */ +static const char *scriptname; /* CGI script name */ +static const char *mandir; /* contains all manpath directories */ +static const char *cssdir; /* css directory */ +static const char *httphost; /* hostname used in the URIs */ static const char * const pages[PAGE__MAX] = { "index", /* PAGE_INDEX */ @@ -125,29 +99,6 @@ static const char * const pages[PAGE__MAX] = { }; /* - * This is just OpenBSD's strtol(3) suggestion. - * I use it instead of strtonum(3) for portability's sake. - */ -static int -atou(const char *buf, unsigned *v) -{ - char *ep; - long lval; - - errno = 0; - lval = strtol(buf, &ep, 10); - if (buf[0] == '\0' || *ep != '\0') - return(0); - if ((errno == ERANGE && (lval == LONG_MAX || - lval == LONG_MIN)) || - (lval > INT_MAX || lval < 0)) - return(0); - - *v = (unsigned int)lval; - return(1); -} - -/* * Print a character, escaping HTML along the way. * This will pass non-ASCII straight to output: be warned! */ @@ -173,29 +124,49 @@ html_putchar(char c) break; } } + static void http_printquery(const struct req *req) { - printf("&expr="); - http_print(req->q.expr ? req->q.expr : ""); - printf("&sec="); - http_print(req->q.sec ? req->q.sec : ""); - printf("&arch="); - http_print(req->q.arch ? req->q.arch : ""); + if (NULL != req->q.manpath) { + printf("&manpath="); + http_print(req->q.manpath); + } + if (NULL != req->q.sec) { + printf("&sec="); + http_print(req->q.sec); + } + if (NULL != req->q.arch) { + printf("&arch="); + http_print(req->q.arch); + } + if (NULL != req->q.expr) { + printf("&expr="); + http_print(req->q.expr ? req->q.expr : ""); + } } - static void html_printquery(const struct req *req) { - printf("&expr="); - html_print(req->q.expr ? req->q.expr : ""); - printf("&sec="); - html_print(req->q.sec ? req->q.sec : ""); - printf("&arch="); - html_print(req->q.arch ? req->q.arch : ""); + if (NULL != req->q.manpath) { + printf("&manpath="); + html_print(req->q.manpath); + } + if (NULL != req->q.sec) { + printf("&sec="); + html_print(req->q.sec); + } + if (NULL != req->q.arch) { + printf("&arch="); + html_print(req->q.arch); + } + if (NULL != req->q.expr) { + printf("&expr="); + html_print(req->q.expr); + } } static void @@ -230,14 +201,13 @@ html_print(const char *p) static void http_parse(struct req *req, char *p) { - char *key, *val, *manroot; - int i, legacy; + char *key, *val; + int legacy; memset(&req->q, 0, sizeof(struct query)); + req->q.manpath = req->p[0]; legacy = -1; - manroot = NULL; - while ('\0' != *p) { key = p; val = NULL; @@ -269,7 +239,7 @@ http_parse(struct req *req, char *p) else if (0 == strcmp(key, "arch")) req->q.arch = val; else if (0 == strcmp(key, "manpath")) - manroot = val; + req->q.manpath = val; else if (0 == strcmp(key, "apropos")) legacy = 0 == strcmp(val, "0"); } @@ -289,15 +259,6 @@ http_parse(struct req *req, char *p) if (req->q.legacy && NULL != req->q.arch) if (0 == strcmp(req->q.arch, "default")) req->q.arch = NULL; - - /* Default to first manroot. */ - - if (NULL != manroot) { - for (i = 0; i < (int)req->psz; i++) - if (0 == strcmp(req->p[i].name, manroot)) - break; - req->q.manroot = i < (int)req->psz ? i : -1; - } } static void @@ -323,11 +284,13 @@ static int http_decode(char *p) { char hex[3]; + char *q; int c; hex[2] = '\0'; - for ( ; '\0' != *p; p++) { + q = p; + for ( ; '\0' != *p; p++, q++) { if ('%' == *p) { if ('\0' == (hex[0] = *(p + 1))) return(0); @@ -338,13 +301,13 @@ http_decode(char *p) if ('\0' == c) return(0); - *p = (char)c; - memmove(p + 1, p + 3, strlen(p + 3) + 1); + *q = (char)c; + p += 2; } else - *p = '+' == *p ? ' ' : *p; + *q = '+' == *p ? ' ' : *p; } - *p = '\0'; + *q = '\0'; return(1); } @@ -353,12 +316,12 @@ resp_begin_http(int code, const char *msg) { if (200 != code) - printf("Status: %d %s\n", code, msg); + printf("Status: %d %s\r\n", code, msg); - puts("Content-Type: text/html; charset=utf-8\n" - "Cache-Control: no-cache\n" - "Pragma: no-cache\n" - ""); + printf("Content-Type: text/html; charset=utf-8\r\n" + "Cache-Control: no-cache\r\n" + "Pragma: no-cache\r\n" + "\r\n"); fflush(stdout); } @@ -383,7 +346,8 @@ resp_begin_html(int code, const char *msg) "System Manpage Reference\n" "\n" "\n" - "\n", css, css); + "\n", + cssdir, cssdir); } static void @@ -401,13 +365,13 @@ resp_searchform(const struct req *req) puts(""); printf("
\n" - "
\n" + "\n" "
\n" "Search Parameters\n" " for manuals satisfying \n" + " VALUE=\"Search\"> for manuals matching \n" "q.expr ? req->q.expr : ""); printf("\">, section " "q.arch ? req->q.arch : ""); printf("\">"); if (req->psz > 1) { - puts(", "); for (i = 0; i < (int)req->psz; i++) { - printf(""); } puts(""); } - puts(".\n" + puts("—\n" "\n" "
\n" "
\n" @@ -445,26 +410,48 @@ resp_index(const struct req *req) { resp_begin_html(200, NULL); + puts("

\n" + "Online manuals with " + "mandoc\n" + "

"); resp_searchform(req); + puts("

\n" + "This web interface is documented in the " + "" + "man.cgi manual, and the " + "" + "apropos manual explains the query syntax.\n" + "

"); resp_end_html(); } static void -resp_error400(void) +resp_noresult(const struct req *req, const char *msg) { + resp_begin_html(200, NULL); + resp_searchform(req); + puts("

"); + puts(msg); + puts("

"); + resp_end_html(); +} - resp_begin_html(400, "Query Malformed"); - printf("

Malformed Query

\n" - "

\n" - "The query your entered was malformed.\n" - "Try again from the\n" - "main page.\n" - "

", progname); +static void +resp_error_badrequest(const char *msg) +{ + + resp_begin_html(400, "Bad Request"); + puts("

Bad Request

\n" + "

\n"); + puts(msg); + printf("Try again from the\n" + "main page.\n" + "

", scriptname); resp_end_html(); } static void -resp_error404(const char *page) +resp_error_notfound(const char *page) { resp_begin_html(404, "Not Found"); @@ -476,100 +463,58 @@ resp_error404(const char *page) printf(",\n" "could not be found.\n" "Try searching from the\n" - "main page.\n" - "

", progname); + "main page.\n" + "

", scriptname); resp_end_html(); } static void -resp_bad(void) +resp_error_internal(void) { resp_begin_html(500, "Internal Server Error"); - puts("

Generic badness happened.

"); + puts("

Internal Server Error

"); resp_end_html(); } static void -resp_baddb(void) +resp_search(const struct req *req, struct manpage *r, size_t sz) { + size_t i; - resp_begin_html(500, "Internal Server Error"); - puts("

Your database is broken.

"); - resp_end_html(); -} - -static void -resp_search(struct res *r, size_t sz, void *arg) -{ - size_t i, matched; - const struct req *req; - - req = (const struct req *)arg; - - if (sz > 0) - assert(req->q.manroot >= 0); - - for (matched = i = 0; i < sz; i++) - if (r[i].matched) - matched++; - - if (1 == matched) { - for (i = 0; i < sz; i++) - if (r[i].matched) - break; + if (1 == sz) { /* * If we have just one result, then jump there now * without any delay. */ - puts("Status: 303 See Other"); - printf("Location: http://%s%s/show/%d/%u/%u.html?", - host, progname, req->q.manroot, - r[i].volume, r[i].rec); + printf("Status: 303 See Other\r\n"); + printf("Location: http://%s%s/show/%s/%s?", + httphost, scriptname, req->q.manpath, r[0].file); http_printquery(req); - puts("\n" - "Content-Type: text/html; charset=utf-8\n"); + printf("\r\n" + "Content-Type: text/html; charset=utf-8\r\n" + "\r\n"); return; } + qsort(r, sz, sizeof(struct manpage), cmp); + resp_begin_html(200, NULL); resp_searchform(req); - puts("
"); - - if (0 == matched) { - puts("

\n" - "No results found.\n" - "

\n" - "
"); - resp_end_html(); - return; - } - - qsort(r, sz, sizeof(struct res), cmp); - puts(""); for (i = 0; i < sz; i++) { - if ( ! r[i].matched) - continue; printf("\n" "\n" "\n" ""); } @@ -597,7 +542,8 @@ catman(const struct req *req, const char *file) int italic, bold; if (NULL == (f = fopen(file, "r"))) { - resp_baddb(); + resp_error_badrequest( + "You specified an invalid manual file."); return; } @@ -735,27 +681,32 @@ format(const struct req *req, const char *file) char opts[PATH_MAX + 128]; if (-1 == (fd = open(file, O_RDONLY, 0))) { - resp_baddb(); + resp_error_badrequest( + "You specified an invalid manual file."); return; } - mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL, 0); + mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, + req->q.manpath); rc = mparse_readfd(mp, fd, file); close(fd); if (rc >= MANDOCLEVEL_FATAL) { - resp_baddb(); + fprintf(stderr, "fatal mandoc error: %s/%s\n", + req->q.manpath, file); + resp_error_internal(); return; } - snprintf(opts, sizeof(opts), "fragment," - "man=%s/search.html?sec=%%S&expr=Nm~^%%N$," - /*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/, - progname); + snprintf(opts, sizeof(opts), + "fragment,man=%s/search?sec=%%S&expr=Nm~^%%N$", + scriptname); - mparse_result(mp, &mdoc, &man); + mparse_result(mp, &mdoc, &man, NULL); if (NULL == man && NULL == mdoc) { - resp_baddb(); + fprintf(stderr, "fatal mandoc error: %s/%s\n", + req->q.manpath, file); + resp_error_internal(); mparse_free(mp); return; } @@ -780,162 +731,78 @@ format(const struct req *req, const char *file) static void pg_show(const struct req *req, char *path) { - struct manpaths ps; - size_t sz; char *sub; - char file[PATH_MAX]; - const char *cp; - int rc, catm; - unsigned int vol, rec, mr; - DB *idx; - DBT key, val; - idx = NULL; - - /* Parse out mroot, volume, and record from the path. */ - if (NULL == path || NULL == (sub = strchr(path, '/'))) { - resp_error400(); + resp_error_badrequest( + "You did not specify a page to show."); return; } *sub++ = '\0'; - if ( ! atou(path, &mr)) { - resp_error400(); - return; - } - path = sub; - if (NULL == (sub = strchr(path, '/'))) { - resp_error400(); - return; - } - *sub++ = '\0'; - if ( ! atou(path, &vol) || ! atou(sub, &rec)) { - resp_error400(); - return; - } else if (mr >= (unsigned int)req->psz) { - resp_error400(); - return; - } /* - * Begin by chdir()ing into the manroot. + * Begin by chdir()ing into the manpath. * This way we can pick up the database files, which are * relative to the manpath root. */ - if (-1 == chdir(req->p[(int)mr].path)) { - perror(req->p[(int)mr].path); - resp_baddb(); + if (-1 == chdir(path)) { + resp_error_badrequest( + "You specified an invalid manpath."); return; } - memset(&ps, 0, sizeof(struct manpaths)); - manpath_manconf(&ps, "etc/catman.conf"); - - if (vol >= (unsigned int)ps.sz) { - resp_error400(); - goto out; - } - - sz = strlcpy(file, ps.paths[vol], PATH_MAX); - assert(sz < PATH_MAX); - strlcat(file, "/", PATH_MAX); - strlcat(file, MANDOC_IDX, PATH_MAX); - - /* Open the index recno(3) database. */ - - idx = dbopen(file, O_RDONLY, 0, DB_RECNO, NULL); - if (NULL == idx) { - perror(file); - resp_baddb(); - goto out; - } - - key.data = &rec; - key.size = 4; - - if (0 != (rc = (*idx->get)(idx, &key, &val, 0))) { - rc < 0 ? resp_baddb() : resp_error400(); - goto out; - } else if (0 == val.size) { - resp_baddb(); - goto out; - } - - cp = (char *)val.data; - catm = 'c' == *cp++; - - if (NULL == memchr(cp, '\0', val.size - 1)) - resp_baddb(); - else { - file[(int)sz] = '\0'; - strlcat(file, "/", PATH_MAX); - strlcat(file, cp, PATH_MAX); - if (catm) - catman(req, file); - else - format(req, file); - } -out: - if (idx) - (*idx->close)(idx); - manpath_free(&ps); + if ('c' == *sub) + catman(req, sub); + else + format(req, sub); } static void pg_search(const struct req *req, char *path) { - size_t tt, ressz; - struct manpaths ps; - int i, sz, rc; - const char *ep, *start; - struct res *res; - char **cp; - struct opts opt; - struct expr *expr; + struct mansearch search; + struct manpaths paths; + struct manpage *res; + char **cp; + const char *ep, *start; + size_t ressz; + int i, sz; - if (req->q.manroot < 0 || 0 == req->psz) { - resp_search(NULL, 0, (void *)req); - return; - } - - memset(&opt, 0, sizeof(struct opts)); - - ep = req->q.expr; - opt.arch = req->q.arch; - opt.cat = req->q.sec; - rc = -1; - sz = 0; - cp = NULL; - ressz = 0; - res = NULL; - /* * Begin by chdir()ing into the root of the manpath. * This way we can pick up the database files, which are * relative to the manpath root. */ - assert(req->q.manroot < (int)req->psz); - if (-1 == (chdir(req->p[req->q.manroot].path))) { - perror(req->p[req->q.manroot].path); - resp_search(NULL, 0, (void *)req); + if (-1 == (chdir(req->q.manpath))) { + resp_error_badrequest( + "You specified an invalid manpath."); return; } - memset(&ps, 0, sizeof(struct manpaths)); - manpath_manconf(&ps, "etc/catman.conf"); + search.arch = req->q.arch; + search.sec = req->q.sec; + search.deftype = TYPE_Nm | TYPE_Nd; + search.flags = 0; + paths.sz = 1; + paths.paths = mandoc_malloc(sizeof(char *)); + paths.paths[0] = mandoc_strdup("."); + /* * Poor man's tokenisation: just break apart by spaces. * Yes, this is half-ass. But it works for now. */ + ep = req->q.expr; while (ep && isspace((unsigned char)*ep)) ep++; + sz = 0; + cp = NULL; while (ep && '\0' != *ep) { - cp = mandoc_realloc(cp, (sz + 1) * sizeof(char *)); + cp = mandoc_reallocarray(cp, sz + 1, sizeof(char *)); start = ep; while ('\0' != *ep && ! isspace((unsigned char)*ep)) ep++; @@ -946,84 +813,69 @@ pg_search(const struct req *req, char *path) ep++; } - /* - * Pump down into apropos backend. - * The resp_search() function is called with the results. - */ + if (0 == mansearch(&search, &paths, sz, cp, "Nd", &res, &ressz)) + resp_noresult(req, "You entered an invalid query."); + else if (0 == ressz) + resp_noresult(req, "No results found."); + else + resp_search(req, res, ressz); - expr = req->q.legacy ? - termcomp(sz, cp, &tt) : exprcomp(sz, cp, &tt); - - if (NULL != expr) - rc = apropos_search - (ps.sz, ps.paths, &opt, expr, tt, - (void *)req, &ressz, &res, resp_search); - - /* ...unless errors occured. */ - - if (0 == rc) - resp_baddb(); - else if (-1 == rc) - resp_search(NULL, 0, NULL); - for (i = 0; i < sz; i++) free(cp[i]); - free(cp); - resfree(res, ressz); - exprfree(expr); - manpath_free(&ps); + + for (i = 0; i < (int)ressz; i++) { + free(res[i].file); + free(res[i].names); + free(res[i].output); + } + free(res); + + free(paths.paths[0]); + free(paths.paths); } int main(void) { int i; - char buf[PATH_MAX]; - DIR *cwd; struct req req; - char *p, *path, *subpath; + char *querystring, *path, *subpath; /* Scan our run-time environment. */ - if (NULL == (cache = getenv("CACHE_DIR"))) - cache = "/cache/man.cgi"; + if (NULL == (mandir = getenv("MAN_DIR"))) + mandir = "/man"; - if (NULL == (progname = getenv("SCRIPT_NAME"))) - progname = ""; + if (NULL == (scriptname = getenv("SCRIPT_NAME"))) + scriptname = ""; - if (NULL == (css = getenv("CSS_DIR"))) - css = ""; + if (NULL == (cssdir = getenv("CSS_DIR"))) + cssdir = ""; - if (NULL == (host = getenv("HTTP_HOST"))) - host = "localhost"; + if (NULL == (httphost = getenv("HTTP_HOST"))) + httphost = "localhost"; /* - * First we change directory into the cache directory so that + * First we change directory into the mandir so that * subsequent scanning for manpath directories is rooted * relative to the same position. */ - if (-1 == chdir(cache)) { - perror(cache); - resp_bad(); + if (-1 == chdir(mandir)) { + fprintf(stderr, "MAN_DIR: %s: %s\n", + mandir, strerror(errno)); + resp_error_internal(); return(EXIT_FAILURE); - } else if (NULL == (cwd = opendir(cache))) { - perror(cache); - resp_bad(); - return(EXIT_FAILURE); } memset(&req, 0, sizeof(struct req)); + pathgen(&req); - strlcpy(buf, ".", PATH_MAX); - pathgen(cwd, buf, &req); - closedir(cwd); - /* Next parse out the query string. */ - if (NULL != (p = getenv("QUERY_STRING"))) - http_parse(&req, p); + if (NULL != (querystring = getenv("QUERY_STRING"))) + http_parse(&req, querystring); /* * Now juggle paths to extract information. @@ -1041,12 +893,6 @@ main(void) if (NULL != path && '/' == *path && '\0' == *++path) req.page = PAGE_INDEX; - /* Strip file suffix. */ - - if (NULL != path && NULL != (p = strrchr(path, '.'))) - if (NULL != p && NULL == strchr(p, '/')) - *p++ = '\0'; - /* Resolve subpath component. */ if (NULL != path && NULL != (subpath = strchr(path, '/'))) @@ -1074,15 +920,12 @@ main(void) pg_show(&req, subpath); break; default: - resp_error404(path); + resp_error_notfound(path); break; } - for (i = 0; i < (int)req.psz; i++) { - free(req.p[i].path); - free(req.p[i].name); - } - + for (i = 0; i < (int)req.psz; i++) + free(req.p[i]); free(req.p); return(EXIT_SUCCESS); } @@ -1091,143 +934,28 @@ static int cmp(const void *p1, const void *p2) { - return(strcasecmp(((const struct res *)p1)->title, - ((const struct res *)p2)->title)); + return(strcasecmp(((const struct manpage *)p1)->names, + ((const struct manpage *)p2)->names)); } /* - * Check to see if an "etc" path consists of a catman.conf file. If it - * does, that means that the path contains a tree created by catman(8) - * and should be used for indexing. - */ -static int -pathstop(DIR *dir) -{ - struct dirent *d; -#if defined(__sun) - struct stat sb; -#endif - - while (NULL != (d = readdir(dir))) { -#if defined(__sun) - stat(d->d_name, &sb); - if (S_IFREG & sb.st_mode) -#else - if (DT_REG == d->d_type) -#endif - if (0 == strcmp(d->d_name, "catman.conf")) - return(1); - } - - return(0); -} - -/* * Scan for indexable paths. - * This adds all paths with "etc/catman.conf" to the buffer. */ static void -pathgen(DIR *dir, char *path, struct req *req) +pathgen(struct req *req) { - struct dirent *d; - char *cp; - DIR *cd; - int rc; - size_t sz, ssz; -#if defined(__sun) - struct stat sb; -#endif + FILE *fp; + char *dp; + size_t dpsz; - sz = strlcat(path, "/", PATH_MAX); - if (sz >= PATH_MAX) { - fprintf(stderr, "%s: Path too long", path); + if (NULL == (fp = fopen("manpath.conf", "r"))) return; - } - /* - * First, scan for the "etc" directory. - * If it's found, then see if it should cause us to stop. This - * happens when a catman.conf is found in the directory. - */ - - rc = 0; - while (0 == rc && NULL != (d = readdir(dir))) { -#if defined(__sun) - stat(d->d_name, &sb); - if (!(S_IFDIR & sb.st_mode) -#else - if (DT_DIR != d->d_type -#endif - || strcmp(d->d_name, "etc")) - continue; - - path[(int)sz] = '\0'; - ssz = strlcat(path, d->d_name, PATH_MAX); - - if (ssz >= PATH_MAX) { - fprintf(stderr, "%s: Path too long", path); - return; - } else if (NULL == (cd = opendir(path))) { - perror(path); - return; - } - - rc = pathstop(cd); - closedir(cd); - } - - if (rc > 0) { - /* This also strips the trailing slash. */ - path[(int)--sz] = '\0'; - req->p = mandoc_realloc - (req->p, - (req->psz + 1) * sizeof(struct paths)); - /* - * Strip out the leading "./" unless we're just a ".", - * in which case use an empty string as our name. - */ - req->p[(int)req->psz].path = mandoc_strdup(path); - req->p[(int)req->psz].name = - cp = mandoc_strdup(path + (1 == sz ? 1 : 2)); - req->psz++; - /* - * The name is just the path with all the slashes taken - * out of it. Simple but effective. - */ - for ( ; '\0' != *cp; cp++) - if ('/' == *cp) - *cp = ' '; - return; - } - - /* - * If no etc/catman.conf was found, recursively enter child - * directory and continue scanning. - */ - - rewinddir(dir); - while (NULL != (d = readdir(dir))) { -#if defined(__sun) - stat(d->d_name, &sb); - if (!(S_IFDIR & sb.st_mode) -#else - if (DT_DIR != d->d_type -#endif - || '.' == d->d_name[0]) - continue; - - path[(int)sz] = '\0'; - ssz = strlcat(path, d->d_name, PATH_MAX); - - if (ssz >= PATH_MAX) { - fprintf(stderr, "%s: Path too long", path); - return; - } else if (NULL == (cd = opendir(path))) { - perror(path); - return; - } - - pathgen(cd, path, req); - closedir(cd); + while (NULL != (dp = fgetln(fp, &dpsz))) { + if ('\n' == dp[dpsz - 1]) + dpsz--; + req->p = mandoc_realloc(req->p, + (req->psz + 1) * sizeof(char *)); + req->p[req->psz++] = mandoc_strndup(dp, dpsz); } }
\n" - "q.manroot, - r[i].volume, r[i].rec); + "q.manpath, r[i].file); html_printquery(req); printf("\">"); - html_print(r[i].title); - putchar('('); - html_print(r[i].cat); - if (r[i].arch && '\0' != *r[i].arch) { - putchar('/'); - html_print(r[i].arch); - } - printf(")\n" + html_print(r[i].names); + printf("\n" ""); - html_print(r[i].desc); + html_print(r[i].output); puts("