From 7352689ab7e6cfa835d52035f76756879306cfa9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 27 Sep 2007 20:20:56 +0000 Subject: ** Fixes part of bug #474000 2007-09-27 Matthew Barnes ** Fixes part of bug #474000 * addressbook/importers/evolution-ldif-importer.c: Remove redundant Base64 codec implementation. Use GLib's. * mail/em-format-html.c (efh_format_headers): * mail/em-migrate.c (upgrade_passwords_1_2): * plugins/face/face.c: Use GLib's Base64 API instead of Camel's. svn path=/trunk/; revision=34325 --- addressbook/ChangeLog | 7 ++ addressbook/importers/evolution-ldif-importer.c | 100 ++---------------------- 2 files changed, 15 insertions(+), 92 deletions(-) (limited to 'addressbook') diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index eab43048ab..e1bc214532 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2007-09-27 Matthew Barnes + + ** Fixes part of bug #474000 + + * importers/evolution-ldif-importer.c: + Remove redundant Base64 codec implementation. Use GLib's. + 2007-09-27 Hiroyuki Ikezoe ** Fix for bug #461195 diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 63c8f3a049..5080557c17 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -116,93 +116,6 @@ ldif_fields[] = { }; static int num_ldif_fields = sizeof(ldif_fields) / sizeof (ldif_fields[0]); -static unsigned char base64_rank[256] = { - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255, 0,255,255, - 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255, - 255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, - 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, -}; - -/** - * base64_decode_step: decode a chunk of base64 encoded data - * @in: input stream - * @len: max length of data to decode - * @out: output stream - * @state: holds the number of bits that are stored in @save - * @save: leftover bits that have not yet been decoded - * - * Decodes a chunk of base64 encoded data - **/ -static int -base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save) -{ - register unsigned char *inptr, *outptr; - unsigned char *inend, c; - register unsigned int v; - int i; - - inend = in+len; - outptr = out; - - /* convert 4 base64 bytes to 3 normal bytes */ - v=*save; - i=*state; - inptr = in; - while (inptr>16; - *outptr++ = v>>8; - *outptr++ = v; - i=0; - } - } - } - - *save = v; - *state = i; - - /* quick scan back for '=' on the end somewhere */ - /* fortunately we can drop 1 output char for each trailing = (upto 2) */ - i=2; - while (inptr>in && i) { - inptr--; - if (base64_rank[*inptr] != 0xff) { - if (*inptr == '=') - outptr--; - i--; - } - } - - /* if i!= 0 then there is a truncation error! */ - return outptr-out; -} - -static int -base64_decode_simple (char *data, int len) -{ - int state = 0; - unsigned int save = 0; - - return base64_decode_step ((unsigned char *)data, len, - (unsigned char *)data, &state, &save); -} - static GString * getValue( char **src ) { @@ -224,11 +137,14 @@ getValue( char **src ) } if (need_base64) { - int new_len; - /* it's base64 encoded */ - dest = g_string_erase (dest, 0, 2); - new_len = base64_decode_simple (dest->str, strlen (dest->str)); - dest = g_string_truncate (dest, new_len); + guchar *data; + gsize length; + + /* XXX g_string_assign_len() would be nice here */ + data = g_base64_decode (dest->str + 2, &length); + g_string_truncate (dest, 0); + g_string_append_len (dest, (gchar *) data, length); + g_free (data); } *src = s; -- cgit v1.2.3