mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
------------------------------------------------------------------------ r15465 | aldot | 2006-06-21 20:48:06 +0200 (Wed, 21 Jun 2006) | 3 lines - use CONFIG_BUSYBOX_EXEC_PATH as before it one was broken by a recent revert. - use xchdir() since all is invain if it fails there anyways, supposedly ------------------------------------------------------------------------ r15466 | aldot | 2006-06-21 20:55:16 +0200 (Wed, 21 Jun 2006) | 2 lines - adjust docs to take CONFIG_BUSYBOX_EXEC_PATH into account. ------------------------------------------------------------------------ r15467 | aldot | 2006-06-21 21:31:24 +0200 (Wed, 21 Jun 2006) | 18 lines - partial fallout of my TREE_USED touchup against gcc-4.2: rip unused vars, save s 144 bytes text data bss dec hex filename 862434 10156 645924 1518514 172bb2 busybox.old 862322 10156 645892 1518370 172b22 busybox function old new delta z_len 4 - -4 textend 4 - -4 part_nb 4 - -4 insize 4 - -4 ifile_size 4 - -4 do_link 4 - -4 new_text 70 60 -10 ipaddr_list_link 33 23 -10 gzip_main 898 822 -76 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 0/3 up/down: 0/-120) Total: -120 bytes ------------------------------------------------------------------------ r15468 | aldot | 2006-06-21 21:43:05 +0200 (Wed, 21 Jun 2006) | 19 lines - remove useless global exports function old new delta rpm_main 940 1601 +661 rpm_getstring 107 112 +5 rpm_getint 148 153 +5 loop_through_files 103 106 +3 fileaction_dobackup 115 113 -2 fileaction_list 5 - -5 rpm_getcount 42 - -42 extract_cpio_gz 161 - -161 rpm_gettags 504 - -504 ------------------------------------------------------------------------------ (add/remove: 0/4 grow/shrink: 4/1 up/down: 674/-714) Total: -40 bytes text data bss dec hex filename 862322 10156 645892 1518370 172b22 busybox.old 862290 10156 645892 1518338 172b02 busybox ------------------------------------------------------------------------ r15555 | aldot | 2006-06-30 14:10:11 +0200 (Fri, 30 Jun 2006) | 22 lines - shrink syslog a little bit, move a big buffer (for 'line') off the bss, fold s emaphore stuff into single caller manually. stats: function old new delta logMessage 395 427 +32 message 1245 1257 +12 opts - 4 +4 small 1 - -1 local_logging 4 - -4 doRemoteLog 4 - -4 circular_logging 4 - -4 syslogd_main 1299 1285 -14 static.res 36 16 -20 .rodata 186650 186586 -64 static.line 1025 - -1025 ------------------------------------------------------------------------------ (add/remove: 1/5 grow/shrink: 2/3 up/down: 48/-1136) Total: -1088 bytes cow@s37:~/src/busybox_scratch$ size sysklogd/syslogd.o{.orig,} text data bss dec hex filename 3723 348 5242 9313 2461 sysklogd/syslogd.o.orig 3697 348 4188 8233 2029 sysklogd/syslogd.o ============================================================================== Overall bloatcheck for the changeset mentioned above: function old new delta rpm_main 953 1608 +655 logMessage 395 427 +32 message 1245 1257 +12 opts - 4 +4 rpm_getstring 107 110 +3 rpm_getint 148 151 +3 loop_through_files 103 104 +1 small 1 - -1 fileaction_dobackup 115 113 -2 z_len 4 - -4 textend 4 - -4 part_nb 4 - -4 local_logging 4 - -4 insize 4 - -4 ifile_size 4 - -4 do_link 4 - -4 doRemoteLog 4 - -4 circular_logging 4 - -4 fileaction_list 5 - -5 new_text 70 60 -10 ipaddr_list_link 33 23 -10 clear_bufs 31 21 -10 syslogd_main 1287 1273 -14 builtin_help 190 176 -14 static.res 36 16 -20 builtin_source 229 199 -30 rpm_getcount 42 - -42 gzip_main 842 786 -56 .rodata 227176 227112 -64 lash_main 609 527 -82 busy_loop 3883 3739 -144 extract_cpio_gz 155 - -155 rpm_gettags 501 - -501 static.line 1025 - -1025 ------------------------------------------------------------------------------ (add/remove: 1/15 grow/shrink: 6/12 up/down: 710/-2221) Total: -1511 bytes
183 lines
4.1 KiB
C
183 lines
4.1 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Copyright 2003, Glenn McGrath <bug1@iinet.net.au>
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
|
*
|
|
* Based on specification from
|
|
* http://www.opengroup.org/onlinepubs/007904975/utilities/uuencode.html
|
|
*
|
|
* Bugs: the spec doesn't mention anything about "`\n`\n" prior to the
|
|
* "end" line
|
|
*/
|
|
|
|
|
|
#include "busybox.h"
|
|
|
|
static int read_stduu(FILE *src_stream, FILE *dst_stream)
|
|
{
|
|
char *line;
|
|
|
|
while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
|
|
int length;
|
|
char *line_ptr = line;
|
|
|
|
if (strcmp(line, "end") == 0) {
|
|
return(EXIT_SUCCESS);
|
|
}
|
|
length = ((*line_ptr - 0x20) & 0x3f)* 4 / 3;
|
|
|
|
if (length <= 0) {
|
|
/* Ignore the "`\n" line, why is it even in the encode file ? */
|
|
continue;
|
|
}
|
|
if (length > 60) {
|
|
bb_error_msg_and_die("Line too long");
|
|
}
|
|
|
|
line_ptr++;
|
|
/* Tolerate an overly long line to acomadate a possible exta '`' */
|
|
if (strlen(line_ptr) < (size_t)length) {
|
|
bb_error_msg_and_die("Short file");
|
|
}
|
|
|
|
while (length > 0) {
|
|
/* Merge four 6 bit chars to three 8 bit chars */
|
|
fputc(((line_ptr[0] - 0x20) & 077) << 2 | ((line_ptr[1] - 0x20) & 077) >> 4, dst_stream);
|
|
line_ptr++;
|
|
length--;
|
|
if (length == 0) {
|
|
break;
|
|
}
|
|
|
|
fputc(((line_ptr[0] - 0x20) & 077) << 4 | ((line_ptr[1] - 0x20) & 077) >> 2, dst_stream);
|
|
line_ptr++;
|
|
length--;
|
|
if (length == 0) {
|
|
break;
|
|
}
|
|
|
|
fputc(((line_ptr[0] - 0x20) & 077) << 6 | ((line_ptr[1] - 0x20) & 077), dst_stream);
|
|
line_ptr += 2;
|
|
length -= 2;
|
|
}
|
|
free(line);
|
|
}
|
|
bb_error_msg_and_die("Short file");
|
|
}
|
|
|
|
static int read_base64(FILE *src_stream, FILE *dst_stream)
|
|
{
|
|
static const char base64_table[] =
|
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n";
|
|
char term_count = 0;
|
|
|
|
while (1) {
|
|
char translated[4];
|
|
int count = 0;
|
|
|
|
while (count < 4) {
|
|
char *table_ptr;
|
|
int ch;
|
|
|
|
/* Get next _valid_ character */
|
|
do {
|
|
ch = fgetc(src_stream);
|
|
if (ch == EOF) {
|
|
bb_error_msg_and_die("Short file");
|
|
}
|
|
} while ((table_ptr = strchr(base64_table, ch)) == NULL);
|
|
|
|
/* Convert encoded charcter to decimal */
|
|
ch = table_ptr - base64_table;
|
|
|
|
if (*table_ptr == '=') {
|
|
if (term_count == 0) {
|
|
translated[count] = 0;
|
|
break;
|
|
}
|
|
term_count++;
|
|
}
|
|
else if (*table_ptr == '\n') {
|
|
/* Check for terminating line */
|
|
if (term_count == 5) {
|
|
return(EXIT_SUCCESS);
|
|
}
|
|
term_count = 1;
|
|
continue;
|
|
} else {
|
|
translated[count] = ch;
|
|
count++;
|
|
term_count = 0;
|
|
}
|
|
}
|
|
|
|
/* Merge 6 bit chars to 8 bit */
|
|
fputc(translated[0] << 2 | translated[1] >> 4, dst_stream);
|
|
if (count > 2) {
|
|
fputc(translated[1] << 4 | translated[2] >> 2, dst_stream);
|
|
}
|
|
if (count > 3) {
|
|
fputc(translated[2] << 6 | translated[3], dst_stream);
|
|
}
|
|
}
|
|
}
|
|
|
|
int uudecode_main(int argc, char **argv)
|
|
{
|
|
int (*decode_fn_ptr) (FILE * src, FILE * dst);
|
|
FILE *src_stream;
|
|
char *outname = NULL;
|
|
char *line;
|
|
|
|
bb_getopt_ulflags(argc, argv, "o:", &outname);
|
|
|
|
if (optind == argc) {
|
|
src_stream = stdin;
|
|
} else if (optind + 1 == argc) {
|
|
src_stream = xfopen(argv[optind], "r");
|
|
} else {
|
|
bb_show_usage();
|
|
}
|
|
|
|
/* Search for the start of the encoding */
|
|
while ((line = bb_get_chomped_line_from_file(src_stream)) != NULL) {
|
|
char *line_ptr = NULL;
|
|
|
|
if (strncmp(line, "begin-base64 ", 13) == 0) {
|
|
line_ptr = line + 13;
|
|
decode_fn_ptr = read_base64;
|
|
} else if (strncmp(line, "begin ", 6) == 0) {
|
|
line_ptr = line + 6;
|
|
decode_fn_ptr = read_stduu;
|
|
}
|
|
|
|
if (line_ptr) {
|
|
FILE *dst_stream;
|
|
int mode;
|
|
int ret;
|
|
|
|
mode = strtoul(line_ptr, NULL, 8);
|
|
if (outname == NULL) {
|
|
outname = strchr(line_ptr, ' ');
|
|
if ((outname == NULL) || (*outname == '\0')) {
|
|
break;
|
|
}
|
|
outname++;
|
|
}
|
|
if (strcmp(outname, "-") == 0) {
|
|
dst_stream = stdout;
|
|
} else {
|
|
dst_stream = xfopen(outname, "w");
|
|
chmod(outname, mode & (S_IRWXU | S_IRWXG | S_IRWXO));
|
|
}
|
|
free(line);
|
|
ret = decode_fn_ptr(src_stream, dst_stream);
|
|
bb_fclose_nonstdin(src_stream);
|
|
return(ret);
|
|
}
|
|
free(line);
|
|
}
|
|
bb_error_msg_and_die("No `begin' line");
|
|
}
|