diff options
| -rw-r--r-- | catman.c | 49 | ||||
| -rw-r--r-- | cgi.c | 13 | ||||
| -rw-r--r-- | mandocdb.8 | 6 | ||||
| -rw-r--r-- | mandocdb.c | 78 |
4 files changed, 72 insertions, 74 deletions
@@ -1,4 +1,4 @@ -/* $Id: catman.c,v 1.5 2011/12/12 02:00:49 schwarze Exp $ */ +/* $Id: catman.c,v 1.6 2011/12/16 08:04:34 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -51,11 +51,11 @@ exit(EXIT_FAILURE); \ } while (/* CONSTCOND */0) -static int indexhtml(char *, char *); +static int indexhtml(char *, size_t, char *, size_t); static int manup(const struct manpaths *, char *); static int mkpath(char *, mode_t, mode_t); -static int treecpy(char *, char *, char *); -static int update(char *, char *, char *); +static int treecpy(char *, char *); +static int update(char *, char *); static void usage(void); static const char *progname; @@ -198,11 +198,10 @@ out: * Returns -1 on fatal error, 1 on success. */ static int -indexhtml(char *base, char *dst) +indexhtml(char *src, size_t ssz, char *dst, size_t dsz) { DB *idx; DBT key, val; - size_t sz; int c, rc; unsigned int fl; const char *f, *cp; @@ -210,7 +209,6 @@ indexhtml(char *base, char *dst) char fname[MAXPATHLEN]; pid_t pid; - sz = strlen(base); pid = -1; xstrlcpy(fname, dst, MAXPATHLEN); @@ -235,32 +233,35 @@ indexhtml(char *base, char *dst) if (NULL == memchr(f, '\0', val.size - (f - cp))) break; - base[(int)sz] = '\0'; + src[(int)ssz] = dst[(int)dsz] = '\0'; + + xstrlcat(dst, "/", MAXPATHLEN); + xstrlcat(dst, f, MAXPATHLEN); - xstrlcat(base, "/", MAXPATHLEN); - xstrlcat(base, f, MAXPATHLEN); + xstrlcat(src, "/", MAXPATHLEN); + xstrlcat(src, f, MAXPATHLEN); - if (-1 == (rc = isnewer(base, f))) { + if (-1 == (rc = isnewer(dst, src))) { fprintf(stderr, "%s: File missing\n", f); break; } else if (0 == rc) continue; - d = strrchr(base, '/'); + d = strrchr(dst, '/'); assert(NULL != d); *d = '\0'; - if (-1 == mkpath(base, 0755, 0755)) { - perror(base); + if (-1 == mkpath(dst, 0755, 0755)) { + perror(dst); break; } *d = '/'; - if ( ! filecpy(base, f)) + if ( ! filecpy(dst, src)) break; if (verbose) - printf("%s\n", base); + printf("%s\n", dst); } (*idx->close)(idx); @@ -279,7 +280,7 @@ indexhtml(char *base, char *dst) * Return -1 on fatal error and 1 if the update went well. */ static int -update(char *base, char *dst, char *src) +update(char *dst, char *src) { size_t dsz, ssz; @@ -304,9 +305,9 @@ update(char *base, char *dst, char *src) if (verbose) printf("%s\n", dst); - dst[(int)dsz] = '\0'; + dst[(int)dsz] = src[(int)ssz] = '\0'; - return(indexhtml(base, dst)); + return(indexhtml(src, ssz, dst, dsz)); } /* @@ -316,7 +317,7 @@ update(char *base, char *dst, char *src) * shouldn't be listed), and 1 if the update went well. */ static int -treecpy(char *base, char *dst, char *src) +treecpy(char *dst, char *src) { size_t dsz, ssz; int rc; @@ -333,7 +334,7 @@ treecpy(char *base, char *dst, char *src) dst[(int)dsz] = src[(int)ssz] = '\0'; if (1 == rc) - return(update(base, dst, src)); + return(update(dst, src)); xstrlcat(src, "/mandoc.db", MAXPATHLEN); xstrlcat(dst, "/mandoc.db", MAXPATHLEN); @@ -345,7 +346,7 @@ treecpy(char *base, char *dst, char *src) dst[(int)dsz] = src[(int)ssz] = '\0'; - return(update(base, dst, src)); + return(update(dst, src)); } /* @@ -383,7 +384,7 @@ manup(const struct manpaths *dirs, char *base) for (i = 0; i < dirs->sz; i++) { path = dirs->paths[i]; - dst[(int)sz] = base[(int)sz] = '\0'; + dst[(int)sz] = '\0'; xstrlcat(dst, path, MAXPATHLEN); if (-1 == mkpath(dst, 0755, 0755)) { perror(dst); @@ -391,7 +392,7 @@ manup(const struct manpaths *dirs, char *base) } xstrlcpy(src, path, MAXPATHLEN); - if (-1 == (c = treecpy(base, dst, src))) + if (-1 == (c = treecpy(dst, src))) break; else if (0 == c) continue; @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.33 2011/12/15 12:18:57 kristaps Exp $ */ +/* $Id: cgi.c,v 1.34 2011/12/16 08:04:34 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -749,6 +749,7 @@ static void pg_show(const struct req *req, char *path) { struct manpaths ps; + size_t sz; char *sub; char file[MAXPATHLEN]; const char *fn, *cp; @@ -804,7 +805,8 @@ pg_show(const struct req *req, char *path) goto out; } - strlcpy(file, ps.paths[vol], MAXPATHLEN); + sz = strlcpy(file, ps.paths[vol], MAXPATHLEN); + assert(sz < MAXPATHLEN); strlcat(file, "/mandoc.index", MAXPATHLEN); /* Open the index recno(3) database. */ @@ -833,10 +835,13 @@ pg_show(const struct req *req, char *path) else if (NULL == memchr(fn, '\0', val.size - (fn - cp))) resp_baddb(); else { + file[(int)sz] = '\0'; + strlcat(file, "/", MAXPATHLEN); + strlcat(file, fn, MAXPATHLEN); if (0 == strcmp(cp, "cat")) - catman(req, fn + 1); + catman(req, file); else - format(req, fn + 1); + format(req, file); } out: if (idx) @@ -1,4 +1,4 @@ -.\" $Id: mandocdb.8,v 1.12 2011/12/12 02:00:49 schwarze Exp $ +.\" $Id: mandocdb.8,v 1.13 2011/12/16 08:04:34 kristaps Exp $ .\" .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: December 12 2011 $ +.Dd $Mdocdate: December 16 2011 $ .Dt MANDOCDB 8 .Os .Sh NAME @@ -123,7 +123,7 @@ file in and post-formatted, respectively .Pc , .It -the filename, +the filename relative to the databases' path, .It the manual section, .It @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.34 2011/12/12 02:00:49 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.35 2011/12/16 08:04:34 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -21,7 +21,6 @@ #include <sys/param.h> #include <sys/types.h> -#include <sys/stat.h> #include <assert.h> #include <dirent.h> @@ -110,7 +109,7 @@ static void index_prune(const struct of *, DB *, recno_t *, recno_t **, size_t *, size_t *); static void ofile_argbuild(int, char *[], struct of **); -static int ofile_dirbuild(const char *, const char *, +static void ofile_dirbuild(const char *, const char *, const char *, int, struct of **); static void ofile_free(struct of *); static void pformatted(DB *, struct buf *, struct buf *, @@ -384,12 +383,8 @@ main(int argc, char *argv[]) exit((int)MANDOCLEVEL_SYSERR); } - if (verb > 2) { - printf("%s: Opened\n", fbuf); - printf("%s: Opened\n", ibuf); - } - ofile_argbuild(argc, argv, &of); + if (NULL == of) goto out; @@ -399,13 +394,16 @@ main(int argc, char *argv[]) &maxrec, &recs, &recsz, &reccur); /* - * Go to the root of the respective manual tree - * such that .so links work. In case of failure, - * just prod on, even though .so links won't work. + * Go to the root of the respective manual tree. + * This must work or no manuals may be found (they're + * indexed relative to the root). */ if (OP_UPDATE == op) { - chdir(dir); + if (-1 == chdir(dir)) { + perror(dir); + exit((int)MANDOCLEVEL_SYSERR); + } index_merge(of, mp, &dbuf, &buf, hash, db, fbuf, idx, ibuf, maxrec, recs, reccur); @@ -466,17 +464,15 @@ main(int argc, char *argv[]) exit((int)MANDOCLEVEL_SYSERR); } - if (verb > 2) { - printf("%s: Truncated\n", fbuf); - printf("%s: Truncated\n", ibuf); - } - ofile_free(of); of = NULL; - if ( ! ofile_dirbuild(dirs.paths[i], NULL, NULL, - 0, &of)) + if (-1 == chdir(dirs.paths[i])) { + perror(dirs.paths[i]); exit((int)MANDOCLEVEL_SYSERR); + } + + ofile_dirbuild(".", NULL, NULL, 0, &of); if (NULL == of) continue; @@ -484,12 +480,16 @@ main(int argc, char *argv[]) of = of->first; /* - * Go to the root of the respective manual tree - * such that .so links work. In case of failure, - * just prod on, even though .so links won't work. + * Go to the root of the respective manual tree. + * This must work or no manuals may be found (they're + * indexed relative to the root). */ - chdir(dirs.paths[i]); + if (-1 == chdir(dirs.paths[i])) { + perror(dirs.paths[i]); + exit((int)MANDOCLEVEL_SYSERR); + } + index_merge(of, mp, &dbuf, &buf, hash, db, fbuf, idx, ibuf, maxrec, recs, reccur); } @@ -1434,8 +1434,6 @@ ofile_argbuild(int argc, char *argv[], struct of **of) * Add the structure to the list. */ - if (verb > 2) - printf("%s: Scheduling\n", argv[i]); if (NULL == *of) { *of = nof; (*of)->first = nof; @@ -1455,12 +1453,11 @@ ofile_argbuild(int argc, char *argv[], struct of **of) * everything else is a manual. * Pass in a pointer to a NULL structure for the first invocation. */ -static int +static void ofile_dirbuild(const char *dir, const char* psec, const char *parch, int p_src_form, struct of **of) { char buf[MAXPATHLEN]; - struct stat sb; size_t sz; DIR *d; const char *fn, *sec, *arch; @@ -1471,7 +1468,7 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch, if (NULL == (d = opendir(dir))) { perror(dir); - return(0); + exit((int)MANDOCLEVEL_SYSERR); } while (NULL != (dp = readdir(d))) { @@ -1516,20 +1513,16 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch, if (MAXPATHLEN <= sz) { fprintf(stderr, "%s: Path too long\n", dir); - return(0); + exit((int)MANDOCLEVEL_SYSERR); } - if (verb > 2) - printf("%s: Scanning\n", buf); - - if ( ! ofile_dirbuild(buf, sec, arch, - src_form, of)) - return(0); + ofile_dirbuild(buf, sec, arch, src_form, of); } + if (DT_REG != dp->d_type || - (NULL == psec && !use_all) || - !strcmp(MANDOC_DB, fn) || - !strcmp(MANDOC_IDX, fn)) + (NULL == psec && !use_all) || + ! strcmp(MANDOC_DB, fn) || + ! strcmp(MANDOC_IDX, fn)) continue; /* @@ -1593,13 +1586,15 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch, "%s: Path too long\n", buf); continue; } - if (0 == stat(buf, &sb)) + if (0 == access(buf, R_OK)) continue; } } + assert('.' == dir[0]); + assert('/' == dir[1]); buf[0] = '\0'; - strlcat(buf, dir, MAXPATHLEN); + strlcat(buf, dir + 2, MAXPATHLEN); strlcat(buf, "/", MAXPATHLEN); sz = strlcat(buf, fn, MAXPATHLEN); if (sz >= MAXPATHLEN) { @@ -1628,8 +1623,6 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch, * Add the structure to the list. */ - if (verb > 2) - printf("%s: Scheduling\n", buf); if (NULL == *of) { *of = nof; (*of)->first = nof; @@ -1641,7 +1634,6 @@ ofile_dirbuild(const char *dir, const char* psec, const char *parch, } closedir(d); - return(1); } static void |