summaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko2019-05-14 17:46:18 +0200
committerDenys Vlasenko2019-05-14 17:49:14 +0200
commit875ce094cf2d421ba05bed6cfd6c948084d52abe (patch)
tree90bff2304d2bb604d170a16715e924b2a6947597 /coreutils
parent8c317f03f6d4d89fd7b0cc1e6eaf515040b8e701 (diff)
downloadbusybox-875ce094cf2d421ba05bed6cfd6c948084d52abe.zip
busybox-875ce094cf2d421ba05bed6cfd6c948084d52abe.tar.gz
dd: fix handling of short result of full_write(), closes 11711
$ dd bs=1G <sda1 of=/dev/sda1 dd: error writing '/dev/sda1': No space left on device 1+0 records in 0+0 records out 999292928 bytes (953.0MB) copied, 0.784617 seconds, 1.2GB/s function old new delta write_and_stats 99 102 +3 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/dd.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 2fb9da7..b5f3cbe 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -192,23 +192,15 @@ static void dd_output_status(int UNUSED_PARAM cur_signal)
#endif
}
-static ssize_t full_write_or_warn(const void *buf, size_t len,
- const char *const filename)
-{
- ssize_t n = full_write(ofd, buf, len);
- if (n < 0)
- bb_perror_msg("writing '%s'", filename);
- return n;
-}
-
static bool write_and_stats(const void *buf, size_t len, size_t obs,
const char *filename)
{
- ssize_t n = full_write_or_warn(buf, len, filename);
- if (n < 0)
- return 1;
+ ssize_t n;
+
+ n = full_write(ofd, buf, len);
#if ENABLE_FEATURE_DD_THIRD_STATUS_LINE
- G.total_bytes += n;
+ if (n > 0)
+ G.total_bytes += n;
#endif
if ((size_t)n == obs) {
G.out_full++;
@@ -218,6 +210,14 @@ static bool write_and_stats(const void *buf, size_t len, size_t obs,
G.out_part++;
return 0;
}
+ /* n is < len (and possibly is -1).
+ * Even if n >= 0, errno is usually set correctly.
+ * For example, if writing to block device and getting ENOSPC,
+ * full_write() first sees a short write, then tries to write
+ * the remainder and gets errno set to ENOSPC.
+ * It returns n > 0 (the amount which it did write).
+ */
+ bb_perror_msg("error writing '%s'", filename);
return 1;
}