* mdocml: Fix a regression caused in rev.
@ 2015-03-10 3:02 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2015-03-10 3:02 UTC (permalink / raw)
To: source
Log Message:
-----------
Fix a regression caused in rev. 1.212, reported by kristaps@:
When using a pager and the first manual shown is gzip'ed,
the gunzip(1) process ended up as a child of the pager process
such that the man(1) process couldn't wait for it, preventing
proper display of the manual.
Solve this by making the pager a child of the man(1) process
(instead of the other way round), which requires being a bit
more careful about properly closing file descriptors after use
and waiting for the pager before exiting man(1).
Modified Files:
--------------
mdocml:
main.c
Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -Lmain.c -Lmain.c -u -p -r1.223 -r1.224
--- main.c
+++ main.c
@@ -20,6 +20,7 @@
#include <sys/types.h>
#include <sys/param.h> /* MACHINE */
+#include <sys/wait.h>
#include <assert.h>
#include <ctype.h>
@@ -481,6 +482,21 @@ out:
free(defos);
+ /*
+ * Flush the output and signal end of file.
+ * If a pager is attached, it allows browsing to the end.
+ * Otherwise, it does no harm, we are about to exit anyway.
+ */
+
+ fclose(stdout);
+
+ /*
+ * If we spawned a pager, wait for the user to close it.
+ * Otherwise, this call fails with no adverse effect.
+ */
+
+ wait(NULL);
+
return((int)rc);
}
@@ -951,18 +967,19 @@ spawn_pager(void)
progname, strerror(errno));
exit((int)MANDOCLEVEL_SYSERR);
case 0:
+ break;
+ default:
close(fildes[0]);
if (dup2(fildes[1], STDOUT_FILENO) == -1) {
fprintf(stderr, "%s: dup output: %s\n",
progname, strerror(errno));
exit((int)MANDOCLEVEL_SYSERR);
}
+ close(fildes[1]);
return;
- default:
- break;
}
- /* The original process becomes the pager. */
+ /* The child process becomes the pager. */
close(fildes[1]);
if (dup2(fildes[0], STDIN_FILENO) == -1) {
@@ -970,6 +987,7 @@ spawn_pager(void)
progname, strerror(errno));
exit((int)MANDOCLEVEL_SYSERR);
}
+ close(fildes[0]);
pager = getenv("MANPAGER");
if (pager == NULL || *pager == '\0')
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-03-10 3:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-10 3:02 mdocml: Fix a regression caused in rev schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).