summaryrefslogtreecommitdiff
path: root/mailutils
diff options
context:
space:
mode:
authorDenys Vlasenko2010-09-16 17:51:13 +0200
committerDenys Vlasenko2010-09-16 17:51:13 +0200
commit9fe98f701d40835db32baa12c94b661d40231ea4 (patch)
tree781c9c71519f3eb79082eac54e0cc545e16b2fd1 /mailutils
parent52e460b7440ed5b85e4125a4eccf1e665d92c0ff (diff)
downloadbusybox-9fe98f701d40835db32baa12c94b661d40231ea4.zip
busybox-9fe98f701d40835db32baa12c94b661d40231ea4.tar.gz
libbb: merge mail and uudecode's base64 decoders
function old new delta read_base64 - 378 +378 uudecode_main 306 315 +9 parse 953 958 +5 read_stduu 250 254 +4 base64_main 217 219 +2 read_base64 358 - -358 decode_base64 371 - -371 ------------------------------------------------------------------------------ (add/remove: 2/2 grow/shrink: 4/0 up/down: 398/-729) Total: -331 bytes Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'mailutils')
-rw-r--r--mailutils/mail.c67
-rw-r--r--mailutils/mail.h1
-rw-r--r--mailutils/mime.c4
3 files changed, 2 insertions, 70 deletions
diff --git a/mailutils/mail.c b/mailutils/mail.c
index 8e52a3e..89db661 100644
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -161,73 +161,6 @@ void FAST_FUNC encode_base64(char *fname, const char *text, const char *eol)
#undef src_buf
}
-void FAST_FUNC decode_base64(FILE *src_stream, FILE *dst_stream)
-{
- int term_count = 1;
-
- while (1) {
- char translated[4];
- int count = 0;
-
- while (count < 4) {
- char *table_ptr;
- int ch;
-
- /* Get next _valid_ character.
- * global vector bb_uuenc_tbl_base64[] contains this string:
- * "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n"
- */
- do {
- ch = fgetc(src_stream);
- if (ch == EOF) {
- bb_error_msg_and_die(bb_msg_read_error);
- }
- // - means end of MIME section
- if ('-' == ch) {
- // push it back
- ungetc(ch, src_stream);
- return;
- }
- table_ptr = strchr(bb_uuenc_tbl_base64, ch);
- } while (table_ptr == NULL);
-
- /* Convert encoded character to decimal */
- ch = table_ptr - bb_uuenc_tbl_base64;
-
- 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;
- }
- term_count = 1;
- continue;
- } else {
- translated[count] = ch;
- count++;
- term_count = 0;
- }
- }
-
- /* Merge 6 bit chars to 8 bit */
- if (count > 1) {
- 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);
- }
- }
-}
-
-
/*
* get username and password from a file descriptor
*/
diff --git a/mailutils/mail.h b/mailutils/mail.h
index bb747c4..e0048fb 100644
--- a/mailutils/mail.h
+++ b/mailutils/mail.h
@@ -32,4 +32,3 @@ void FAST_FUNC get_cred_or_die(int fd);
const FAST_FUNC char *command(const char *fmt, const char *param);
void FAST_FUNC encode_base64(char *fname, const char *text, const char *eol);
-void FAST_FUNC decode_base64(FILE *src_stream, FILE *dst_stream);
diff --git a/mailutils/mime.c b/mailutils/mime.c
index 44c7d02..682cf45 100644
--- a/mailutils/mime.c
+++ b/mailutils/mime.c
@@ -225,7 +225,7 @@ static int parse(const char *boundary, char **argv)
// prepare unique string pattern
uniq = xasprintf("%%llu.%u.%s", (unsigned)getpid(), safe_gethostname());
-//bb_info_msg("PARSE[%s]", terminator);
+//bb_info_msg("PARSE[%s]", uniq);
while ((line = xmalloc_fgets_str(stdin, "\r\n\r\n")) != NULL) {
@@ -306,7 +306,7 @@ static int parse(const char *boundary, char **argv)
// dump to fp
if (0 == strcasecmp(encoding, "base64")) {
- decode_base64(stdin, fp);
+ read_base64(stdin, fp, '-');
} else if (0 != strcasecmp(encoding, "7bit")
&& 0 != strcasecmp(encoding, "8bit")
) {