dd: new option, status=none to suppress output statistics

* src/dd.c (STATUS_NONE): A new bitmask combining all STATUS_
options, thus used to suppress all informational output.
(struct symbol_value statuses): Expose the "none" option,
corresponding to the STATUS_NONE bitmask above.
(print_stats): Return early if STATUS_NONE is specified.
Also move the call to gethrxtime() down so that it's only
called when needed.
(usage): Describe the new options.
* doc/coreutils.texi (dd invocation): Likewise.
* NEWS: Mention the new feature.
* tests/dd/misc.sh: Ensure the new option works.
This commit is contained in:
Pozsár Balázs authored and Pádraig Brady committed 2012-09-24 15:14:23 +01:00
1 parent 2dad87f641
commit 7331ab55fc
4 files changed
+38 -6

No files matched your search

+2
View File
@@ -4,6 +4,8 @@ GNU coreutils NEWS -*- outline -*-
** New features
dd now accepts 'status=none' to suppress all informational output.
md5sum now accepts the --tag option to print BSD-style output with GNU
file name escaping. This also affects sha1sum, sha224sum, sha256sum,
sha384sum and sha512sum.
+18 -3
View File
@@ -8115,10 +8115,25 @@ of everything until the end of the file.
if @samp{iflag=count_bytes} is specified, @var{n} is interpreted
as a byte count rather than a block count.
@item status=noxfer
@item status=@var{which}
@opindex status
Do not print the overall transfer rate and volume statistics
that normally make up the third status line when @command{dd} exits.
Transfer information is normally output to stderr upon
receipt of the @samp{INFO} signal or when @command{dd} exits.
Specifying @var{which} will identify which information to suppress.
@table @samp
@item noxfer
@opindex noxfer @r{dd status=}
Do not print the transfer rate and volume statistics
that normally make up the last status line.
@item none
@opindex none @r{dd status=}
Do not print any informational messages to stderr.
Error messages are output as normal.
@end table
@item conv=@var{conversion}[,@var{conversion}]@dots{}
@opindex conv
+11 -3
View File
@@ -135,7 +135,10 @@ enum
/* Status bit masks. */
enum
{
STATUS_NOXFER = 01
STATUS_NOXFER = 01,
STATUS_NOCOUNTS = 02,
STATUS_LAST = STATUS_NOCOUNTS,
STATUS_NONE = STATUS_LAST | (STATUS_LAST - 1)
};
/* The name of the input file, or NULL for the standard input. */
@@ -370,6 +373,7 @@ static struct symbol_value const flags[] =
static struct symbol_value const statuses[] =
{
{"noxfer", STATUS_NOXFER},
{"none", STATUS_NONE},
{"", 0}
};
@@ -536,7 +540,8 @@ Copy a file, converting and formatting according to the operands.\n\
oflag=FLAGS write as per the comma separated symbol list\n\
seek=N skip N obs-sized blocks at start of output\n\
skip=N skip N ibs-sized blocks at start of input\n\
status=noxfer suppress transfer statistics\n\
status=WHICH WHICH info to suppress outputting to stderr;\n\
'noxfer' suppresses transfer stats, 'none' suppresses all\n\
"), stdout);
fputs (_("\
\n\
@@ -664,7 +669,6 @@ multiple_bits_set (int i)
static void
print_stats (void)
{
xtime_t now = gethrxtime ();
char hbuf[LONGEST_HUMAN_READABLE + 1];
int human_opts =
(human_autoscale | human_round_to_nearest
@@ -672,6 +676,9 @@ print_stats (void)
double delta_s;
char const *bytes_per_second;
if ((status_flags & STATUS_NONE) == STATUS_NONE)
return;
fprintf (stderr,
_("%"PRIuMAX"+%"PRIuMAX" records in\n"
"%"PRIuMAX"+%"PRIuMAX" records out\n"),
@@ -697,6 +704,7 @@ print_stats (void)
w_bytes,
human_readable (w_bytes, hbuf, human_opts, 1, 1));
xtime_t now = gethrxtime ();
if (start_time < now)
{
double XTIME_PRECISIONe0 = XTIME_PRECISION;
+7
View File
@@ -30,6 +30,13 @@ echo data > $tmp_in || framework_failure_
ln $tmp_in $tmp_in2 || framework_failure_
ln -s $tmp_in $tmp_sym || framework_failure_
# check status=none suppresses all output to stderr
dd status=none if=$tmp_in of=/dev/null 2> err || fail=1
test -s err && fail=1
# check status=none is cumulative with status=noxfer
dd status=none status=noxfer if=$tmp_in of=/dev/null 2> err || fail=1
test -s err && fail=1
dd if=$tmp_in of=$tmp_out 2> /dev/null || fail=1
compare $tmp_in $tmp_out || fail=1