From d2289d669cd14baef8bc63574121a2f1f6de502e Mon Sep 17 00:00:00 2001 From: basebuilder_pel7ppc64bebuilder0 Date: Thu, 17 May 2018 19:13:32 +0200 Subject: [PATCH] util linux patches Signed-off-by: basebuilder_pel7ppc64bebuilder0 --- SOURCES/0133-script-use-all-io-to-write.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 SOURCES/0133-script-use-all-io-to-write.patch diff --git a/SOURCES/0133-script-use-all-io-to-write.patch b/SOURCES/0133-script-use-all-io-to-write.patch new file mode 100644 index 00000000..49a4ef4e --- /dev/null +++ b/SOURCES/0133-script-use-all-io-to-write.patch @@ -0,0 +1,60 @@ +From 214d0ef6ac63442c285dd5d9d54190c62faf50d7 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Mon, 16 Oct 2017 13:30:44 +0200 +Subject: [PATCH 133/135] script: use all-io to write + +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1427500 +Signed-off-by: Karel Zak +--- + term-utils/script.c | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/term-utils/script.c b/term-utils/script.c +index 242b8154a..5840b600d 100644 +--- a/term-utils/script.c ++++ b/term-utils/script.c +@@ -62,6 +62,7 @@ + #include "closestream.h" + #include "nls.h" + #include "c.h" ++#include "all-io.h" + + #if defined(HAVE_LIBUTIL) && defined(HAVE_PTY_H) + # include +@@ -301,8 +302,7 @@ doinput(void) { + + while (die == 0) { + if ((cc = read(STDIN_FILENO, ibuf, BUFSIZ)) > 0) { +- ssize_t wrt = write(master, ibuf, cc); +- if (wrt < 0) { ++ if (write_all(master, ibuf, cc)) { + warn (_("write failed")); + fail(); + } +@@ -355,8 +355,6 @@ dooutput(FILE *timingfd) { + struct timeval tv; + double oldtime=time(NULL), newtime; + int flgs = 0; +- ssize_t wrt; +- ssize_t fwrt; + + close(STDIN_FILENO); + #ifdef HAVE_LIBUTIL +@@ -393,13 +391,11 @@ dooutput(FILE *timingfd) { + fprintf(timingfd, "%f %zd\n", newtime - oldtime, cc); + oldtime = newtime; + } +- wrt = write(STDOUT_FILENO, obuf, cc); +- if (wrt < 0) { ++ if (write_all(STDOUT_FILENO, obuf, cc)) { + warn (_("write failed")); + fail(); + } +- fwrt = fwrite(obuf, 1, cc, fscript); +- if (fwrt < cc) { ++ if (fwrite_all(obuf, 1, cc, fscript)) { + warn (_("cannot write script file")); + fail(); + } +-- +2.13.6