2006-07-03 01:17:05 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
2000-05-13 01:11:47 +05:30
|
|
|
/*
|
2000-08-03 00:00:11 +05:30
|
|
|
* cut.c - minimalist version of cut
|
2000-05-13 01:11:47 +05:30
|
|
|
*
|
2001-01-27 15:03:39 +05:30
|
|
|
* Copyright (C) 1999,2000,2001 by Lineo, inc.
|
2004-03-15 13:59:22 +05:30
|
|
|
* Written by Mark Whitley <markw@codepoet.org>
|
2008-09-25 17:43:34 +05:30
|
|
|
* debloated by Bernhard Reutner-Fischer
|
2000-05-13 01:11:47 +05:30
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2000-05-13 01:11:47 +05:30
|
|
|
*/
|
2016-11-23 19:16:56 +05:30
|
|
|
//config:config CUT
|
2018-12-28 07:50:17 +05:30
|
|
|
//config: bool "cut (5.8 kb)"
|
2016-11-23 19:16:56 +05:30
|
|
|
//config: default y
|
|
|
|
//config: help
|
2017-07-21 13:20:55 +05:30
|
|
|
//config: cut is used to print selected parts of lines from
|
|
|
|
//config: each file to stdout.
|
2016-11-23 19:16:56 +05:30
|
|
|
|
|
|
|
//applet:IF_CUT(APPLET_NOEXEC(cut, cut, BB_DIR_USR_BIN, BB_SUID_DROP, cut))
|
|
|
|
|
|
|
|
//kbuild:lib-$(CONFIG_CUT) += cut.o
|
2000-05-13 01:11:47 +05:30
|
|
|
|
2011-03-31 18:13:25 +05:30
|
|
|
//usage:#define cut_trivial_usage
|
|
|
|
//usage: "[OPTIONS] [FILE]..."
|
|
|
|
//usage:#define cut_full_usage "\n\n"
|
2021-04-14 18:45:45 +05:30
|
|
|
//usage: "Print selected fields from FILEs to stdout\n"
|
2011-03-31 18:13:25 +05:30
|
|
|
//usage: "\n -b LIST Output only bytes from LIST"
|
|
|
|
//usage: "\n -c LIST Output only characters from LIST"
|
2021-04-14 18:45:45 +05:30
|
|
|
//usage: "\n -d CHAR Use CHAR instead of tab as field delimiter"
|
|
|
|
//usage: "\n -s Output only lines containing delimiter"
|
|
|
|
//usage: "\n -f LIST Print only these fields"
|
2011-03-31 18:13:25 +05:30
|
|
|
//usage: "\n -n Ignored"
|
2021-06-15 00:17:20 +05:30
|
|
|
//(manpage:-n with -b: don't split multibyte characters)
|
2011-03-31 18:13:25 +05:30
|
|
|
//usage:
|
|
|
|
//usage:#define cut_example_usage
|
|
|
|
//usage: "$ echo \"Hello world\" | cut -f 1 -d ' '\n"
|
|
|
|
//usage: "Hello\n"
|
|
|
|
//usage: "$ echo \"Hello world\" | cut -f 2 -d ' '\n"
|
|
|
|
//usage: "world\n"
|
|
|
|
|
2007-05-27 00:30:18 +05:30
|
|
|
#include "libbb.h"
|
2000-05-13 01:11:47 +05:30
|
|
|
|
2007-04-10 21:13:37 +05:30
|
|
|
/* This is a NOEXEC applet. Be very careful! */
|
|
|
|
|
|
|
|
|
2001-05-19 04:34:51 +05:30
|
|
|
/* option vars */
|
2017-08-09 01:25:02 +05:30
|
|
|
#define OPT_STR "b:c:f:d:sn"
|
2007-11-23 12:56:15 +05:30
|
|
|
#define CUT_OPT_BYTE_FLGS (1 << 0)
|
|
|
|
#define CUT_OPT_CHAR_FLGS (1 << 1)
|
|
|
|
#define CUT_OPT_FIELDS_FLGS (1 << 2)
|
|
|
|
#define CUT_OPT_DELIM_FLGS (1 << 3)
|
|
|
|
#define CUT_OPT_SUPPRESS_FLGS (1 << 4)
|
2001-05-19 04:34:51 +05:30
|
|
|
|
|
|
|
struct cut_list {
|
|
|
|
int startpos;
|
|
|
|
int endpos;
|
|
|
|
};
|
|
|
|
|
2006-03-11 00:52:06 +05:30
|
|
|
enum {
|
|
|
|
BOL = 0,
|
|
|
|
EOL = INT_MAX,
|
|
|
|
NON_RANGE = -1
|
|
|
|
};
|
2001-05-19 04:34:51 +05:30
|
|
|
|
|
|
|
static int cmpfunc(const void *a, const void *b)
|
|
|
|
{
|
2006-08-29 05:01:54 +05:30
|
|
|
return (((struct cut_list *) a)->startpos -
|
|
|
|
((struct cut_list *) b)->startpos);
|
|
|
|
}
|
2000-05-13 01:11:47 +05:30
|
|
|
|
2008-07-22 16:04:46 +05:30
|
|
|
static void cut_file(FILE *file, char delim, const struct cut_list *cut_lists, unsigned nlists)
|
2000-05-13 01:11:47 +05:30
|
|
|
{
|
2008-07-22 16:04:46 +05:30
|
|
|
char *line;
|
|
|
|
unsigned linenum = 0; /* keep these zero-based to be consistent */
|
2001-05-19 04:34:51 +05:30
|
|
|
|
2006-08-29 05:01:54 +05:30
|
|
|
/* go through every line in the file */
|
2008-03-27 01:34:27 +05:30
|
|
|
while ((line = xmalloc_fgetline(file)) != NULL) {
|
2001-05-19 04:34:51 +05:30
|
|
|
|
2006-08-29 05:01:54 +05:30
|
|
|
/* set up a list so we can keep track of what's been printed */
|
2008-07-22 16:04:46 +05:30
|
|
|
int linelen = strlen(line);
|
2008-08-16 02:50:23 +05:30
|
|
|
char *printed = xzalloc(linelen + 1);
|
2008-07-22 16:04:46 +05:30
|
|
|
char *orig_line = line;
|
|
|
|
unsigned cl_pos = 0;
|
2006-08-29 05:01:54 +05:30
|
|
|
int spos;
|
2001-05-19 04:34:51 +05:30
|
|
|
|
2006-08-29 05:01:54 +05:30
|
|
|
/* cut based on chars/bytes XXX: only works when sizeof(char) == byte */
|
2006-10-13 04:12:33 +05:30
|
|
|
if (option_mask32 & (CUT_OPT_CHAR_FLGS | CUT_OPT_BYTE_FLGS)) {
|
2006-08-29 05:01:54 +05:30
|
|
|
/* print the chars specified in each cut list */
|
|
|
|
for (; cl_pos < nlists; cl_pos++) {
|
|
|
|
spos = cut_lists[cl_pos].startpos;
|
2008-07-22 16:04:46 +05:30
|
|
|
while (spos < linelen) {
|
2006-08-29 05:01:54 +05:30
|
|
|
if (!printed[spos]) {
|
|
|
|
printed[spos] = 'X';
|
|
|
|
putchar(line[spos]);
|
|
|
|
}
|
|
|
|
spos++;
|
|
|
|
if (spos > cut_lists[cl_pos].endpos
|
2008-07-22 16:04:46 +05:30
|
|
|
/* NON_RANGE is -1, so if below is true,
|
|
|
|
* the above was true too (spos is >= 0) */
|
|
|
|
/* || cut_lists[cl_pos].endpos == NON_RANGE */
|
|
|
|
) {
|
2006-08-29 05:01:54 +05:30
|
|
|
break;
|
2008-07-22 16:04:46 +05:30
|
|
|
}
|
2006-08-29 05:01:54 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (delim == '\n') { /* cut by lines */
|
|
|
|
spos = cut_lists[cl_pos].startpos;
|
|
|
|
|
|
|
|
/* get out if we have no more lists to process or if the lines
|
|
|
|
* are lower than what we're interested in */
|
2008-05-13 07:57:31 +05:30
|
|
|
if (((int)linenum < spos) || (cl_pos >= nlists))
|
2006-08-29 05:01:54 +05:30
|
|
|
goto next_line;
|
|
|
|
|
|
|
|
/* if the line we're looking for is lower than the one we were
|
|
|
|
* passed, it means we displayed it already, so move on */
|
2008-05-13 07:57:31 +05:30
|
|
|
while (spos < (int)linenum) {
|
2006-08-29 05:01:54 +05:30
|
|
|
spos++;
|
|
|
|
/* go to the next list if we're at the end of this one */
|
|
|
|
if (spos > cut_lists[cl_pos].endpos
|
2008-07-22 16:04:46 +05:30
|
|
|
|| cut_lists[cl_pos].endpos == NON_RANGE
|
|
|
|
) {
|
2006-08-29 05:01:54 +05:30
|
|
|
cl_pos++;
|
|
|
|
/* get out if there's no more lists to process */
|
|
|
|
if (cl_pos >= nlists)
|
|
|
|
goto next_line;
|
|
|
|
spos = cut_lists[cl_pos].startpos;
|
|
|
|
/* get out if the current line is lower than the one
|
|
|
|
* we just became interested in */
|
2008-05-13 07:57:31 +05:30
|
|
|
if ((int)linenum < spos)
|
2006-08-29 05:01:54 +05:30
|
|
|
goto next_line;
|
|
|
|
}
|
2001-05-19 04:34:51 +05:30
|
|
|
}
|
|
|
|
|
2006-08-29 05:01:54 +05:30
|
|
|
/* If we made it here, it means we've found the line we're
|
|
|
|
* looking for, so print it */
|
2001-05-19 04:34:51 +05:30
|
|
|
puts(line);
|
2006-08-29 05:01:54 +05:30
|
|
|
goto next_line;
|
|
|
|
} else { /* cut by fields */
|
|
|
|
int ndelim = -1; /* zero-based / one-based problem */
|
|
|
|
int nfields_printed = 0;
|
|
|
|
char *field = NULL;
|
2009-09-06 16:17:55 +05:30
|
|
|
char delimiter[2];
|
|
|
|
|
|
|
|
delimiter[0] = delim;
|
|
|
|
delimiter[1] = 0;
|
2006-08-29 05:01:54 +05:30
|
|
|
|
|
|
|
/* does this line contain any delimiters? */
|
|
|
|
if (strchr(line, delim) == NULL) {
|
2006-10-13 04:12:33 +05:30
|
|
|
if (!(option_mask32 & CUT_OPT_SUPPRESS_FLGS))
|
2006-08-29 05:01:54 +05:30
|
|
|
puts(line);
|
|
|
|
goto next_line;
|
2001-05-19 04:34:51 +05:30
|
|
|
}
|
|
|
|
|
2006-08-29 05:01:54 +05:30
|
|
|
/* process each list on this line, for as long as we've got
|
|
|
|
* a line to process */
|
|
|
|
for (; cl_pos < nlists && line; cl_pos++) {
|
|
|
|
spos = cut_lists[cl_pos].startpos;
|
|
|
|
do {
|
|
|
|
/* find the field we're looking for */
|
|
|
|
while (line && ndelim < spos) {
|
|
|
|
field = strsep(&line, delimiter);
|
|
|
|
ndelim++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we found it, and it hasn't been printed yet */
|
|
|
|
if (field && ndelim == spos && !printed[ndelim]) {
|
|
|
|
/* if this isn't our first time through, we need to
|
|
|
|
* print the delimiter after the last field that was
|
|
|
|
* printed */
|
|
|
|
if (nfields_printed > 0)
|
|
|
|
putchar(delim);
|
2021-02-04 01:17:14 +05:30
|
|
|
fputs_stdout(field);
|
2006-08-29 05:01:54 +05:30
|
|
|
printed[ndelim] = 'X';
|
|
|
|
nfields_printed++; /* shouldn't overflow.. */
|
|
|
|
}
|
|
|
|
|
|
|
|
spos++;
|
|
|
|
|
|
|
|
/* keep going as long as we have a line to work with,
|
|
|
|
* this is a list, and we're not at the end of that
|
|
|
|
* list */
|
|
|
|
} while (spos <= cut_lists[cl_pos].endpos && line
|
2008-07-22 16:04:46 +05:30
|
|
|
&& cut_lists[cl_pos].endpos != NON_RANGE);
|
2001-05-19 04:34:51 +05:30
|
|
|
}
|
2000-05-13 01:11:47 +05:30
|
|
|
}
|
2006-08-29 05:01:54 +05:30
|
|
|
/* if we printed anything at all, we need to finish it with a
|
|
|
|
* newline cuz we were handed a chomped line */
|
|
|
|
putchar('\n');
|
2006-10-13 04:12:33 +05:30
|
|
|
next_line:
|
2006-08-29 05:01:54 +05:30
|
|
|
linenum++;
|
|
|
|
free(printed);
|
|
|
|
free(orig_line);
|
2000-05-13 01:11:47 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-11 15:35:36 +05:30
|
|
|
int cut_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
2008-07-05 14:48:54 +05:30
|
|
|
int cut_main(int argc UNUSED_PARAM, char **argv)
|
2000-05-13 01:11:47 +05:30
|
|
|
{
|
2008-07-22 16:04:46 +05:30
|
|
|
/* growable array holding a series of lists */
|
|
|
|
struct cut_list *cut_lists = NULL;
|
|
|
|
unsigned nlists = 0; /* number of elements in above list */
|
2007-11-23 12:56:15 +05:30
|
|
|
char delim = '\t'; /* delimiter, default is tab */
|
2006-08-29 05:01:54 +05:30
|
|
|
char *sopt, *ltok;
|
2008-07-22 16:04:46 +05:30
|
|
|
unsigned opt;
|
2003-06-20 14:31:58 +05:30
|
|
|
|
2017-08-09 01:25:02 +05:30
|
|
|
opt = getopt32(argv, "^"
|
|
|
|
OPT_STR
|
|
|
|
"\0" "b--bcf:c--bcf:f--bcf",
|
|
|
|
&sopt, &sopt, &sopt, <ok
|
|
|
|
);
|
2006-12-17 05:19:13 +05:30
|
|
|
// argc -= optind;
|
|
|
|
argv += optind;
|
2008-07-22 16:04:46 +05:30
|
|
|
if (!(opt & (CUT_OPT_BYTE_FLGS | CUT_OPT_CHAR_FLGS | CUT_OPT_FIELDS_FLGS)))
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("expected a list of bytes, characters, or fields");
|
2006-08-29 05:01:54 +05:30
|
|
|
|
2008-07-22 16:04:46 +05:30
|
|
|
if (opt & CUT_OPT_DELIM_FLGS) {
|
2007-11-23 12:56:15 +05:30
|
|
|
if (ltok[0] && ltok[1]) { /* more than 1 char? */
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("the delimiter must be a single character");
|
2003-06-20 14:46:00 +05:30
|
|
|
}
|
2006-08-29 05:01:54 +05:30
|
|
|
delim = ltok[0];
|
2000-08-03 00:00:11 +05:30
|
|
|
}
|
|
|
|
|
2001-05-19 04:34:51 +05:30
|
|
|
/* non-field (char or byte) cutting has some special handling */
|
2008-07-22 16:04:46 +05:30
|
|
|
if (!(opt & CUT_OPT_FIELDS_FLGS)) {
|
2007-11-23 12:56:15 +05:30
|
|
|
static const char _op_on_field[] ALIGN1 = " only when operating on fields";
|
|
|
|
|
2008-07-22 16:04:46 +05:30
|
|
|
if (opt & CUT_OPT_SUPPRESS_FLGS) {
|
2006-08-29 05:01:54 +05:30
|
|
|
bb_error_msg_and_die
|
|
|
|
("suppressing non-delimited lines makes sense%s",
|
2013-01-14 06:04:48 +05:30
|
|
|
_op_on_field);
|
2001-05-19 04:34:51 +05:30
|
|
|
}
|
2003-06-20 14:31:58 +05:30
|
|
|
if (delim != '\t') {
|
2006-08-29 05:01:54 +05:30
|
|
|
bb_error_msg_and_die
|
|
|
|
("a delimiter may be specified%s", _op_on_field);
|
2001-05-19 04:34:51 +05:30
|
|
|
}
|
2000-08-03 00:00:11 +05:30
|
|
|
}
|
|
|
|
|
2006-08-29 05:01:54 +05:30
|
|
|
/*
|
|
|
|
* parse list and put values into startpos and endpos.
|
|
|
|
* valid list formats: N, N-, N-M, -M
|
|
|
|
* more than one list can be separated by commas
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
char *ntok;
|
|
|
|
int s = 0, e = 0;
|
|
|
|
|
2008-03-17 14:37:36 +05:30
|
|
|
/* take apart the lists, one by one (they are separated with commas) */
|
2006-08-29 05:01:54 +05:30
|
|
|
while ((ltok = strsep(&sopt, ",")) != NULL) {
|
|
|
|
|
|
|
|
/* it's actually legal to pass an empty list */
|
2007-11-23 12:56:15 +05:30
|
|
|
if (!ltok[0])
|
2006-08-29 05:01:54 +05:30
|
|
|
continue;
|
|
|
|
|
|
|
|
/* get the start pos */
|
|
|
|
ntok = strsep(<ok, "-");
|
2007-11-23 12:56:15 +05:30
|
|
|
if (!ntok[0]) {
|
2006-08-29 05:01:54 +05:30
|
|
|
s = BOL;
|
|
|
|
} else {
|
2010-08-12 17:44:45 +05:30
|
|
|
s = xatoi_positive(ntok);
|
2006-08-29 05:01:54 +05:30
|
|
|
/* account for the fact that arrays are zero based, while
|
|
|
|
* the user expects the first char on the line to be char #1 */
|
|
|
|
if (s != 0)
|
|
|
|
s--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get the end pos */
|
2007-11-23 12:56:15 +05:30
|
|
|
if (ltok == NULL) {
|
2006-08-29 05:01:54 +05:30
|
|
|
e = NON_RANGE;
|
2007-11-23 12:56:15 +05:30
|
|
|
} else if (!ltok[0]) {
|
2006-08-29 05:01:54 +05:30
|
|
|
e = EOL;
|
|
|
|
} else {
|
2010-08-12 17:44:45 +05:30
|
|
|
e = xatoi_positive(ltok);
|
2008-07-22 16:04:46 +05:30
|
|
|
/* if the user specified and end position of 0,
|
|
|
|
* that means "til the end of the line" */
|
2006-08-29 05:01:54 +05:30
|
|
|
if (e == 0)
|
|
|
|
e = EOL;
|
|
|
|
e--; /* again, arrays are zero based, lines are 1 based */
|
|
|
|
if (e == s)
|
|
|
|
e = NON_RANGE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add the new list */
|
2008-07-08 10:44:36 +05:30
|
|
|
cut_lists = xrealloc_vector(cut_lists, 4, nlists);
|
2008-07-22 16:04:46 +05:30
|
|
|
/* NB: startpos is always >= 0,
|
|
|
|
* while endpos may be = NON_RANGE (-1) */
|
2008-07-08 10:44:36 +05:30
|
|
|
cut_lists[nlists].startpos = s;
|
|
|
|
cut_lists[nlists].endpos = e;
|
|
|
|
nlists++;
|
2006-08-29 05:01:54 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
/* make sure we got some cut positions out of all that */
|
|
|
|
if (nlists == 0)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_error_msg_and_die("missing list of positions");
|
2006-08-29 05:01:54 +05:30
|
|
|
|
|
|
|
/* now that the lists are parsed, we need to sort them to make life
|
|
|
|
* easier on us when it comes time to print the chars / fields / lines
|
|
|
|
*/
|
2010-01-18 16:55:09 +05:30
|
|
|
qsort(cut_lists, nlists, sizeof(cut_lists[0]), cmpfunc);
|
2006-08-29 05:01:54 +05:30
|
|
|
}
|
|
|
|
|
2007-11-23 12:56:15 +05:30
|
|
|
{
|
|
|
|
int retval = EXIT_SUCCESS;
|
|
|
|
|
2008-03-17 14:37:36 +05:30
|
|
|
if (!*argv)
|
|
|
|
*--argv = (char *)"-";
|
2006-08-29 05:01:54 +05:30
|
|
|
|
2006-12-17 05:19:13 +05:30
|
|
|
do {
|
2008-03-17 14:37:36 +05:30
|
|
|
FILE *file = fopen_or_warn_stdin(*argv);
|
2007-11-23 12:56:15 +05:30
|
|
|
if (!file) {
|
|
|
|
retval = EXIT_FAILURE;
|
|
|
|
continue;
|
2000-05-13 01:11:47 +05:30
|
|
|
}
|
2008-07-22 16:04:46 +05:30
|
|
|
cut_file(file, delim, cut_lists, nlists);
|
2008-03-17 14:37:36 +05:30
|
|
|
fclose_if_not_stdin(file);
|
2006-12-17 05:19:13 +05:30
|
|
|
} while (*++argv);
|
2007-11-23 12:56:15 +05:30
|
|
|
|
|
|
|
if (ENABLE_FEATURE_CLEAN_UP)
|
|
|
|
free(cut_lists);
|
|
|
|
fflush_stdout_and_exit(retval);
|
2000-05-13 01:11:47 +05:30
|
|
|
}
|
|
|
|
}
|