aboutsummaryrefslogtreecommitdiff
path: root/coreutils/dd.c
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-16 08:14:35 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-16 08:14:35 +0000
commita15cdc358e5f9d1cb517e2b2e490ac209b0dfa17 (patch)
treefac906b4fa40a68c53cecf20215a7a25b3b1cab6 /coreutils/dd.c
parenta4b7afd4143063613cf88fb5304803e424f5c72a (diff)
downloadbusybox-w32-a15cdc358e5f9d1cb517e2b2e490ac209b0dfa17.tar.gz
busybox-w32-a15cdc358e5f9d1cb517e2b2e490ac209b0dfa17.tar.bz2
busybox-w32-a15cdc358e5f9d1cb517e2b2e490ac209b0dfa17.zip
Cleaup read() and write() variants, plus a couple of new functions like
xlseek and fdlength() for the new mkswap. git-svn-id: svn://busybox.net/trunk/busybox@15703 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/dd.c')
-rw-r--r--coreutils/dd.c12
1 files changed, 3 insertions, 9 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) {