summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2010-06-13 17:34:45 +0200
committerJim Meyering <meyering@redhat.com>2010-06-14 22:34:42 +0200
commit280b15249c9983d61707a00b6a462eb1df448c78 (patch)
tree6d4fe264fe1c45ae1b57cbbac8601dea796c605e
parentd9ddd4c5032d9d01df6cfeb30cfb73d185aad9b7 (diff)
downloadcoreutils-280b15249c9983d61707a00b6a462eb1df448c78.tar.xz
dd: print a better diagnostic for an invalid block size
* src/dd.c (dd_copy): Give a better diagnostic than "dd: memory exhausted" for an over-large bs= block size setting. Same for ibs= and obs=. Reported by Imre PĂ©ntek in http://bugs.launchpad.net/ubuntu/+source/coreutils/+bug/591969
-rw-r--r--src/dd.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/src/dd.c b/src/dd.c
index 30d3d287a..c9b8cbda4 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -1557,6 +1557,16 @@ set_fd_flags (int fd, int add_flags, char const *name)
}
}
+static char *
+human_size (size_t n)
+{
+ static char hbuf[LONGEST_HUMAN_READABLE + 1];
+ int human_opts =
+ (human_autoscale | human_round_to_nearest | human_base_1024
+ | human_space_before_unit | human_SI | human_B);
+ return human_readable (n, hbuf, human_opts, 1, 1);
+}
+
/* The main loop. */
static int
@@ -1593,7 +1603,13 @@ dd_copy (void)
It is necessary when accessing raw (i.e. character special) disk
devices on Unixware or other SVR4-derived system. */
- real_buf = xmalloc (input_blocksize + INPUT_BLOCK_SLOP);
+ size_t sz = input_blocksize + INPUT_BLOCK_SLOP;
+ real_buf = malloc (sz);
+ if (!real_buf)
+ error (EXIT_FAILURE, 0,
+ _("failed to allocate an input buffer of size %s"),
+ human_size (sz));
+
ibuf = real_buf;
ibuf += SWAB_ALIGN_OFFSET; /* allow space for swab */
@@ -1602,7 +1618,12 @@ dd_copy (void)
if (conversions_mask & C_TWOBUFS)
{
/* Page-align the output buffer, too. */
- real_obuf = xmalloc (output_blocksize + OUTPUT_BLOCK_SLOP);
+ sz = output_blocksize + OUTPUT_BLOCK_SLOP;
+ real_obuf = malloc (sz);
+ if (!real_obuf)
+ error (EXIT_FAILURE, 0,
+ _("failed to allocate an output buffer of size %s"),
+ human_size (sz));
obuf = ptr_align (real_obuf, page_size);
}
else