Cleaup read() and write() variants, plus a couple of new functions like
xlseek and fdlength() for the new mkswap.
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user