aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-07-16 08:14:35 +0000
committerGravatar Rob Landley <rob@landley.net>2006-07-16 08:14:35 +0000
commit534374755d618c9c36c9940c82756241c4b25a67 (patch)
treefac906b4fa40a68c53cecf20215a7a25b3b1cab6 /coreutils
parentafb94ecf2bb6c53ce2a381d6ce45a426243c76d9 (diff)
downloadbusybox-534374755d618c9c36c9940c82756241c4b25a67.tar.gz
busybox-534374755d618c9c36c9940c82756241c4b25a67.tar.bz2
Cleaup read() and write() variants, plus a couple of new functions like
xlseek and fdlength() for the new mkswap.
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/dd.c12
-rw-r--r--coreutils/tail.c3
2 files changed, 4 insertions, 11 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 33e789311..3d6f7cd2d 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 e63406e31..80a66fbf5 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)