diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2014-09-01 22:45:53 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-09-01 22:45:53 +0000 |
| commit | 34f785b90475baa4a0b2012afc259927b0484605 (patch) | |
| tree | 672023130caf49797bf4f1aefc8daca9e9292329 | |
| parent | 24387bf29bff146c16b4c293b9c384cb99730d62 (diff) | |
| download | mandoc-34f785b90475baa4a0b2012afc259927b0484605.tar.gz | |
In man(1) mode, change to the right directory before starting the parser,
just like traditional man(1) does, such that .so links have a chance to
work. After this point, we don't need the current directory for anything
else before exit, so we don't need to worry about getting back and we can
safely ignore failure.
| -rw-r--r-- | main.c | 8 | ||||
| -rw-r--r-- | mansearch.c | 1 | ||||
| -rw-r--r-- | mansearch.h | 1 |
3 files changed, 7 insertions, 3 deletions
@@ -284,7 +284,6 @@ main(int argc, char *argv[]) mansearch_setup(1); if( ! mansearch(&search, &paths, argc, argv, &res, &sz)) usage(search.argmode); - manpath_free(&paths); resp = res; if (sz == 0) { @@ -367,9 +366,11 @@ main(int argc, char *argv[]) while (argc) { #if HAVE_SQLITE3 if (resp != NULL) { - if (resp->form) + if (resp->form) { + /* For .so only; ignore failure. */ + chdir(paths.paths[resp->ipath]); parse(&curp, -1, resp->file, &rc); - else + } else rc = passthrough(resp->file); resp++; } else @@ -388,6 +389,7 @@ main(int argc, char *argv[]) #if HAVE_SQLITE3 out: if (search.argmode != ARG_FILE) { + manpath_free(&paths); mansearch_free(res, sz); mansearch_setup(0); } diff --git a/mansearch.c b/mansearch.c index 82518001..4455dc11 100644 --- a/mansearch.c +++ b/mansearch.c @@ -335,6 +335,7 @@ mansearch(const struct mansearch *search, maxres, sizeof(struct manpage)); } mpage = *res + cur; + mpage->ipath = i; mpage->sec = 10; mpage->form = mp->form; buildnames(mpage, db, s, mp->pageid, diff --git a/mansearch.h b/mansearch.h index d36173fd..80c9e6a7 100644 --- a/mansearch.h +++ b/mansearch.h @@ -79,6 +79,7 @@ struct manpage { char *file; /* to be prefixed by manpath */ char *names; /* a list of names with sections */ char *output; /* user-defined additional output */ + size_t ipath; /* number of the manpath */ int sec; /* section number, 10 means invalid */ int form; /* 0 == catpage */ }; |