diff options
author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
---|---|---|
committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
tree | f053238978479e408a2b83571443e132f30586ab /src/cmd/htmlroff/t19.c | |
parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/htmlroff/t19.c')
-rw-r--r-- | src/cmd/htmlroff/t19.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cmd/htmlroff/t19.c b/src/cmd/htmlroff/t19.c index a4cc18f4..bd633834 100644 --- a/src/cmd/htmlroff/t19.c +++ b/src/cmd/htmlroff/t19.c @@ -17,7 +17,7 @@ void r_nx(int argc, Rune **argv) { int n; - + if(argc == 1){ while(popinput()) ; @@ -74,7 +74,7 @@ r_inputpipe(Rune *name) Rune *cmd, *stop, *line; int n, pid, p[2], len; Waitmsg *w; - + USED(name); if(pipe(p) < 0){ warn("pipe: %r"); @@ -104,7 +104,7 @@ r_inputpipe(Rune *name) fprint(p[1], ".ll 8i\n"); fprint(p[1], ".pl 30i\n"); while((line = readline(~0)) != nil){ - if(runestrncmp(line, stop, len) == 0 + if(runestrncmp(line, stop, len) == 0 && (line[len]==' ' || line[len]==0 || line[len]=='\t' || (line[len]=='\\' && line[len+1]=='}'))) break; @@ -125,7 +125,7 @@ r_inputpipe(Rune *name) free(cmd); free(w); } -} +} void t19init(void) @@ -136,7 +136,6 @@ t19init(void) addraw(L("inputpipe"), r_inputpipe); addraw(L("pi"), r_pi); addreq(L("cf"), r_cf, 1); - + nr(L("$$"), getpid()); } - |