From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 13 Apr 2013 19:55:01 +0000 (+0100)
Subject: wall: check writing to a file descriptor was successful
X-Git-Tag: v2.24-rc1~579
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f587afc671cdbcc9712309ae779c3e309d55c32;p=thirdparty%2Futil-linux.git

wall: check writing to a file descriptor was successful

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/term-utils/ttymsg.c b/term-utils/ttymsg.c
index 66b61b4915..d6108266d2 100644
--- a/term-utils/ttymsg.c
+++ b/term-utils/ttymsg.c
@@ -169,7 +169,8 @@ ttymsg(struct iovec *iov, size_t iovcnt, char *line, int tmout) {
 		 */
 		if (errno == ENODEV || errno == EIO)
 			break;
-		(void) close(fd);
+		if (close_fd(fd) != 0)
+			warn(_("write failed: %s"), device);
 		if (forked)
 			_exit(EXIT_FAILURE);
 		if (strlen(strerror(errno)) > 1000)
@@ -184,7 +185,6 @@ ttymsg(struct iovec *iov, size_t iovcnt, char *line, int tmout) {
 		return (errbuf);
 	}
 
-	(void) close(fd);
 	if (forked)
 		_exit(EXIT_SUCCESS);
 	return (NULL);