diff options
author | Ron Yorston <rmy@pobox.com> | 2015-10-19 12:53:35 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-10-19 12:53:35 +0100 |
commit | 8afe8ee83a274925340473fa4d0a984bdcbee740 (patch) | |
tree | b78ed448cb6a55ba7d0ef8141a9f68b55b8acf11 /coreutils/dd.c | |
parent | caab029609633220c417dc0aaa9025fd4b7a169c (diff) | |
parent | 3d0805e9e7c45e6c0f9fb5e587d8b4a5a5f3c74c (diff) | |
download | busybox-w32-8afe8ee83a274925340473fa4d0a984bdcbee740.tar.gz busybox-w32-8afe8ee83a274925340473fa4d0a984bdcbee740.tar.bz2 busybox-w32-8afe8ee83a274925340473fa4d0a984bdcbee740.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/dd.c')
-rw-r--r-- | coreutils/dd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c index 589547e77..ccb91f69d 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
@@ -327,7 +327,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv) | |||
327 | *arg = '\0'; | 327 | *arg = '\0'; |
328 | n = index_in_strings(conv_words, val); | 328 | n = index_in_strings(conv_words, val); |
329 | if (n < 0) | 329 | if (n < 0) |
330 | bb_error_msg_and_die(bb_msg_invalid_arg, val, "conv"); | 330 | bb_error_msg_and_die(bb_msg_invalid_arg_to, val, "conv"); |
331 | G.flags |= (1 << n); | 331 | G.flags |= (1 << n); |
332 | if (!arg) /* no ',' left, so this was the last specifier */ | 332 | if (!arg) /* no ',' left, so this was the last specifier */ |
333 | break; | 333 | break; |
@@ -369,7 +369,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv) | |||
369 | int n; | 369 | int n; |
370 | n = index_in_strings(status_words, val); | 370 | n = index_in_strings(status_words, val); |
371 | if (n < 0) | 371 | if (n < 0) |
372 | bb_error_msg_and_die(bb_msg_invalid_arg, val, "status"); | 372 | bb_error_msg_and_die(bb_msg_invalid_arg_to, val, "status"); |
373 | G.flags |= FLAG_STATUS << n; | 373 | G.flags |= FLAG_STATUS << n; |
374 | /*continue;*/ | 374 | /*continue;*/ |
375 | } | 375 | } |