From: Martin Vaeth <vaeth@mathematik.uni-wuerzburg.de>
To: zsh-workers@zsh.org
Subject: Re: PATCH: Util/helpfiles failing on old-fashioned unix
Date: Fri, 13 Dec 2013 23:46:25 +0000 (UTC) [thread overview]
Message-ID: <slrnlan72t.aip.vaeth@lounge.imp.fu-berlin.de> (raw)
In-Reply-To: <slrnlaljjv.t1h.vaeth@lounge.imp.fu-berlin.de>
Martin Vaeth <vaeth@mathematik.uni-wuerzburg.de> wrote:
>
> Perhaps the only clean way is to use a temporary file first for the
> man/nroff output and then for the colcrc/col output.
The following patch does this (avoiding the problematic pipeline):
--- 1/Util/helpfiles
+++ 1/Util/helpfiles
@@ -65,13 +65,40 @@
$ENV{'MANWIDTH'} = '80';
$ENV{'GROFF_NO_SGR'} = ''; # We need "classical" formatting of man pages.
-unless(open(MANPAGE, '-|', "man $manfile | colcrt -")) {
- close(MANPAGE);
- open(MANPAGE, '-|', "man $manfile | col -bx")
+$mantmp = $destdir . '/man.tmp';
+$coltmpbase = 'col.tmp';
+$coltmp = $destdir . '/' . $coltmpbase;
+$args = "$manfile >$mantmp";
+unlink($mantmp);
+&Info('attempting man ', $args);
+if(system('man ' . $args) || !(-s $mantmp)) {
+ unlink($mantmp);
+ &Info('attempting nroff -man ', $args);
+ if(system('nroff -man ' . $args) || !(-s $mantmp)) {
+ unlink($mantmp);
+ &Die('man and nroff -man both failed for ', $manfile);
+ }
+}
+$args = "$mantmp >$coltmp";
+unlink($coltmp);
+&Info('attempting colcrt ', $args);
+if(system('colcrt ' . $args) || !(-s $coltmp)) {
+ unlink($coltmp);
+ &Info('attempting col -bx <', $args);
# The x is necessary so that spaces don't turn into tabs, which messes
# up the calculations of indentation on machines which randomly wrap lines
# round to the previous line (so you see what we're up against).
- || &Die('can run neither "man | colcrt -" nor "man | col -bx"');
+ if(system('col -bx <' . $args) || !(-s $coltmp)) {
+ unlink($mantmp);
+ unlink($coltmp);
+ &Die('colcrt and col -bx both failed');
+ }
+}
+unlink($mantmp) || &Die('cannot remove tempfile ', $mantmp);
+
+unless(open(MANPAGE, '<', $coltmp)) {
+ unlink($coltmp);
+ &Die('generated tmpfile cannot be read');
}
unless($linkfile eq '') {
@@ -198,7 +225,8 @@
select STDOUT;
close OUT;
-close(MANPAGE) || &Die('piping from man ', $manfile, ' failed');
+close(MANPAGE);
+unlink($coltmpbase) || &Die('cannot remove tempfile ', $coltmpbase);
foreach $file (<*>) {
open (IN, $file);
next prev parent reply other threads:[~2013-12-13 23:46 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-10 8:57 Install run-help and *.zwc files system wide in build system Martin Vaeth
2013-11-10 18:13 ` Peter Stephenson
2013-11-10 22:28 ` Martin Vaeth
2013-11-11 2:30 ` Bart Schaefer
2013-11-11 9:09 ` Martin Vaeth
2013-11-11 16:42 ` Bart Schaefer
2013-11-11 22:59 ` Martin Vaeth
2013-11-12 10:11 ` Peter Stephenson
2013-11-12 17:41 ` Martin Vaeth
2013-11-12 17:48 ` Peter Stephenson
2013-11-12 21:04 ` Peter Stephenson
2013-11-12 21:42 ` Martin Vaeth
2013-11-13 9:28 ` Peter Stephenson
2013-11-13 10:10 ` Martin Vaeth
2013-11-13 11:21 ` Peter Stephenson
2013-11-13 16:06 ` Bart Schaefer
2013-11-16 12:14 ` modify functions hierarchy (was: Install run-help and *.zwc files system wide in build system) Martin Vaeth
2013-11-17 18:30 ` Bart Schaefer
2013-11-17 19:42 ` Martin Vaeth
2013-11-17 21:01 ` Bart Schaefer
2013-11-18 7:00 ` Martin Vaeth
2013-11-18 16:11 ` Doc/Doc/help (was: modify functions hierarchy (was: Install run-help and *.zwc files system wide in build system)) Bart Schaefer
2013-11-18 16:23 ` Peter Stephenson
2013-11-18 16:31 ` Bart Schaefer
2013-11-18 16:36 ` Peter Stephenson
2013-11-18 16:45 ` Bart Schaefer
2013-11-18 16:58 ` Peter Stephenson
2013-11-20 19:26 ` modify functions hierarchy (was: Install run-help and *.zwc files system wide in build system) Peter Stephenson
2013-11-21 6:01 ` Bart Schaefer
2013-11-23 17:48 ` Peter Stephenson
2013-11-23 19:47 ` Helpfiles again (was Re: modify functions hierarchy (was: etc.)) Bart Schaefer
2013-11-23 21:25 ` Martin Vaeth
2013-11-24 5:06 ` Bart Schaefer
[not found] ` <20131124175649.27c2559a@pws!>
2013-11-24 12:26 ` Martin Vaeth
2013-11-24 12:31 ` Martin Vaeth
2013-11-24 17:56 ` Peter Stephenson
2013-11-25 8:18 ` Bart Schaefer
2013-11-25 14:24 ` Jun T.
2013-11-25 15:49 ` Peter Stephenson
2013-11-25 16:56 ` Bart Schaefer
2013-11-25 17:37 ` Peter Stephenson
2013-11-25 20:14 ` Phil Pennock
2013-11-26 9:24 ` Peter Stephenson
2013-12-12 22:17 ` PATCH: Util/helpfiles failing on old-fashioned unix pda
2013-12-13 9:08 ` Martin Vaeth
2013-12-13 23:46 ` Martin Vaeth [this message]
2013-12-14 0:20 ` Wayne Davison
2013-12-14 9:23 ` Martin Vaeth
2013-12-14 18:49 ` Bart Schaefer
2013-12-15 23:37 ` pda
2013-12-18 8:39 ` Martin Vaeth
2013-11-17 20:13 ` modify functions hierarchy (was: Install run-help and *.zwc files system wide in build system) Peter Stephenson
2013-11-17 20:50 ` Bart Schaefer
2013-11-18 7:57 ` Martin Vaeth
2013-11-18 16:28 ` Bart Schaefer
2013-11-18 10:32 ` Peter Stephenson
2013-11-18 16:38 ` Bart Schaefer
2013-11-18 16:50 ` Peter Stephenson
2013-11-12 21:52 ` Install run-help and *.zwc files system wide in build system Martin Vaeth
2013-11-13 1:13 ` Bart Schaefer
2013-11-13 2:40 ` Bart Schaefer
2013-11-13 13:30 ` [PATCH] helpfiles: Also accept 'UTF-8' as an encoding name Jun T.
2013-11-13 15:37 ` Jun T.
2013-11-13 16:56 ` Martin Vaeth
2013-11-13 17:27 ` Bart Schaefer
2013-11-13 18:28 ` Martin Vaeth
2013-11-14 0:06 ` Phil Pennock
2013-11-14 7:50 ` Martin Vaeth
2013-11-14 8:18 ` Phil Pennock
2013-11-14 11:11 ` Martin Vaeth
2013-11-15 14:58 ` Jun T.
2013-11-15 17:16 ` Bart Schaefer
2013-11-15 19:58 ` Martin Vaeth
2013-11-16 5:51 ` Bart Schaefer
2013-11-16 15:17 ` Jun T.
2013-11-16 18:05 ` Bart Schaefer
2013-11-18 18:43 ` Phil Pennock
2013-11-10 22:44 ` Install run-help and *.zwc files system wide in build system Martin Vaeth
2013-11-10 18:56 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=slrnlan72t.aip.vaeth@lounge.imp.fu-berlin.de \
--to=vaeth@mathematik.uni-wuerzburg.de \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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).