* mdocml: We cannot use fputs(3) in passthrough() because the stdout
@ 2016-09-18 15:48 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2016-09-18 15:48 UTC (permalink / raw)
To: source
Log Message:
-----------
We cannot use fputs(3) in passthrough() because the stdout stream
might be in stdio wide orientation due to prior formatting of an
unformatted manual in man -aTutf8 mode. So for now, use fflush(3)
followed by unbuffered write(2) instead. Fixes output corruption
on glibc discovered on Linux while testing a diff to fix a loosely
related bug reported by <jmates at ee dot washington dot edu>.
I detest the concept of stdio stream orientation. One day, i will
rewrite term_ascii.c to always use narrow streams, even in UTF-8
output mode. But that's too much work for today.
Modified Files:
--------------
mdocml:
main.c
Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -Lmain.c -Lmain.c -u -p -r1.276 -r1.277
--- main.c
+++ main.c
@@ -820,11 +820,17 @@ passthrough(const char *file, int fd, in
const char *syscall;
char *line, *cp;
size_t linesz;
+ ssize_t len, written;
int print;
line = NULL;
linesz = 0;
+ if (fflush(stdout) == EOF) {
+ syscall = "fflush";
+ goto fail;
+ }
+
if ((stream = fdopen(fd, "r")) == NULL) {
close(fd);
syscall = "fdopen";
@@ -832,14 +838,16 @@ passthrough(const char *file, int fd, in
}
print = 0;
- while (getline(&line, &linesz, stream) != -1) {
+ while ((len = getline(&line, &linesz, stream)) != -1) {
cp = line;
if (synopsis_only) {
if (print) {
if ( ! isspace((unsigned char)*cp))
goto done;
- while (isspace((unsigned char)*cp))
+ while (isspace((unsigned char)*cp)) {
cp++;
+ len--;
+ }
} else {
if (strcmp(cp, synb) == 0 ||
strcmp(cp, synr) == 0)
@@ -847,9 +855,11 @@ passthrough(const char *file, int fd, in
continue;
}
}
- if (fputs(cp, stdout)) {
+ for (; len > 0; len -= written) {
+ if ((written = write(STDOUT_FILENO, cp, len)) != -1)
+ continue;
fclose(stream);
- syscall = "fputs";
+ syscall = "write";
goto fail;
}
}
--
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:[~2016-09-18 15:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-18 15:48 mdocml: We cannot use fputs(3) in passthrough() because the stdout 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).