emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uuencode: shrink

Browse Source 
function                                             old     new   delta
uuencode_main                                        427     337     -90
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-90)             Total: -90 bytes
   text    data     bss     dec     hex filename
 734981    3028   14400  752409   b7b19 busybox_old
 734889    3028   14400  752317   b7abd busybox_unstripped
This commit is contained in:
Denis Vlasenko 2007-06-26 15:59:37 +00:00
parent 1fc6238ffa
commit e8240f19bd
4 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
coreutils/uuencode.c
View File

@ -10,64 +10,52 @@
#include "libbb.h" #include "libbb.h"
enum {
SRC_BUF_SIZE = 45, /* This *MUST* be a multiple of 3 */
DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3),
};
#define SRC_BUF_SIZE 45 // This *MUST* be a multiple of 3
#define DST_BUF_SIZE 4 * ((SRC_BUF_SIZE + 2) / 3)
int uuencode_main(int argc, char **argv); int uuencode_main(int argc, char **argv);
int uuencode_main(int argc, char **argv) int uuencode_main(int argc, char **argv)
{ {
const size_t src_buf_size = SRC_BUF_SIZE;
const size_t dst_buf_size = DST_BUF_SIZE;
size_t write_size = dst_buf_size;
struct stat stat_buf; struct stat stat_buf;
FILE *src_stream = stdin; int src_fd = STDIN_FILENO;
const char *tbl; const char *tbl;
size_t size;
mode_t mode; mode_t mode;
RESERVE_CONFIG_BUFFER(src_buf, SRC_BUF_SIZE + 1); char src_buf[SRC_BUF_SIZE];
RESERVE_CONFIG_BUFFER(dst_buf, DST_BUF_SIZE + 1); char dst_buf[DST_BUF_SIZE + 1];
tbl = bb_uuenc_tbl_std; tbl = bb_uuenc_tbl_std;
mode = 0666 & ~umask(0666);
opt_complementary = "-1:?2"; /* must have 1 or 2 args */
if (getopt32(argc, argv, "m")) { if (getopt32(argc, argv, "m")) {
tbl = bb_uuenc_tbl_base64; tbl = bb_uuenc_tbl_base64;
} }
argv += optind;
switch (argc - optind) { if (argc == optind + 2) {
case 2: src_fd = xopen(*argv, O_RDONLY);
src_stream = xfopen(argv[optind], "r"); fstat(src_fd, &stat_buf);
xstat(argv[optind], &stat_buf); mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO); argv++;
break;
case 1:
mode = 0666 & ~umask(0666);
break;
default:
bb_show_usage();
} }
printf("begin%s %o %s", tbl == bb_uuenc_tbl_std ? "" : "-base64", mode, argv[argc - 1]); printf("begin%s %o %s", tbl == bb_uuenc_tbl_std ? "" : "-base64", mode, *argv);
while (1) {
while ((size = fread(src_buf, 1, src_buf_size, src_stream)) > 0) { size_t size = full_read(src_fd, src_buf, SRC_BUF_SIZE);
if (size != src_buf_size) { if (!size)
/* write_size is always 60 until the last line */ break;
write_size = (4 * ((size + 2) / 3)); if ((ssize_t)size < 0)
/* pad with 0s so we can just encode extra bits */ bb_perror_msg_and_die(bb_msg_read_error);
memset(&src_buf[size], 0, src_buf_size - size);
}
/* Encode the buffer we just read in */ /* Encode the buffer we just read in */
bb_uuencode((unsigned char*)src_buf, dst_buf, size, tbl); bb_uuencode(dst_buf, src_buf, size, tbl);
putchar('\n'); putchar('\n');
if (tbl == bb_uuenc_tbl_std) { if (tbl == bb_uuenc_tbl_std) {
putchar(tbl[size]); putchar(tbl[size]);
} }
if (fwrite(dst_buf, 1, write_size, stdout) != write_size) { fflush(stdout);
bb_perror_msg_and_die(bb_msg_write_error); xwrite(STDOUT_FILENO, dst_buf, 4 * ((size + 2) / 3));
}
} }
printf(tbl == bb_uuenc_tbl_std ? "\n`\nend\n" : "\n====\n"); printf(tbl == bb_uuenc_tbl_std ? "\n`\nend\n" : "\n====\n");
die_if_ferror(src_stream, "source"); /* TODO - Fix this! */
fflush_stdout_and_exit(EXIT_SUCCESS); fflush_stdout_and_exit(EXIT_SUCCESS);
} }

2
include/libbb.h
View File

@ -884,7 +884,7 @@ pid_t *pidlist_reverse(pid_t *pidList);
extern const char bb_uuenc_tbl_base64[]; extern const char bb_uuenc_tbl_base64[];
extern const char bb_uuenc_tbl_std[]; extern const char bb_uuenc_tbl_std[];
void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl); void bb_uuencode(char *store, const void *s, int length, const char *tbl);
typedef struct sha1_ctx_t { typedef struct sha1_ctx_t {
uint32_t count[2]; uint32_t count[2];

5
libbb/uuencode.c
View File

@ -34,14 +34,15 @@ const char bb_uuenc_tbl_std[65] = {
}; };
/* /*
* Encode the string S of length LENGTH to base64 format and place it * Encode bytes at S of length LENGTH to uuencode or base64 format and place it
* to STORE. STORE will be 0-terminated, and must point to a writable * to STORE. STORE will be 0-terminated, and must point to a writable
* buffer of at least 1+BASE64_LENGTH(length) bytes. * buffer of at least 1+BASE64_LENGTH(length) bytes.
* where BASE64_LENGTH(len) = (4 * ((LENGTH + 2) / 3)) * where BASE64_LENGTH(len) = (4 * ((LENGTH + 2) / 3))
*/ */
void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl) void bb_uuencode(char *store, const void *src, int length, const char *tbl)
{ {
int i; int i;
const unsigned char *s = src;
char *p = store; char *p = store;
/* Transform the 3x8 bits to 4x6 bits, as required by base64. */ /* Transform the 3x8 bits to 4x6 bits, as required by base64. */

4
networking/wget.c
View File

@ -76,9 +76,9 @@ static char *safe_fgets(char *s, int size, FILE *stream)
#if ENABLE_FEATURE_WGET_AUTHENTICATION #if ENABLE_FEATURE_WGET_AUTHENTICATION
/* Base64-encode character string and return the string. */ /* Base64-encode character string and return the string. */
static char *base64enc(unsigned char *p, char *buf, int len) static char *base64enc(const unsigned char *p, char *buf, int len)
{ {
bb_uuencode(p, buf, len, bb_uuenc_tbl_base64); bb_uuencode(buf, p, len, bb_uuenc_tbl_base64);
return buf; return buf;
} }
#endif #endif