1 files changed, 5 insertions, 3 deletions
diff --git a/main.c b/main.c
index a628cd86..4c71266f 100644
--- a/main.c
+++ b/main.c
@@ -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);
 	}