warning fixes and cleanups for 64-bit machines

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 4e9bc434cdde503a458df7bea7a9e37bf273d51b..678189bb1b4b1ad7e947ea6d3100de21bcdbfbbb 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -5,6 +5,10 @@
  * to users on the Citadel system.
  */
 
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -32,6 +36,7 @@
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
+#include "dynloader.h"
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
@@ -44,6 +49,11 @@
 #include "parsedate.h"
 
 
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
+
 struct trynamebuf {
        char buffer1[SIZ];
        char buffer2[SIZ];
@@ -152,14 +162,8 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
 
        /* extract full name - first, it's From minus <userid> */
        strcpy(name, rfc822);
-       for (a = 0; a < strlen(name); ++a) {
-               if (name[a] == '<') {
-                       do {
-                               strcpy(&name[a], &name[a + 1]);
-                       } while ((strlen(name) > 0) && (name[a] != '>'));
-                       strcpy(&name[a], &name[a + 1]);
-               }
-       }
+       stripout(name, '<', '>');
+
        /* strip anything to the left of a bang */
        while ((strlen(name) > 0) && (haschar(name, '!') > 0))
                strcpy(name, &name[1]);
@@ -175,16 +179,9 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
        /* but if there are parentheses, that changes the rules... */
        if ((haschar(rfc822, '(') == 1) && (haschar(rfc822, ')') == 1)) {
                strcpy(name, rfc822);
-               while ((strlen(name) > 0) && (name[0] != '(')) {
-                       strcpy(&name[0], &name[1]);
-               }
-               strcpy(&name[0], &name[1]);
-               for (a = 0; a < strlen(name); ++a) {
-                       if (name[a] == ')') {
-                               name[a] = 0;
-                       }
-               }
+               stripallbut(name, '(', ')');
        }
+
        /* but if there are a set of quotes, that supersedes everything */
        if (haschar(rfc822, 34) == 2) {
                strcpy(name, rfc822);
@@ -200,23 +197,13 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
        strcpy(user, rfc822);
 
        /* first get rid of anything in parens */
-       for (a = 0; a < strlen(user); ++a)
-               if (user[a] == '(') {
-                       do {
-                               strcpy(&user[a], &user[a + 1]);
-                       } while ((strlen(user) > 0) && (user[a] != ')'));
-                       strcpy(&user[a], &user[a + 1]);
-               }
+       stripout(user, '(', ')');
+
        /* if there's a set of angle brackets, strip it down to that */
        if ((haschar(user, '<') == 1) && (haschar(user, '>') == 1)) {
-               while ((strlen(user) > 0) && (user[0] != '<')) {
-                       strcpy(&user[0], &user[1]);
-               }
-               strcpy(&user[0], &user[1]);
-               for (a = 0; a < strlen(user); ++a)
-                       if (user[a] == '>')
-                               user[a] = 0;
+               stripallbut(user, '<', '>');
        }
+
        /* strip anything to the left of a bang */
        while ((strlen(user) > 0) && (haschar(user, '!') > 0))
                strcpy(user, &user[1]);
@@ -234,22 +221,11 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
        strcpy(node, rfc822);
 
        /* first get rid of anything in parens */
-       for (a = 0; a < strlen(node); ++a)
-               if (node[a] == '(') {
-                       do {
-                               strcpy(&node[a], &node[a + 1]);
-                       } while ((strlen(node) > 0) && (node[a] != ')'));
-                       strcpy(&node[a], &node[a + 1]);
-               }
+       stripout(node, '(', ')');
+
        /* if there's a set of angle brackets, strip it down to that */
        if ((haschar(node, '<') == 1) && (haschar(node, '>') == 1)) {
-               while ((strlen(node) > 0) && (node[0] != '<')) {
-                       strcpy(&node[0], &node[1]);
-               }
-               strcpy(&node[0], &node[1]);
-               for (a = 0; a < strlen(node); ++a)
-                       if (node[a] == '>')
-                               node[a] = 0;
+               stripallbut(node, '<', '>');
        }
 
        /* If no node specified, tack ours on instead */