summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-08-20 10:40:29 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2013-08-20 10:40:29 (GMT)
commitf3114a3bd0d468a417e9e4a254d76ecf1cf35178 (patch)
tree3ccb4e035b7f5c3b33f4511b6480f13510a352b0
parent90e9cfd2183a6ba547eb0e74081e175e8a2da75f (diff)
downloadbusybox-f3114a3bd0d468a417e9e4a254d76ecf1cf35178.tar.gz
busybox-f3114a3bd0d468a417e9e4a254d76ecf1cf35178.tar.bz2
dd: code shrink
function old new delta write_and_stats 78 99 +21 dd_main 1496 1487 -9 full_write_or_warn 42 - -42 ------------------------------------------------------------------------------ (add/remove: 0/1 grow/shrink: 1/1 up/down: 21/-51) Total: -30 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/dd.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 53c3bdc..e046ff5 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -440,8 +440,10 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
oc = 0;
}
}
- } else if (write_and_stats(ibuf, n, obs, outfile))
- goto out_status;
+ } else {
+ if (write_and_stats(ibuf, n, obs, outfile))
+ goto out_status;
+ }
if (flags & FLAG_FSYNC) {
if (fsync(ofd) < 0)
@@ -450,9 +452,8 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
}
if (ENABLE_FEATURE_DD_IBS_OBS && oc) {
- ssize_t w = full_write_or_warn(obuf, oc, outfile);
- if (w < 0) goto out_status;
- if (w > 0) G.out_part++;
+ if (write_and_stats(obuf, oc, obs, outfile))
+ goto out_status;
}
if (close(ifd) < 0) {
die_infile: