summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-07-16 08:14:35 +0000
committerRob Landley <rob@landley.net>2006-07-16 08:14:35 +0000
commit534374755d618c9c36c9940c82756241c4b25a67 (patch)
treefac906b4fa40a68c53cecf20215a7a25b3b1cab6 /coreutils
parentafb94ecf2bb6c53ce2a381d6ce45a426243c76d9 (diff)
downloadbusybox-w32-534374755d618c9c36c9940c82756241c4b25a67.tar.gz
busybox-w32-534374755d618c9c36c9940c82756241c4b25a67.tar.bz2
busybox-w32-534374755d618c9c36c9940c82756241c4b25a67.zip
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)
196 tmp += d; 196 tmp += d;
197 oc += d; 197 oc += d;
198 if (oc == obs) { 198 if (oc == obs) {
199 if (bb_full_write(ofd, obuf, obs) < 0) { 199 xwrite(ofd, obuf, obs);
200 bb_perror_msg_and_die("%s", outfile);
201 }
202 out_full++; 200 out_full++;
203 oc = 0; 201 oc = 0;
204 } 202 }
205 } 203 }
206 } else { 204 } else {
207 if ((n = bb_full_write(ofd, ibuf, n)) < 0) { 205 xwrite(ofd, ibuf, n);
208 bb_perror_msg_and_die("%s", outfile);
209 }
210 if (n == ibs) out_full++; 206 if (n == ibs) out_full++;
211 else out_part++; 207 else out_part++;
212 } 208 }
213 } 209 }
214 210
215 if (ENABLE_FEATURE_DD_IBS_OBS && oc) { 211 if (ENABLE_FEATURE_DD_IBS_OBS && oc) {
216 if (bb_full_write(ofd, obuf, oc) < 0) { 212 xwrite(ofd, obuf, oc);
217 bb_perror_msg_and_die("%s", outfile);
218 }
219 out_part++; 213 out_part++;
220 } 214 }
221 if (close (ifd) < 0) { 215 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)
54static void tail_xbb_full_write(const char *buf, size_t len) 54static void tail_xbb_full_write(const char *buf, size_t len)
55{ 55{
56 /* If we get a write error, there is really no sense in continuing. */ 56 /* If we get a write error, there is really no sense in continuing. */
57 if (bb_full_write(STDOUT_FILENO, buf, len) < 0) { 57 if (full_write(STDOUT_FILENO, buf, len) < 0)
58 bb_perror_nomsg_and_die(); 58 bb_perror_nomsg_and_die();
59 }
60} 59}
61 60
62static ssize_t tail_read(int fd, char *buf, size_t count) 61static ssize_t tail_read(int fd, char *buf, size_t count)