From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from scc-mailout.scc.kit.edu (scc-mailout.scc.kit.edu [129.13.185.202]) by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id pAS19ItX003134 for ; Sun, 27 Nov 2011 20:09:18 -0500 (EST) Received: from hekate.usta.de (asta-nat.asta.uni-karlsruhe.de [172.22.63.82]) by scc-mailout-02.scc.kit.edu with esmtp (Exim 4.72 #1) id 1RUpif-0007Da-Ea; Mon, 28 Nov 2011 02:09:17 +0100 Received: from donnerwolke.usta.de ([172.24.96.3]) by hekate.usta.de with esmtp (Exim 4.72) (envelope-from ) id 1RUpif-00034X-H6 for tech@mdocml.bsd.lv; Mon, 28 Nov 2011 02:09:17 +0100 Received: from iris.usta.de ([172.24.96.5] helo=usta.de) by donnerwolke.usta.de with esmtp (Exim 4.72) (envelope-from ) id 1RUpif-0004y1-G4 for tech@mdocml.bsd.lv; Mon, 28 Nov 2011 02:09:17 +0100 Received: from schwarze by usta.de with local (Exim 4.72) (envelope-from ) id 1RUpif-0005Dq-FG for tech@mdocml.bsd.lv; Mon, 28 Nov 2011 02:09:17 +0100 Date: Mon, 28 Nov 2011 02:09:17 +0100 From: Ingo Schwarze To: tech@mdocml.bsd.lv Subject: put back the chdir(2) in mandocdb(8) Message-ID: <20111128010917.GC15140@iris.usta.de> X-Mailinglist: mdocml-tech Reply-To: tech@mdocml.bsd.lv MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) OK to merge to bsd.lv? ----- Forwarded message from Ingo Schwarze ----- From: Ingo Schwarze Date: Sun, 27 Nov 2011 17:57:28 -0700 (MST) To: source-changes@cvs.openbsd.org Subject: CVS: cvs.openbsd.org: src CVSROOT: /cvs Module name: src Changes by: schwarze@cvs.openbsd.org 2011/11/27 17:57:28 Modified files: usr.bin/mandoc : mandocdb.c Log message: Put back the chdir(2) to the right man page tree before parsing manuals; this got lost during the bsd.lv sync in rev. 1.10; oops. This is required for processing .so links: otherwise, several files in Xenocara fail to parse and cause ugly complaints instead. ----- End forwarded message ----- Index: mandocdb.c =================================================================== RCS file: /cvs/src/usr.bin/mandoc/mandocdb.c,v retrieving revision 1.13 diff -u -p -r1.13 mandocdb.c --- mandocdb.c 27 Nov 2011 23:27:16 -0000 1.13 +++ mandocdb.c 28 Nov 2011 00:51:51 -0000 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "man.h" @@ -374,10 +375,12 @@ mandocdb(int argc, char *argv[]) index_prune(of, db, fbuf, idx, ibuf, &maxrec, &recs, &recsz); - if (OP_UPDATE == op) + if (OP_UPDATE == op) { + chdir(dir); index_merge(of, mp, &dbuf, &buf, hash, db, fbuf, idx, ibuf, maxrec, recs, reccur); + } goto out; } @@ -446,6 +449,7 @@ mandocdb(int argc, char *argv[]) of = of->first; + chdir(dirs.paths[i]); index_merge(of, mp, &dbuf, &buf, hash, db, fbuf, idx, ibuf, maxrec, recs, reccur); } -- To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv