* Renamed decode_base64() to CtdlDecodeBase64()

* Renamed decode_quoted_printable() to CtdlDecodeQuotedPrintable()
* These changes are to avoid namespace conflict with libical

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index ac1cc071076c1bd4fe5cb9dc34514ac77b7c7aea..cb1403a02df0c3d2e93a251cd1da765c53bf19cc 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
  $Log$
+ Revision 601.6  2002/09/15 03:24:28  ajc
+ * Renamed decode_base64() to CtdlDecodeBase64()
+ * Renamed decode_quoted_printable() to CtdlDecodeQuotedPrintable()
+ * These changes are to avoid namespace conflict with libical
+
  Revision 601.5  2002/09/13 15:41:39  ajc
  * serv_calendar.c: #include "serv_calendar.h", not "serv_ical.h"
 
@@ -3999,4 +4004,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/client_passwords.c b/citadel/client_passwords.c
index 3552c42ec897a4e0b68c48c00d1cd9e938398c1f..ebc8a6644635ca6a8c9e6fff7d9d3d8f9f97f71d 100644 (file)
--- a/citadel/client_passwords.c
+++ b/citadel/client_passwords.c
@@ -56,7 +56,7 @@ void get_stored_password(
        fp = fopen(pwfile, "r");
        if (fp == NULL) return;
        while (fgets(buf64, sizeof buf64, fp) != NULL) {
-               decode_base64(buf, buf64, sizeof(buf64));
+               CtdlDecodeBase64(buf, buf64, sizeof(buf64));
                extract(hostbuf, buf, 0);
                extract(portbuf, buf, 1);
                extract(ubuf, buf, 2);
@@ -97,7 +97,7 @@ void set_stored_password(
        fp = fopen(pwfile, "w");
        if (fp == NULL) fp = fopen("/dev/null", "w");
        while (fgets(buf64, sizeof buf64, oldfp) != NULL) {
-               decode_base64(buf, buf64, sizeof(buf64));
+               CtdlDecodeBase64(buf, buf64, sizeof(buf64));
                extract(hostbuf, buf, 0);
                extract(portbuf, buf, 1);
                extract(ubuf, buf, 2);

diff --git a/citadel/mime_parser.c b/citadel/mime_parser.c
index 00bcc67a1d666ec20c3e5342edb518c21ffd935c..afc719803afafef48a29b19e66d83e91a275ef46 100644 (file)
--- a/citadel/mime_parser.c
+++ b/citadel/mime_parser.c
@@ -67,7 +67,7 @@ char *fixed_partnum(char *supplied_partnum) {
 /*
  * Convert "quoted-printable" to binary.  Returns number of bytes decoded.
  */
-int decode_quoted_printable(char *decoded, char *encoded, int sourcelen) {
+int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen) {
        char buf[SIZ];
        int buf_length = 0;
        int soft_line_break = 0;
@@ -209,10 +209,10 @@ void mime_decode(char *partnum,
        }
 
        if (!strcasecmp(encoding, "base64")) {
-               bytes_decoded = decode_base64(decoded, part_start, length);
+               bytes_decoded = CtdlDecodeBase64(decoded, part_start, length);
        }
        else if (!strcasecmp(encoding, "quoted-printable")) {
-               bytes_decoded = decode_quoted_printable(decoded,
+               bytes_decoded = CtdlDecodeQuotedPrintable(decoded,
                                                        part_start, length);
        }
 

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index e0ac5c03e555bdb91b3865c53dc3ddf34512f0ca..5d9e119ef34228e3193696590fbc2242727dc41a 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -315,7 +315,7 @@ void imap_authenticate(int num_parms, char *parms[]) {
 void imap_auth_login_user(char *cmd) {
        char buf[SIZ];
 
-       decode_base64(buf, cmd, SIZ);
+       CtdlDecodeBase64(buf, cmd, SIZ);
        CtdlLoginExistingUser(buf);
        encode_base64(buf, "Password:");
        cprintf("+ %s\r\n", buf);
@@ -326,7 +326,7 @@ void imap_auth_login_user(char *cmd) {
 void imap_auth_login_pass(char *cmd) {
        char buf[SIZ];
 
-       decode_base64(buf, cmd, SIZ);
+       CtdlDecodeBase64(buf, cmd, SIZ);
        if (CtdlTryPassword(buf) == pass_ok) {
                cprintf("%s OK authentication succeeded\r\n", IMAP->authseq);
        }

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 8588d59ce256da363edeafa60ad4265113fa8cbe..383e05194dde4f4504989bf9d7988224ab4dc938 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -164,7 +164,7 @@ void smtp_get_user(char *argbuf) {
        char buf[SIZ];
        char username[SIZ];
 
-       decode_base64(username, argbuf, SIZ);
+       CtdlDecodeBase64(username, argbuf, SIZ);
        lprintf(9, "Trying <%s>\n", username);
        if (CtdlLoginExistingUser(username) == login_ok) {
                encode_base64(buf, "Password:");
@@ -184,7 +184,7 @@ void smtp_get_user(char *argbuf) {
 void smtp_get_pass(char *argbuf) {
        char password[SIZ];
 
-       decode_base64(password, argbuf, SIZ);
+       CtdlDecodeBase64(password, argbuf, SIZ);
        lprintf(9, "Trying <%s>\n", password);
        if (CtdlTryPassword(password) == pass_ok) {
                cprintf("235 Hello, %s\r\n", CC->usersupp.fullname);

diff --git a/citadel/tools.c b/citadel/tools.c
index 21c1ce91eaef46358cad439e41c3d2bfb92d872f..d9bdb8991dbd922bac0b7408c2d0cd0797d5c8f8 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -252,7 +252,7 @@ long extract_long(char *source, long int parmnum)
 
 
 /*
- * decode_base64() and encode_base64() are adaptations of code by
+ * CtdlDecodeBase64() and encode_base64() are adaptations of code by
  * John Walker, found in full in the file "base64.c" included with this
  * distribution.  The difference between those functions and these is that
  * these are intended to encode/decode small string buffers, and those are
@@ -319,7 +319,7 @@ void encode_base64(char *dest, char *source)
  * Convert base64-encoded to binary.  Returns the length of the decoded data.
  * It will stop after reading 'length' bytes.
  */
-int decode_base64(char *dest, char *source, size_t length)
+int CtdlDecodeBase64(char *dest, char *source, size_t length)
 {
     int i, c;
     int dpos = 0;

diff --git a/citadel/tools.h b/citadel/tools.h
index cbc4f81f793ffa8841fe929d4265deedc29a9dc6..0407ba9b9e033cc9c2defeb87d52e2f14bc71413 100644 (file)
--- a/citadel/tools.h
+++ b/citadel/tools.h
@@ -5,7 +5,7 @@ void extract_token(char *dest, char *source, int parmnum, char separator);
 int extract_int (char *source, int parmnum);
 long int extract_long (char *source, long int parmnum);
 void encode_base64(char *dest, char *source);
-int decode_base64(char *dest, char *source, size_t length);
+int CtdlDecodeBase64(char *dest, char *source, size_t length);
 void striplt(char *);
 int haschar(const char *st, int ch);
 int collapsed_strcmp(char *s1, char *s2);