From 534374755d618c9c36c9940c82756241c4b25a67 Mon Sep 17 00:00:00 2001
From: Rob Landley
Date: Sun, 16 Jul 2006 08:14:35 +0000
Subject: Cleaup read() and write() variants, plus a couple of new functions
 like xlseek and fdlength() for the new mkswap.

---
 coreutils/dd.c   | 12 +++---------
 coreutils/tail.c |  3 +--
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'coreutils')

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 33e7893..3d6f7cd 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -196,26 +196,20 @@ int dd_main(int argc, char **argv)
 				tmp += d;
 				oc += d;
 				if (oc == obs) {
-					if (bb_full_write(ofd, obuf, obs) < 0) {
-						bb_perror_msg_and_die("%s", outfile);
-					}
+					xwrite(ofd, obuf, obs);
 					out_full++;
 					oc = 0;
 				}
 			}
 		} else {
-			if ((n = bb_full_write(ofd, ibuf, n)) < 0) {
-				bb_perror_msg_and_die("%s", outfile);
-			}
+			xwrite(ofd, ibuf, n);
 			if (n == ibs) out_full++;
 			else out_part++;
 		}
 	}
 	
 	if (ENABLE_FEATURE_DD_IBS_OBS && oc) {
-		if (bb_full_write(ofd, obuf, oc) < 0) {
-			bb_perror_msg_and_die("%s", outfile);
-		}
+		xwrite(ofd, obuf, oc);
 		out_part++;
 	}
 	if (close (ifd) < 0) {
diff --git a/coreutils/tail.c b/coreutils/tail.c
index e63406e..80a66fb 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -54,9 +54,8 @@ static void tail_xprint_header(const char *fmt, const char *filename)
 static void tail_xbb_full_write(const char *buf, size_t len)
 {
 	/* If we get a write error, there is really no sense in continuing. */
-	if (bb_full_write(STDOUT_FILENO, buf, len) < 0) {
+	if (full_write(STDOUT_FILENO, buf, len) < 0)
 		bb_perror_nomsg_and_die();
-	}
 }
 
 static ssize_t tail_read(int fd, char *buf, size_t count)
-- 
cgit v1.1