aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--coreutils/dd.c12
-rw-r--r--coreutils/ls.c3
2 files changed, 4 insertions, 11 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c
index e6b88acf5..f439326fd 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -290,12 +290,6 @@ static bool write_and_stats(const void *buf, size_t len, size_t obs,
290 return 1; 290 return 1;
291} 291}
292 292
293#if ENABLE_LFS
294# define XATOU_SFX xatoull_sfx
295#else
296# define XATOU_SFX xatoul_sfx
297#endif
298
299#if ENABLE_FEATURE_DD_IBS_OBS 293#if ENABLE_FEATURE_DD_IBS_OBS
300static int parse_comma_flags(char *val, const char *words, const char *error_in) 294static int parse_comma_flags(char *val, const char *words, const char *error_in)
301{ 295{
@@ -488,15 +482,15 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
488 /* These can be large: */ 482 /* These can be large: */
489 if (what == OP_count) { 483 if (what == OP_count) {
490 G.flags |= FLAG_COUNT; 484 G.flags |= FLAG_COUNT;
491 count = XATOU_SFX(val, cwbkMG_suffixes); 485 count = XATOOFF_SFX(val, cwbkMG_suffixes);
492 /*continue;*/ 486 /*continue;*/
493 } 487 }
494 if (what == OP_seek) { 488 if (what == OP_seek) {
495 seek = XATOU_SFX(val, cwbkMG_suffixes); 489 seek = XATOOFF_SFX(val, cwbkMG_suffixes);
496 /*continue;*/ 490 /*continue;*/
497 } 491 }
498 if (what == OP_skip) { 492 if (what == OP_skip) {
499 skip = XATOU_SFX(val, cwbkMG_suffixes); 493 skip = XATOOFF_SFX(val, cwbkMG_suffixes);
500 /*continue;*/ 494 /*continue;*/
501 } 495 }
502 if (what == OP_if) { 496 if (what == OP_if) {
diff --git a/coreutils/ls.c b/coreutils/ls.c
index b2a6d4d90..b8d276e53 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -239,8 +239,7 @@ SPLIT_SUBDIR = 2,
239 IF_FEATURE_LS_WIDTH("T:w:") /* 2, 28 */ \ 239 IF_FEATURE_LS_WIDTH("T:w:") /* 2, 28 */ \
240 IF_LONG_OPTS("\xff") /* 1, 29 */ \ 240 IF_LONG_OPTS("\xff") /* 1, 29 */ \
241 IF_LONG_OPTS("\xfe") /* 1, 30 */ \ 241 IF_LONG_OPTS("\xfe") /* 1, 30 */ \
242IF_PLATFORM_MINGW32(IF_LONG_OPTS("\xfd:")) /* 1, 31 */ \ 242 IF_LONG_OPTS("\xfd::") /* 1, 31 */ \
243IF_NOT_PLATFORM_MINGW32(IF_LONG_OPTS("\xfd")) \
244 "qk" /* 2, 33 */ 243 "qk" /* 2, 33 */
245 244
246#if ENABLE_LONG_OPTS 245#if ENABLE_LONG_OPTS