From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s3FNpdn9014366
	for <source@mdocml.bsd.lv>; Tue, 15 Apr 2014 19:51:39 -0400 (EDT)
Received: (from schwarze@localhost)
	by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s3FNpdmc030820;
	Tue, 15 Apr 2014 19:51:39 -0400 (EDT)
Date: Tue, 15 Apr 2014 19:51:39 -0400 (EDT)
Message-Id: <201404152351.s3FNpdmc030820@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Oops, sorry, revert previous and commit the correct patch: At 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Oops, sorry, revert previous and commit the correct patch:
At the end of mansearch(), fchdir() back to where we started from.

Modified Files:
--------------
    mdocml:
        mansearch.c

Revision Data
-------------
Index: mansearch.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mansearch.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lmansearch.c -Lmansearch.c -u -p -r1.29 -r1.30
--- mansearch.c
+++ mansearch.c
@@ -210,7 +210,7 @@ mansearch(const struct mansearch *search
 	 */
 
 	if (NULL == getcwd(buf, PATH_MAX)) {
-		perror(NULL);
+		perror("getcwd");
 		goto out;
 	} else if (-1 == (fd = open(buf, O_RDONLY, 0))) {
 		perror(buf);
@@ -218,7 +218,6 @@ mansearch(const struct mansearch *search
 	}
 
 	sql = sql_statement(e);
-	printf("%s\n", sql);
 
 	/*
 	 * Loop over the directories (containing databases) for us to
@@ -348,9 +347,12 @@ mansearch(const struct mansearch *search
 	}
 	rc = 1;
 out:
-	exprfree(e);
-	if (-1 != fd)
+	if (-1 != fd) {
+		if (-1 == fchdir(fd))
+			perror(buf);
 		close(fd);
+	}
+	exprfree(e);
 	free(sql);
 	*sz = cur;
 	return(rc);
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv