mirror of
https://git.busybox.net/busybox.git
synced 2024-12-19 11:23:21 +08:00
22542eca18
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
253 lines
6.6 KiB
C
253 lines
6.6 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* config file parser helper
|
|
*
|
|
* Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
* Also for use in uClibc (http://uclibc.org/) licensed under LGPLv2.1 or later.
|
|
*/
|
|
|
|
/* Uncomment to enable test applet */
|
|
////config:config PARSE
|
|
////config: bool "Uniform config file parser debugging applet: parse"
|
|
////config: default n
|
|
////config: help
|
|
////config: Typical usage of parse API:
|
|
////config: char *t[3];
|
|
////config: parser_t *p = config_open(filename);
|
|
////config: while (config_read(p, t, 3, 0, delimiters, flags)) { // 1..3 tokens
|
|
////config: bb_error_msg("TOKENS: '%s''%s''%s'", t[0], t[1], t[2]);
|
|
////config: }
|
|
////config: config_close(p);
|
|
|
|
////applet:IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP))
|
|
|
|
//kbuild:lib-y += parse_config.o
|
|
|
|
//usage:#define parse_trivial_usage
|
|
//usage: "[-x] [-n MAXTOKENS] [-m MINTOKENS] [-d DELIMS] [-f FLAGS] FILE..."
|
|
//usage:#define parse_full_usage "\n\n"
|
|
//usage: " -x Suppress output (for benchmarking)"
|
|
|
|
#include "libbb.h"
|
|
|
|
#if defined ENABLE_PARSE && ENABLE_PARSE
|
|
int parse_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int parse_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
const char *delims = "# \t";
|
|
char **t;
|
|
unsigned flags = PARSE_NORMAL;
|
|
int mintokens = 0, ntokens = 128;
|
|
unsigned noout;
|
|
|
|
noout = 1 & getopt32(argv, "^" "xn:+m:+d:f:+" "\0" "-1",
|
|
&ntokens, &mintokens, &delims, &flags
|
|
);
|
|
//argc -= optind;
|
|
argv += optind;
|
|
|
|
t = xmalloc(sizeof(t[0]) * ntokens);
|
|
while (*argv) {
|
|
int n;
|
|
parser_t *p = config_open(*argv);
|
|
while ((n = config_read(p, t, ntokens, mintokens, delims, flags)) != 0) {
|
|
if (!noout) {
|
|
for (int i = 0; i < n; ++i)
|
|
printf("[%s]", t[i]);
|
|
puts("");
|
|
}
|
|
}
|
|
config_close(p);
|
|
argv++;
|
|
}
|
|
return EXIT_SUCCESS;
|
|
}
|
|
#endif
|
|
|
|
parser_t* FAST_FUNC config_open2(const char *filename, FILE* FAST_FUNC (*fopen_func)(const char *path))
|
|
{
|
|
FILE* fp;
|
|
parser_t *parser;
|
|
|
|
fp = fopen_func(filename);
|
|
if (!fp)
|
|
return NULL;
|
|
parser = xzalloc(sizeof(*parser));
|
|
parser->fp = fp;
|
|
return parser;
|
|
}
|
|
|
|
parser_t* FAST_FUNC config_open(const char *filename)
|
|
{
|
|
return config_open2(filename, fopen_or_warn_stdin);
|
|
}
|
|
|
|
void FAST_FUNC config_close(parser_t *parser)
|
|
{
|
|
if (parser) {
|
|
if (PARSE_KEEP_COPY) /* compile-time constant */
|
|
free(parser->data);
|
|
fclose(parser->fp);
|
|
free(parser->line);
|
|
free(parser->nline);
|
|
free(parser);
|
|
}
|
|
}
|
|
|
|
/* This function reads an entire line from a text file,
|
|
* up to a newline, exclusive.
|
|
* Trailing '\' is recognized as line continuation.
|
|
* Returns -1 if EOF/error.
|
|
*/
|
|
static int get_line_with_continuation(parser_t *parser)
|
|
{
|
|
ssize_t len, nlen;
|
|
char *line;
|
|
|
|
len = getline(&parser->line, &parser->line_alloc, parser->fp);
|
|
if (len <= 0)
|
|
return len;
|
|
|
|
line = parser->line;
|
|
for (;;) {
|
|
parser->lineno++;
|
|
if (line[len - 1] == '\n')
|
|
len--;
|
|
if (len == 0 || line[len - 1] != '\\')
|
|
break;
|
|
len--;
|
|
|
|
nlen = getline(&parser->nline, &parser->nline_alloc, parser->fp);
|
|
if (nlen <= 0)
|
|
break;
|
|
|
|
if (parser->line_alloc < len + nlen + 1) {
|
|
parser->line_alloc = len + nlen + 1;
|
|
line = parser->line = xrealloc(line, parser->line_alloc);
|
|
}
|
|
memcpy(&line[len], parser->nline, nlen);
|
|
len += nlen;
|
|
}
|
|
|
|
line[len] = '\0';
|
|
return len;
|
|
}
|
|
|
|
|
|
/*
|
|
0. If parser is NULL return 0.
|
|
1. Read a line from config file. If nothing to read then return 0.
|
|
Handle continuation character. Advance lineno for each physical line.
|
|
Discard everything past comment character.
|
|
2. if PARSE_TRIM is set (default), remove leading and trailing delimiters.
|
|
3. If resulting line is empty goto 1.
|
|
4. Look for first delimiter. If !PARSE_COLLAPSE or !PARSE_TRIM is set then
|
|
remember the token as empty.
|
|
5. Else (default) if number of seen tokens is equal to max number of tokens
|
|
(token is the last one) and PARSE_GREEDY is set then the remainder
|
|
of the line is the last token.
|
|
Else (token is not last or PARSE_GREEDY is not set) just replace
|
|
first delimiter with '\0' thus delimiting the token.
|
|
6. Advance line pointer past the end of token. If number of seen tokens
|
|
is less than required number of tokens then goto 4.
|
|
7. Check the number of seen tokens is not less the min number of tokens.
|
|
Complain or die otherwise depending on PARSE_MIN_DIE.
|
|
8. Return the number of seen tokens.
|
|
|
|
mintokens > 0 make config_read() print error message if less than mintokens
|
|
(but more than 0) are found. Empty lines are always skipped (not warned about).
|
|
*/
|
|
#undef config_read
|
|
int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const char *delims)
|
|
{
|
|
char *line, *p;
|
|
int ntokens, mintokens;
|
|
int t;
|
|
char alt_comment_ch;
|
|
|
|
if (!parser)
|
|
return 0;
|
|
|
|
alt_comment_ch = '\0';
|
|
if (flags & PARSE_ALT_COMMENTS)
|
|
alt_comment_ch = *delims++;
|
|
|
|
ntokens = (uint8_t)flags;
|
|
mintokens = (uint8_t)(flags >> 8);
|
|
|
|
again:
|
|
memset(tokens, 0, sizeof(tokens[0]) * ntokens);
|
|
|
|
/* Read one line (handling continuations with backslash) */
|
|
if (get_line_with_continuation(parser) < 0)
|
|
return 0;
|
|
|
|
line = parser->line;
|
|
|
|
/* Skip token in the start of line? */
|
|
if (flags & PARSE_TRIM)
|
|
line += strspn(line, delims + 1);
|
|
|
|
p = line;
|
|
if (flags & PARSE_WS_COMMENTS)
|
|
p = skip_whitespace(p);
|
|
if (p[0] == '\0' || p[0] == delims[0] || p[0] == alt_comment_ch)
|
|
goto again;
|
|
|
|
if (flags & PARSE_KEEP_COPY) {
|
|
free(parser->data);
|
|
parser->data = xstrdup(line);
|
|
}
|
|
|
|
/* Tokenize the line */
|
|
t = 0;
|
|
do {
|
|
/* Pin token */
|
|
tokens[t] = line;
|
|
|
|
/* Combine remaining arguments? */
|
|
if ((t != (ntokens-1)) || !(flags & PARSE_GREEDY)) {
|
|
/* Vanilla token, find next delimiter */
|
|
line += strcspn(line, (delims[0] && (flags & PARSE_EOL_COMMENTS)) ? delims : delims + 1);
|
|
} else {
|
|
/* Combining, find comment char if any */
|
|
line = strchrnul(line, (flags & PARSE_EOL_COMMENTS) ? delims[0] : '\0');
|
|
|
|
/* Trim any extra delimiters from the end */
|
|
if (flags & PARSE_TRIM) {
|
|
while (strchr(delims + 1, line[-1]) != NULL)
|
|
line--;
|
|
}
|
|
}
|
|
|
|
/* Token not terminated? */
|
|
if ((flags & PARSE_EOL_COMMENTS) && *line == delims[0])
|
|
*line = '\0'; /* ends with comment char: this line is done */
|
|
else if (*line != '\0')
|
|
*line++ = '\0'; /* token is done, continue parsing line */
|
|
|
|
#if 0 /* unused so far */
|
|
if (flags & PARSE_ESCAPE) {
|
|
strcpy_and_process_escape_sequences(tokens[t], tokens[t]);
|
|
}
|
|
#endif
|
|
/* Skip possible delimiters */
|
|
if (flags & PARSE_COLLAPSE)
|
|
line += strspn(line, delims + 1);
|
|
|
|
t++;
|
|
} while (*line && *line != delims[0] && t < ntokens);
|
|
|
|
if (t < mintokens) {
|
|
bb_error_msg("bad line %u: %d tokens found, %d needed",
|
|
parser->lineno, t, mintokens);
|
|
if (flags & PARSE_MIN_DIE)
|
|
xfunc_die();
|
|
goto again;
|
|
}
|
|
|
|
return t;
|
|
}
|