aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-07-14 13:44:30 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-07-14 13:44:30 +0200
commitd5b98e2ef4b322c2203d6cd150a3a4080de5e1f4 (patch)
treed2bcc45fa5e3352885c8f709155d5217ab0a6555 /coreutils
parent9fda609a60506f4c1f73f0034cafd2b3434f4df3 (diff)
downloadbusybox-w32-d5b98e2ef4b322c2203d6cd150a3a4080de5e1f4.tar.gz
busybox-w32-d5b98e2ef4b322c2203d6cd150a3a4080de5e1f4.tar.bz2
busybox-w32-d5b98e2ef4b322c2203d6cd150a3a4080de5e1f4.zip
dd: fix status=none. Closes 10066
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/dd.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 7d980f1c4..630852205 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -133,9 +133,8 @@ enum {
133 /* end of input flags */ 133 /* end of input flags */
134 FLAG_TWOBUFS = (1 << 6) * ENABLE_FEATURE_DD_IBS_OBS, 134 FLAG_TWOBUFS = (1 << 6) * ENABLE_FEATURE_DD_IBS_OBS,
135 FLAG_COUNT = 1 << 7, 135 FLAG_COUNT = 1 << 7,
136 FLAG_STATUS = 1 << 8, 136 FLAG_STATUS_NONE = 1 << 8,
137 FLAG_STATUS_NONE = 1 << 9, 137 FLAG_STATUS_NOXFER = 1 << 9,
138 FLAG_STATUS_NOXFER = 1 << 10,
139}; 138};
140 139
141static void dd_output_status(int UNUSED_PARAM cur_signal) 140static void dd_output_status(int UNUSED_PARAM cur_signal)
@@ -396,7 +395,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
396 n = index_in_strings(status_words, val); 395 n = index_in_strings(status_words, val);
397 if (n < 0) 396 if (n < 0)
398 bb_error_msg_and_die(bb_msg_invalid_arg_to, val, "status"); 397 bb_error_msg_and_die(bb_msg_invalid_arg_to, val, "status");
399 G.flags |= FLAG_STATUS << n; 398 G.flags |= FLAG_STATUS_NONE << n;
400 /*continue;*/ 399 /*continue;*/
401 } 400 }
402#endif 401#endif