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>
293 lines
7.5 KiB
C
293 lines
7.5 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* reformime: parse MIME-encoded message
|
|
*
|
|
* Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
|
|
*
|
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config REFORMIME
|
|
//config: bool "reformime (7.5 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: Parse MIME-formatted messages.
|
|
//config:
|
|
//config:config FEATURE_REFORMIME_COMPAT
|
|
//config: bool "Accept and ignore options other than -x and -X"
|
|
//config: default y
|
|
//config: depends on REFORMIME
|
|
//config: help
|
|
//config: Accept (for compatibility only) and ignore options
|
|
//config: other than -x and -X.
|
|
|
|
//applet:IF_REFORMIME(APPLET(reformime, BB_DIR_BIN, BB_SUID_DROP))
|
|
|
|
//kbuild:lib-$(CONFIG_REFORMIME) += reformime.o mail.o
|
|
|
|
#include "libbb.h"
|
|
#include "mail.h"
|
|
|
|
#if 0
|
|
# define dbg_error_msg(...) bb_error_msg(__VA_ARGS__)
|
|
#else
|
|
# define dbg_error_msg(...) ((void)0)
|
|
#endif
|
|
|
|
static const char *find_token(const char *const string_array[], const char *key, const char *defvalue)
|
|
{
|
|
const char *r = NULL;
|
|
int i;
|
|
for (i = 0; string_array[i] != NULL; i++) {
|
|
if (strcasecmp(string_array[i], key) == 0) {
|
|
r = (char *)string_array[i+1];
|
|
break;
|
|
}
|
|
}
|
|
return (r) ? r : defvalue;
|
|
}
|
|
|
|
static const char *xfind_token(const char *const string_array[], const char *key)
|
|
{
|
|
const char *r = find_token(string_array, key, NULL);
|
|
if (r)
|
|
return r;
|
|
bb_error_msg_and_die("not found: '%s'", key);
|
|
}
|
|
|
|
enum {
|
|
OPT_x = 1 << 0,
|
|
OPT_X = 1 << 1,
|
|
#if ENABLE_FEATURE_REFORMIME_COMPAT
|
|
OPT_d = 1 << 2,
|
|
OPT_e = 1 << 3,
|
|
OPT_i = 1 << 4,
|
|
OPT_s = 1 << 5,
|
|
OPT_r = 1 << 6,
|
|
OPT_c = 1 << 7,
|
|
OPT_m = 1 << 8,
|
|
OPT_h = 1 << 9,
|
|
OPT_o = 1 << 10,
|
|
OPT_O = 1 << 11,
|
|
#endif
|
|
};
|
|
|
|
static int parse(const char *boundary, char **argv)
|
|
{
|
|
int boundary_len = strlen(boundary);
|
|
char uniq[sizeof("%%llu.%u") + sizeof(int)*3];
|
|
|
|
dbg_error_msg("BOUNDARY[%s]", boundary);
|
|
|
|
// prepare unique string pattern
|
|
sprintf(uniq, "%%llu.%u", (unsigned)getpid());
|
|
dbg_error_msg("UNIQ[%s]", uniq);
|
|
|
|
while (1) {
|
|
char *header;
|
|
const char *tokens[32]; /* 32 is enough */
|
|
const char *type;
|
|
|
|
/* Read the header (everything up to two \n) */
|
|
{
|
|
unsigned header_idx = 0;
|
|
int last_ch = 0;
|
|
header = NULL;
|
|
while (1) {
|
|
int ch = fgetc(stdin);
|
|
if (ch == '\r') /* Support both line endings */
|
|
continue;
|
|
if (ch == EOF)
|
|
break;
|
|
if (ch == '\n' && last_ch == ch)
|
|
break;
|
|
if (!(header_idx & 0xff))
|
|
header = xrealloc(header, header_idx + 0x101);
|
|
header[header_idx++] = last_ch = ch;
|
|
}
|
|
if (!header) {
|
|
dbg_error_msg("EOF");
|
|
break;
|
|
}
|
|
header[header_idx] = '\0';
|
|
dbg_error_msg("H:'%s'", p);
|
|
}
|
|
|
|
/* Split to tokens */
|
|
{
|
|
char *s, *p;
|
|
unsigned ntokens;
|
|
const char *delims = ";=\" \t\n";
|
|
|
|
/* Skip to last Content-Type: */
|
|
s = p = header;
|
|
while ((p = strchr(p, '\n')) != NULL) {
|
|
p++;
|
|
if (strncasecmp(p, "Content-Type:", sizeof("Content-Type:")-1) == 0)
|
|
s = p;
|
|
}
|
|
dbg_error_msg("L:'%s'", p);
|
|
ntokens = 0;
|
|
s = strtok(s, delims);
|
|
while (s) {
|
|
tokens[ntokens] = s;
|
|
if (ntokens < ARRAY_SIZE(tokens) - 1)
|
|
ntokens++;
|
|
dbg_error_msg("L[%d]='%s'", ntokens, s);
|
|
s = strtok(NULL, delims);
|
|
}
|
|
tokens[ntokens] = NULL;
|
|
dbg_error_msg("EMPTYLINE, ntokens:%d", ntokens);
|
|
if (ntokens == 0)
|
|
break;
|
|
}
|
|
|
|
/* Is it multipart? */
|
|
type = find_token(tokens, "Content-Type:", "text/plain");
|
|
dbg_error_msg("TYPE:'%s'", type);
|
|
if (0 == strncasecmp(type, "multipart/", 10)) {
|
|
/* Yes, recurse */
|
|
if (strcasecmp(type + 10, "mixed") != 0)
|
|
bb_error_msg_and_die("no support of content type '%s'", type);
|
|
parse(xfind_token(tokens, "boundary"), argv);
|
|
} else {
|
|
/* No, process one non-multipart section */
|
|
char *end;
|
|
pid_t pid = pid;
|
|
FILE *fp;
|
|
|
|
const char *charset = find_token(tokens, "charset", CONFIG_FEATURE_MIME_CHARSET);
|
|
const char *encoding = find_token(tokens, "Content-Transfer-Encoding:", "7bit");
|
|
|
|
/* Compose target filename */
|
|
char *filename = (char *)find_token(tokens, "filename", NULL);
|
|
if (!filename)
|
|
filename = xasprintf(uniq, monotonic_us());
|
|
else
|
|
filename = bb_get_last_path_component_strip(xstrdup(filename));
|
|
|
|
if (opts & OPT_X) {
|
|
int fd[2];
|
|
|
|
/* start external helper */
|
|
xpipe(fd);
|
|
pid = vfork();
|
|
if (0 == pid) {
|
|
/* child reads from fd[0] */
|
|
close(fd[1]);
|
|
xmove_fd(fd[0], STDIN_FILENO);
|
|
xsetenv("CONTENT_TYPE", type);
|
|
xsetenv("CHARSET", charset);
|
|
xsetenv("ENCODING", encoding);
|
|
xsetenv("FILENAME", filename);
|
|
BB_EXECVP_or_die(argv);
|
|
}
|
|
/* parent will write to fd[1] */
|
|
close(fd[0]);
|
|
fp = xfdopen_for_write(fd[1]);
|
|
signal(SIGPIPE, SIG_IGN);
|
|
} else {
|
|
/* write to file */
|
|
char *fname = xasprintf("%s%s", *argv, filename);
|
|
fp = xfopen_for_write(fname);
|
|
free(fname);
|
|
}
|
|
free(filename);
|
|
|
|
/* write to fp */
|
|
end = NULL;
|
|
if (0 == strcasecmp(encoding, "base64")) {
|
|
read_base64(stdin, fp, '-');
|
|
} else
|
|
if (0 != strcasecmp(encoding, "7bit")
|
|
&& 0 != strcasecmp(encoding, "8bit")
|
|
) {
|
|
/* quoted-printable, binary, user-defined are unsupported so far */
|
|
bb_error_msg_and_die("encoding '%s' not supported", encoding);
|
|
} else {
|
|
/* plain 7bit or 8bit */
|
|
while ((end = xmalloc_fgets(stdin)) != NULL) {
|
|
if ('-' == end[0]
|
|
&& '-' == end[1]
|
|
&& strncmp(end + 2, boundary, boundary_len) == 0
|
|
) {
|
|
break;
|
|
}
|
|
fputs(end, fp);
|
|
}
|
|
}
|
|
fclose(fp);
|
|
|
|
/* Wait for child */
|
|
if (opts & OPT_X) {
|
|
int rc;
|
|
signal(SIGPIPE, SIG_DFL);
|
|
rc = (wait4pid(pid) & 0xff);
|
|
if (rc != 0)
|
|
return rc + 20;
|
|
}
|
|
|
|
/* Multipart ended? */
|
|
if (end && '-' == end[2 + boundary_len] && '-' == end[2 + boundary_len + 1]) {
|
|
dbg_error_msg("FINISHED MPART:'%s'", end);
|
|
break;
|
|
}
|
|
dbg_error_msg("FINISHED:'%s'", end);
|
|
free(end);
|
|
} /* end of "handle one non-multipart block" */
|
|
|
|
free(header);
|
|
} /* while (1) */
|
|
|
|
dbg_error_msg("ENDPARSE[%s]", boundary);
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|
|
|
|
//usage:#define reformime_trivial_usage
|
|
//usage: "[OPTIONS]"
|
|
//usage:#define reformime_full_usage "\n\n"
|
|
//usage: "Parse MIME-encoded message on stdin\n"
|
|
//usage: "\n -x PREFIX Extract content of MIME sections to files"
|
|
//usage: "\n -X PROG ARGS Filter content of MIME sections through PROG"
|
|
//usage: "\n Must be the last option"
|
|
//usage: "\n"
|
|
//usage: "\nOther options are silently ignored"
|
|
|
|
/*
|
|
Usage: reformime [options]
|
|
-d - parse a delivery status notification.
|
|
-e - extract contents of MIME section.
|
|
-x - extract MIME section to a file.
|
|
-X - pipe MIME section to a program.
|
|
-i - show MIME info.
|
|
-s n.n.n.n - specify MIME section.
|
|
-r - rewrite message, filling in missing MIME headers.
|
|
-r7 - also convert 8bit/raw encoding to quoted-printable, if possible.
|
|
-r8 - also convert quoted-printable encoding to 8bit, if possible.
|
|
-c charset - default charset for rewriting, -o, and -O.
|
|
-m [file] [file]... - create a MIME message digest.
|
|
-h "header" - decode RFC 2047-encoded header.
|
|
-o "header" - encode unstructured header using RFC 2047.
|
|
-O "header" - encode address list header using RFC 2047.
|
|
*/
|
|
|
|
int reformime_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int reformime_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
const char *opt_prefix = "";
|
|
|
|
INIT_G();
|
|
|
|
// parse options
|
|
// N.B. only -x and -X are supported so far
|
|
opts = getopt32(argv, "^"
|
|
"x:X" IF_FEATURE_REFORMIME_COMPAT("deis:r:c:m:*h:o:O:")
|
|
"\0" "x--X:X--x",
|
|
&opt_prefix
|
|
IF_FEATURE_REFORMIME_COMPAT(, NULL, NULL, &G.opt_charset, NULL, NULL, NULL, NULL)
|
|
);
|
|
argv += optind;
|
|
|
|
return parse("", (opts & OPT_X) ? argv : (char **)&opt_prefix);
|
|
}
|