ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cut: shorten error messages on bad syntax even more

Browse source 
$ cut -s -b3
cut: -s requires -f or -F
$ cut -d@ -b3
cut: -d DELIM requires -f or -F

function                                             old     new   delta
static.requires_f                                      -      19     +19
static._op_on_field                                   32       -     -32
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/0 up/down: 19/-32)            Total: -13 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2024-12-16 01:10:55 +01:00
parent ee8b94acbf
commit e2304d47a9
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
coreutils/cut.c
View file

@ -330,16 +330,12 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
/* non-field (char or byte) cutting has some special handling */
if (!(opt & (OPT_FIELDS|OPT_REGEX))) {
static const char _op_on_field[] ALIGN1 = " makes sense only with -f"IF_FEATURE_CUT_REGEX(" or -F");
if (opt & OPT_SUPPRESS) {
bb_error_msg_and_die
("-s%s", _op_on_field);
}
if (opt & OPT_DELIM) {
bb_error_msg_and_die
("-d DELIM%s", _op_on_field);
}
static const char requires_f[] ALIGN1 = " requires -f"
IF_FEATURE_CUT_REGEX(" or -F");
if (opt & OPT_SUPPRESS)
bb_error_msg_and_die("-s%s", requires_f);
if (opt & OPT_DELIM)
bb_error_msg_and_die("-d DELIM%s", requires_f);
}
/*