aboutsummaryrefslogtreecommitdiff
path: root/coreutils/sort.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/sort.c')
-rw-r--r--coreutils/sort.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/coreutils/sort.c b/coreutils/sort.c
index f04c6067b..07c327645 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -277,7 +277,7 @@ static int compare_keys(const void *xarg, const void *yarg)
277 /* Perform actual comparison */ 277 /* Perform actual comparison */
278 switch (flags & (FLAG_n | FLAG_g | FLAG_M | FLAG_V)) { 278 switch (flags & (FLAG_n | FLAG_g | FLAG_M | FLAG_V)) {
279 default: 279 default:
280 bb_error_msg_and_die("unknown sort type"); 280 bb_simple_error_msg_and_die("unknown sort type");
281 break; 281 break;
282#if defined(HAVE_STRVERSCMP) && HAVE_STRVERSCMP == 1 282#if defined(HAVE_STRVERSCMP) && HAVE_STRVERSCMP == 1
283 case FLAG_V: 283 case FLAG_V:
@@ -398,10 +398,10 @@ static unsigned str2u(char **str)
398{ 398{
399 unsigned long lu; 399 unsigned long lu;
400 if (!isdigit((*str)[0])) 400 if (!isdigit((*str)[0]))
401 bb_error_msg_and_die("bad field specification"); 401 bb_simple_error_msg_and_die("bad field specification");
402 lu = strtoul(*str, str, 10); 402 lu = strtoul(*str, str, 10);
403 if ((sizeof(long) > sizeof(int) && lu > INT_MAX) || !lu) 403 if ((sizeof(long) > sizeof(int) && lu > INT_MAX) || !lu)
404 bb_error_msg_and_die("bad field specification"); 404 bb_simple_error_msg_and_die("bad field specification");
405 return lu; 405 return lu;
406} 406}
407#endif 407#endif
@@ -461,7 +461,7 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
461#if ENABLE_FEATURE_SORT_BIG 461#if ENABLE_FEATURE_SORT_BIG
462 if (opts & FLAG_t) { 462 if (opts & FLAG_t) {
463 if (!str_t[0] || str_t[1]) 463 if (!str_t[0] || str_t[1])
464 bb_error_msg_and_die("bad -t parameter"); 464 bb_simple_error_msg_and_die("bad -t parameter");
465 key_separator = str_t[0]; 465 key_separator = str_t[0];
466 } 466 }
467 /* note: below this point we use option_mask32, not opts, 467 /* note: below this point we use option_mask32, not opts,
@@ -504,10 +504,10 @@ int sort_main(int argc UNUSED_PARAM, char **argv)
504 because comma isn't in OPT_STR */ 504 because comma isn't in OPT_STR */
505 idx = strchr(OPT_STR, *str_k); 505 idx = strchr(OPT_STR, *str_k);
506 if (!idx) 506 if (!idx)
507 bb_error_msg_and_die("unknown key option"); 507 bb_simple_error_msg_and_die("unknown key option");
508 flag = 1 << (idx - OPT_STR); 508 flag = 1 << (idx - OPT_STR);
509 if (flag & ~FLAG_allowed_for_k) 509 if (flag & ~FLAG_allowed_for_k)
510 bb_error_msg_and_die("unknown sort type"); 510 bb_simple_error_msg_and_die("unknown sort type");
511 /* b after ',' means strip _trailing_ space */ 511 /* b after ',' means strip _trailing_ space */
512 if (i && flag == FLAG_b) 512 if (i && flag == FLAG_b)
513 flag = FLAG_bb; 513 flag = FLAG_bb;