From: Art Cancro <ajc@citadel.org>
Date: Sat, 18 Mar 2000 03:38:25 +0000 (+0000)
Subject: * 5.70b1
X-Git-Tag: v7.86~7253
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=4ea0763a248da5ef478d86c784969ef2dfe545d7;p=citadel.git

* 5.70b1
---

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 575a5ebcd..c5a244609 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -8,8 +8,8 @@
 #include "sysdep.h"
 #include "sysconfig.h"
 #include "ipcdef.h"
-#define CITADEL	"Citadel/UX 5.70"
-#define REV_LEVEL 560
+#define CITADEL	"Citadel/UX 5.70b1"
+#define REV_LEVEL 570
 #define SERVER_TYPE 0	/* zero for stock Citadel/UX; other developers please
 			   obtain SERVER_TYPE codes for your implementations */
 
diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 32114261d..a6c7eabe9 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -286,6 +286,8 @@ void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
 void try_name(struct usersupp *us, void *data) {
 	struct trynamebuf *tnb;
 	tnb = (struct trynamebuf *)data;
+
+	lprintf(9, "Trying <%s>\n", us->fullname);
 	
 	if (!strncasecmp(tnb->buffer1, "cit", 3))
 		if (atol(&tnb->buffer1[3]) == us->usernum)
@@ -483,7 +485,6 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
 		}
 
 		if (msg->cm_fields['I'] != NULL) {
-			TRACE;
 			lprintf(9, "Converted message id <%s>\n",
 				msg->cm_fields['I'] );
 		}
diff --git a/citadel/tools.c b/citadel/tools.c
index d8652c3b6..9026d68bc 100644
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -299,19 +299,27 @@ int haschar(char *st, int ch)
  */
 int collapsed_strcmp(char *s1, char *s2) {
 	char *c1, *c2;
-	int i, ret;
-
-	c1 = strdup(s1);
-	c2 = strdup(s2);
-
-	for (i=0; i<strlen(c1); ++i) {
-		while (!isalnum(c1[i])) strcpy(&c1[i], &c1[i+1]);
-		if (isupper(c1[i])) c1[i]=tolower(c1[i]);
+	int i, ret, pos;
+
+	c1 = malloc(strlen(s1)+1);
+	c2 = malloc(strlen(s2)+1);
+	c1[0] = 0;
+	c2[0] = 0;
+
+	pos = 0;
+	for (i=0; i<strlen(s1); ++i) {
+		if (isalnum(s1[i])) {
+			c1[pos] = tolower(s1[i]);
+			c1[++pos] = 0;
+		}
 	}
 
-	for (i=0; i<strlen(c2); ++i) {
-		while (!isalnum(c2[i])) strcpy(&c2[i], &c2[i+1]);
-		if (isupper(c2[i])) c2[i]=tolower(c2[i]);
+	pos = 0;
+	for (i=0; i<strlen(s2); ++i) {
+		if (isalnum(s2[i])) {
+			c2[pos] = tolower(s2[i]);
+			c2[++pos] = 0;
+		}
 	}
 
 	ret = strcmp(c1, c2);