From: Art Cancro <ajc@citadel.org>
Date: Thu, 17 Jan 2008 20:29:27 +0000 (+0000)
Subject: The encoding and decoding tables for Base64 are
X-Git-Tag: v7.86~2584
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=57ab2a1c1faa50d2edaa7895567dc1f350c053f1

The encoding and decoding tables for Base64 are
no longer calculated at startup.  CtdlInitBase64Table() is removed.  The tables
are now hardcoded as 'const' arrays.  Not only will this eliminate the need to do
a startup calculation, but since it is now const we will get a nice clean segv if
some other code attempts to clobber them.
---

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 700c732f2..4b1258368 100644
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -1417,7 +1417,6 @@ int main(int argc, char **argv)
 	eCrashParameters params;
 //	eCrashSymbolTable symbol_table;
 #endif
-	CtdlInitBase64Table();
 	calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
 #ifdef HAVE_BACKTRACE
diff --git a/citadel/citmail.c b/citadel/citmail.c
index f47d8f2ab..fea00e064 100644
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -184,8 +184,6 @@ int main(int argc, char **argv) {
 	int read_recipients_from_headers = 0;
 	char *add_these_recipients = NULL;
 
-	CtdlInitBase64Table();
-
 	for (i=1; i<argc; ++i) {
 		if (!strcmp(argv[i], "-d")) {
 			debug = 1;
diff --git a/citadel/getmail.c b/citadel/getmail.c
index 664c81e08..963a4f915 100644
--- a/citadel/getmail.c
+++ b/citadel/getmail.c
@@ -183,8 +183,6 @@ int main(int argc, char **argv)
 	struct ctdlipcmessage *mret;
 	char cret[SIZ];
 
-	CtdlInitBase64Table();
-
 	strcpy(ctdl_home_directory, DEFAULT_PORT);
 
 	/*
diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index 225b23a4c..3256a77be 100644
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -179,8 +179,6 @@ int main(int argc, char **argv)
 	int ret, err;
 	int server_shutting_down = 0;
 
-	CtdlInitBase64Table();
-
 	strcpy(ctdl_home_directory, DEFAULT_PORT);
 
 	strcpy(cmd, "");
diff --git a/citadel/server_main.c b/citadel/server_main.c
index a63564d17..2be4109c5 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -99,7 +99,6 @@ int main(int argc, char **argv)
 	/* initialise semaphores here. Patch by Matt and davew
 	 * its called here as they are needed by CtdlLogPrintf for thread safety
 	 */
-	CtdlInitBase64Table();
 	InitialiseSemaphores();
 	
 	/* initialize the master context */
diff --git a/citadel/setup.c b/citadel/setup.c
index fc64eb78e..48df42496 100644
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -949,8 +949,6 @@ int main(int argc, char *argv[])
 	char relhome[PATH_MAX]="";
 	char ctdldir[PATH_MAX]=CTDLDIR;
 	
-	CtdlInitBase64Table();
-
 	/* set an invalid setup type */
 	setup_type = (-1);
 
diff --git a/citadel/stress.c b/citadel/stress.c
index dfb98052c..d62ea3cb8 100644
--- a/citadel/stress.c
+++ b/citadel/stress.c
@@ -299,8 +299,6 @@ int main(int argc, char** argv)
 	int i;			/* Counters */
 	long runtime;		/* Run time for each thread */
 
-	CtdlInitBase64Table();
-
 	/* Read argument list */
 	for (i = 0; i < argc; i++) {
 		if (!strcmp(argv[i], "-n")) {
diff --git a/citadel/userlist.c b/citadel/userlist.c
index 388761b45..33a0bc85f 100644
--- a/citadel/userlist.c
+++ b/citadel/userlist.c
@@ -77,7 +77,6 @@ int main(int argc, char **argv)
 	char relhome[PATH_MAX]="";
 	char ctdldir[PATH_MAX]=CTDLDIR;
 
-	CtdlInitBase64Table();
 	calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
 	ipc = CtdlIPC_new(argc, argv, hostbuf, portbuf);
diff --git a/citadel/whobbs.c b/citadel/whobbs.c
index 9c0db8216..f4114bb55 100644
--- a/citadel/whobbs.c
+++ b/citadel/whobbs.c
@@ -75,8 +75,6 @@ int main(int argc, char **argv)
 	char relhome[PATH_MAX]="";
 	char ctdldir[PATH_MAX]=CTDLDIR;
 
-	CtdlInitBase64Table();
-
 	calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
 	/* If this environment variable is set, we assume that the program
diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index d74e80afb..2e3fa4606 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -4,7 +4,7 @@
  */
 
 
-#define LIBCITADEL_VERSION_NUMBER	101
+#define LIBCITADEL_VERSION_NUMBER	102
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.
diff --git a/libcitadel/lib/tools.c b/libcitadel/lib/tools.c
index 61e49f0d0..606449da1 100644
--- a/libcitadel/lib/tools.c
+++ b/libcitadel/lib/tools.c
@@ -33,8 +33,46 @@
 #define FALSE 0
 
 typedef unsigned char byte;	      /* Byte type */
-static byte dtable[256] = "\0";	      /* base64 decode table */
-static byte etable[256] = "\0";	      /* base64 encode table */
+
+/* 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
+};
+
 
 char *safestrncpy(char *dest, const char *src, size_t n)
 {
@@ -262,42 +300,6 @@ unsigned long extract_unsigned_long(const char *source, int parmnum)
 }
 
 
-
-void CtdlInitBase64Table(void)
-{
-	int i;
-	/*	Fill dtable with character encodings.  */
-	
-	/* Encoder Table */
-	for (i = 0; i < 26; i++) {
-		etable[i] = 'A' + i;
-		etable[26 + i] = 'a' + i;
-	}
-	for (i = 0; i < 10; i++) {
-		etable[52 + i] = '0' + i;
-	}
-	etable[62] = '+';
-	etable[63] = '/';
-	
-	/* Decoder Table */
-	for (i = 0; i < 255; i++) {
-		dtable[i] = 0x80;
-	}
-	for (i = 'A'; i <= 'Z'; i++) {
-		dtable[i] = 0 + (i - 'A');
-	}
-	for (i = 'a'; i <= 'z'; i++) {
-		dtable[i] = 26 + (i - 'a');
-	}
-	for (i = '0'; i <= '9'; i++) {
-		dtable[i] = 52 + (i - '0');
-	}
-	dtable['+'] = 62;
-	dtable['/'] = 63;
-	dtable['='] = 0;
-}
-
-
 /*
  * CtdlDecodeBase64() and CtdlEncodeBase64() are adaptations of code by John Walker.
  */
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 0b47ce872..91dc4d12e 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -822,7 +822,6 @@ int main(int argc, char **argv)
 	if (chdir(webcitdir) != 0) {
 		perror("chdir");
 	}	
-	CtdlInitBase64Table();
 	initialize_viewdefs();
 	initialize_axdefs();