X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Ftools.c;h=b50cd66b5842f1fbad54db57f424dfa1e70b13dd;hb=61ee61844618c781da76b236c6a119528c23e867;hp=df2f1b42d1086e434a3c254ebca21fe217a3047a;hpb=b68b9e9de02918b32e95043cb7d18588cea4af0f;p=citadel.git

diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index df2f1b42d..b50cd66b5 100644
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -2,7 +2,7 @@
  * A basic toolset containing miscellaneous functions for string manipluation,
  * encoding/decoding, and a bunch of other stuff.
  *
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <limits.h>
+#include "b64/cencode.h"
+#include "b64/cdecode.h"
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -50,45 +52,6 @@
 
 typedef unsigned char byte;	      /* Byte type */
 
-/* Base64 encoding table */
-const byte etable[256] = {
-	65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
-	82, 83, 84, 85, 86, 87, 88, 89, 90, 97, 98, 99, 100, 101, 102, 103,
-	104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
-	118, 119, 120, 121, 122, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 43,
-	47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-/* Base64 decoding table */
-const byte dtable[256] = {
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 62, 128, 128, 128, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
-	128, 128, 128, 0, 128, 128, 128, 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, 128, 128, 128,
-	128, 128, 128, 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, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
-	128, 128, 0
-};
-
 /*
  * copy a string into a buffer of a known size. abort if we exceed the limits
  *
@@ -102,7 +65,8 @@ int safestrncpy(char *dest, const char *src, size_t n)
 {
 	int i = 0;
 
-	if (dest == NULL || src == NULL) {
+	if (dest == NULL || src == NULL)
+	{
 		fprintf(stderr, "safestrncpy: NULL argument\n");
 		abort();
 	}
@@ -117,7 +81,6 @@ int safestrncpy(char *dest, const char *src, size_t n)
 }
 
 
-
 /*
  * num_tokens()  -  discover number of parameters/tokens in a string
  */
@@ -126,12 +89,15 @@ int num_tokens(const char *source, char tok)
 	int count = 1;
 	const char *ptr = source;
 
-	if (source == NULL) {
+	if (source == NULL)
+	{
 		return (0);
 	}
 
-	while (*ptr != '\0') {
-		if (*ptr++ == tok) {
+	while (*ptr != '\0')
+	{
+		if (*ptr++ == tok)
+		{
 			++count;
 		}
 	}
@@ -139,8 +105,6 @@ int num_tokens(const char *source, char tok)
 	return (count);
 }
 
-//extern void cit_backtrace(void);
-
 
 /*
  * extract_token() - a string tokenizer
@@ -154,88 +118,45 @@ long extract_token(char *dest, const char *source, int parmnum, char separator,
 
 	s = source;
 
-	if (dest == NULL) {
+	if (dest == NULL)
+	{
 		return(-1);
 	}
 
-	//cit_backtrace();
-	//lprintf (CTDL_DEBUG, "test >: n: %d sep: %c source: %s \n willi \n", parmnum, separator, source);
 	dest[0] = 0;
 
-	if (s == NULL) {
+	if (s == NULL)
+	{
 		return(-1);
 	}
 	
 	maxlen--;
 
-	while (*s) {
-		if (*s == separator) {
+	while (*s)
+	{
+		if (*s == separator)
+		{
 			++current_token;
 		}
-		if ( (current_token == parmnum) && 
-		     (*s != separator) && 
-		     (len < maxlen) ) {
+		if ( (current_token == parmnum) && (*s != separator) && (len < maxlen) )
+		{
 			dest[len] = *s;
 			++len;
 		}
-		else if ((current_token > parmnum) || (len >= maxlen)) {
+		else if ((current_token > parmnum) || (len >= maxlen))
+		{
 			break;
 		}
 		++s;
 	}
 
 	dest[len] = '\0';
-	if (current_token < parmnum) {
-		//lprintf (CTDL_DEBUG,"test <!: %s\n", dest);
+	if (current_token < parmnum)
+	{
 		return(-1);
 	}
-	//lprintf (CTDL_DEBUG,"test <: %d; %s\n", len, dest);
 	return(len);
 }
-//*/
-
-
-/*
- * extract_token() - a string tokenizer
- * /
-long extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen)
-{
-	char *d;		// dest
-	const char *s;		// source
-	int count = 0;
-	int len = 0;
-
-	
-	//cit_backtrace();
-	//lprintf (CTDL_DEBUG, "test >: n: %d sep: %c source: %s \n willi \n", parmnum, separator, source);
-	strcpy(dest, "");
-
-	//  Locate desired parameter 
-	s = source;
-	while (count < parmnum) {
-		//  End of string, bail!
-		if (!*s) {
-			s = NULL;
-			break;
-		}
-		if (*s == separator) {
-			count++;
-		}
-		s++;
-	}
-	if (!s) {
-		//lprintf (CTDL_DEBUG,"test <!: %s\n", dest);
-		return -1;		// Parameter not found
-	}
-	
-	for (d = dest; *s && *s != separator && ++len<maxlen; s++, d++) {
-		*d = *s;
-	}
-	*d = 0;
-	//lprintf (CTDL_DEBUG,"test <: %d; %s\n", len, dest);
-	return 0;
-}
-*/
 
 
 /*
@@ -248,13 +169,15 @@ void remove_token(char *source, int parmnum, char separator)
 
 	/* Find desired parameter */
 	d = source;
-	while (count < parmnum) {
+	while (count < parmnum)
+	{
 		/* End of string, bail! */
 		if (!*d) {
 			d = NULL;
 			break;
 		}
-		if (*d == separator) {
+		if (*d == separator)
+		{
 			count++;
 		}
 		d++;
@@ -263,7 +186,8 @@ void remove_token(char *source, int parmnum, char separator)
 
 	/* Find next parameter */
 	s = d;
-	while (*s && *s != separator) {
+	while (*s && *s != separator)
+	{
 		s++;
 	}
 
@@ -274,12 +198,6 @@ void remove_token(char *source, int parmnum, char separator)
 		*d = 0;
 	else
 		*--d = 0;
-	/*
-	while (*s) {
-		*d++ = *s++;
-	}
-	*d = 0;
-	*/
 }
 
 
@@ -296,6 +214,7 @@ int extract_int(const char *source, int parmnum)
 		return 0;
 }
 
+
 /*
  * extract_long()  -  extract an long parm w/o supplying a buffer
  */
@@ -324,121 +243,62 @@ unsigned long extract_unsigned_long(const char *source, int parmnum)
 }
 
 
-/*
- * CtdlDecodeBase64() and CtdlEncodeBase64() are adaptations of code by John Walker.
- */
-
 size_t CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen, int linebreaks)
 {
-	int i, hiteof = FALSE;
-	int spos = 0;
-	int dpos = 0;
-	int thisline = 0;
-
-	while (!hiteof) {
-		byte igroup[3], ogroup[4];
-		int c, n;
-
-		igroup[0] = igroup[1] = igroup[2] = 0;
-		for (n = 0; n < 3; n++) {
-			if (spos >= sourcelen) {
-				hiteof = TRUE;
-				break;
-			}
-			c = source[spos++];
-			igroup[n] = (byte) c;
-		}
-		if (n > 0) {
-			ogroup[0] = etable[igroup[0] >> 2];
-			ogroup[1] =
-			    etable[((igroup[0] & 3) << 4) |
-				   (igroup[1] >> 4)];
-			ogroup[2] =
-			    etable[((igroup[1] & 0xF) << 2) |
-				   (igroup[2] >> 6)];
-			ogroup[3] = etable[igroup[2] & 0x3F];
-
-			/*
-			 * Replace characters in output stream with "=" pad
-			 * characters if fewer than three characters were
-			 * read from the end of the input stream. 
-			 */
-
-			if (n < 3) {
-				ogroup[3] = '=';
-				if (n < 2) {
-					ogroup[2] = '=';
-				}
-			}
-			for (i = 0; i < 4; i++) {
-				dest[dpos++] = ogroup[i];
-				dest[dpos] = 0;
-			}
-			thisline += 4;
-			if ( (linebreaks) && (thisline > 70) ) {
-				dest[dpos++] = '\r';
-				dest[dpos++] = '\n';
-				dest[dpos] = 0;
-				thisline = 0;
-			}
+	int breaklength = 68;	// must be a multiple of 4
+	int readlength = 3 * breaklength / 4;
+
+	int destoffset;
+	int sourceoffset;
+	int sourceremaining;
+
+	base64_encodestate _state;
+
+	base64_init_encodestate(&_state);
+
+	if (linebreaks) {
+		sourceremaining = sourcelen;
+		destoffset = 0;
+		sourceoffset = 0;
+
+		while (sourceremaining > 0) {
+			destoffset += base64_encode_block(
+				&(source[sourceoffset]),
+				(readlength > sourceremaining ? sourceremaining : readlength),
+				&(dest[destoffset]),
+				&_state);
+			sourceoffset += readlength;
+			sourceremaining -= readlength;
+			dest[destoffset++] = '\r';
+			dest[destoffset++] = '\n';
 		}
+
+		destoffset += base64_encode_blockend(&(dest[destoffset]), &_state, 0);
 	}
-	if ( (linebreaks) && (thisline > 70) ) {
-		dest[dpos++] = '\r';
-		dest[dpos++] = '\n';
-		dest[dpos] = 0;
-	}
+	else {
+		destoffset = base64_encode_block(source, sourcelen, dest, &_state);
 
-	return(dpos);
+		destoffset += base64_encode_blockend(&(dest[destoffset]), &_state, 0);
+	}
+	dest[destoffset] = 0;
+	return destoffset;
 }
 
 
-
 /* 
  * Convert base64-encoded to binary.  Returns the length of the decoded data.
  * It will stop after reading 'length' bytes.
  */
 int CtdlDecodeBase64(char *dest, const char *source, size_t length)
 {
-    int i, c;
-    int dpos = 0;
-    int spos = 0;
-
-    while (TRUE) {
-	byte a[4], b[4], o[3];
-
-	for (i = 0; i < 4; i++) {
-	    if (spos >= length) {
-		return(dpos);
-	    }
-	    c = source[spos++];
-
-	    if (c == 0) {
-		if (i > 0) {
-		    return(dpos);
-		}
-		return(dpos);
-	    }
-	    if (dtable[c] & 0x80) {
-		/* Ignoring errors: discard invalid character. */
-		i--;
-		continue;
-	    }
-	    a[i] = (byte) c;
-	    b[i] = (byte) dtable[c];
-	}
-	o[0] = (b[0] << 2) | (b[1] >> 4);
-	o[1] = (b[1] << 4) | (b[2] >> 2);
-	o[2] = (b[2] << 6) | b[3];
-        i = a[2] == '=' ? 1 : (a[3] == '=' ? 2 : 3);
-	if (i>=1) dest[dpos++] = o[0];
-	if (i>=2) dest[dpos++] = o[1];
-	if (i>=3) dest[dpos++] = o[2];
-	dest[dpos] = 0;
-	if (i < 3) {
-	    return(dpos);
-	}
-    }
+	base64_decodestate _state;
+	int len;
+
+	base64_init_decodestate(&_state);
+
+	len = base64_decode_block(source, length, dest, &_state);
+	dest[len] = '\0';
+	return len;
 }
 
 
@@ -501,6 +361,7 @@ void StripSlashes(char *Dir, int TrailingSlash)
 
 }
 
+
 /*
  * Strip leading and trailing spaces from a string
  */
@@ -535,11 +396,11 @@ size_t striplt(char *buf) {
 }
 
 
-/**
- * \brief check for the presence of a character within a string (returns count)
- * \param st the string to examine
- * \param ch the char to search
- * \return the number of times ch appears in st
+/*
+ * check for the presence of a character within a string (returns count)
+ * st	the string to examine
+ * ch	the char to search
+ * returns the number of times ch appears in st
  */
 int haschar(const char *st, int ch)
 {
@@ -557,37 +418,12 @@ int haschar(const char *st, int ch)
 }
 
 
-
-
-
-/*
- * Format a date/time stamp for output 
- * seconds is whether to print the seconds
- */
-void fmt_date(char *buf, size_t n, time_t thetime, int seconds) {
-	struct tm tm;
-	char *teh_format = NULL;
-
-	*buf = '\0';
-	localtime_r(&thetime, &tm);
-
-	if (seconds) {
-		teh_format = "%F %R:%S";
-	}
-	else {
-		teh_format = "%F %R";
-	}
-
-	strftime(buf, n, teh_format, &tm);
-}
-
-
-
 /*
  * Determine whether the specified message number is contained within the
  * specified sequence set.
  */
-int is_msg_in_sequence_set(const char *mset, long msgnum) {
+int is_msg_in_sequence_set(const char *mset, long msgnum)
+{
 	int num_sets;
 	int s;
 	char setstr[128], lostr[128], histr[128];
@@ -598,13 +434,16 @@ int is_msg_in_sequence_set(const char *mset, long msgnum) {
 		extract_token(setstr, mset, s, ',', sizeof setstr);
 
 		extract_token(lostr, setstr, 0, ':', sizeof lostr);
-		if (num_tokens(setstr, ':') >= 2) {
+		if (num_tokens(setstr, ':') >= 2)
+		{
 			extract_token(histr, setstr, 1, ':', sizeof histr);
-			if (!strcmp(histr, "*")) {
+			if (!strcmp(histr, "*"))
+			{
 				snprintf(histr, sizeof histr, "%ld", LONG_MAX);
 			}
 		} 
-		else {
+		else
+		{
 			strcpy(histr, lostr);
 		}
 		lo = atol(lostr);
@@ -616,18 +455,18 @@ int is_msg_in_sequence_set(const char *mset, long msgnum) {
 	return(0);
 }
 
-/** 
- * \brief Utility function to "readline" from memory
- * \param start Location in memory from which we are reading.
- * \param buf the buffer to place the string in.
- * \param maxlen Size of string buffer
- * \return Pointer to the source memory right after we stopped reading.
+/* 
+ * Utility function to "readline" from memory
+ * start	Location in memory from which we are reading.
+ * buf		the buffer to place the string in.
+ * maxlen	Size of string buffer
+ * returns pointer to the source memory right after we stopped reading.
  */
 char *memreadline(char *start, char *buf, int maxlen)
 {
 	char ch;
 	char *ptr;
-	int len = 0;		/**< tally our own length to avoid strlen() delays */
+	int len = 0;		/* tally our own length to avoid strlen() delays */
 
 	ptr = start;
 
@@ -644,28 +483,31 @@ char *memreadline(char *start, char *buf, int maxlen)
 }
 
 
-/** 
- * \brief Utility function to "readline" from memory
- * \param start Location in memory from which we are reading.
- * \param buf the buffer to place the string in.
- * \param maxlen Size of string buffer
- * \param retlen the length of the returned string
- * \return Pointer to the source memory right after we stopped reading.
+/*
+ * Utility function to "readline" from memory
+ * start	Location in memory from which we are reading.
+ * buf		the buffer to place the string in.
+ * maxlen	Size of string buffer
+ * retlen	the length of the returned string
+ * returns a pointer to the source memory right after we stopped reading.
  */
 char *memreadlinelen(char *start, char *buf, int maxlen, int *retlen)
 {
 	char ch;
 	char *ptr;
-	int len = 0;		/**< tally our own length to avoid strlen() delays */
+	int len = 0;		/* tally our own length to avoid strlen() delays */
 
 	ptr = start;
 
-	while (1) {
+	while (1)
+	{
 		ch = *ptr++;
-		if ((len + 1 < (maxlen)) && (ch != 13) && (ch != 10)) {
+		if ((len + 1 < (maxlen)) && (ch != 13) && (ch != 10))
+		{
 			buf[len++] = ch;
 		}
-		if ((ch == 10) || (ch == 0)) {
+		if ((ch == 10) || (ch == 0))
+		{
 			buf[len] = 0;
 			*retlen = len;
 			return ptr;