From 97a39451de131d48a14b763b6c79a711d7f4d89d Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Thu, 8 Oct 2009 03:32:53 +0000
Subject: [PATCH] * Rolled back the 'MSGS EUID' subcommand introduced in r7866.
  I didn't need it after all, and I don't want to bloat the server code with
 this if it isn't necessary.

---
 citadel/msgbase.c | 32 ++------------------------------
 citadel/msgbase.h |  3 +--
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 9563223d6..7b4873cee 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -562,9 +562,7 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums,
  * API function to perform an operation for each qualifying message in the
  * current room.  (Returns the number of messages processed.)
  */
-int CtdlForEachMessage(int mode,
-			long ref,
-			char *search_string,
+int CtdlForEachMessage(int mode, long ref, char *search_string,
 			char *content_type,
 			struct CtdlMessage *compare,
 			void (*CallBack) (long, void *),
@@ -656,30 +654,6 @@ int CtdlForEachMessage(int mode,
 		}
 	}
 
-	/* If an EUID was specified, throw away all messages except the correct one. */
-	if (mode == MSGS_EUID) {
-		long correct_msgnum;
-		int found_match = 0;
-
-		if ((num_msgs > 0) && (search_string) ) {
-			correct_msgnum = locate_message_by_euid(search_string, &CC->room);
-			if ( (num_msgs > 0) && (correct_msgnum >= 0L) ) {
-				for (i=0; i<num_msgs; ++i) {
-					if (msglist[i] == correct_msgnum) {
-						found_match = 1;
-					}
-				}
-			}
-		}
-		if (found_match) {
-			msglist[0] = correct_msgnum;
-			num_msgs = 1;
-		} else {
-			num_msgs = 0;	/* didn't find the right one ... dump the rest */
-		}
-		mode = MSGS_ALL;	/* treat it like 'read all' from now on */
-	}
-
 	/* If a search string was specified, get a message list from
 	 * the full text index and remove messages which aren't on both
 	 * lists.
@@ -806,8 +780,6 @@ void cmd_msgs(char *cmdbuf)
 		mode = MSGS_GT;
 	else if (!strncasecmp(which, "SEARCH", 6))
 		mode = MSGS_SEARCH;
-	else if (!strncasecmp(which, "EUID", 4))
-		mode = MSGS_EUID;
 	else
 		mode = MSGS_ALL;
 
@@ -850,7 +822,7 @@ void cmd_msgs(char *cmdbuf)
 
 	CtdlForEachMessage(mode,
 			( (mode == MSGS_SEARCH) ? 0 : cm_ref ),
-			( ((mode == MSGS_SEARCH)||(mode == MSGS_EUID)) ? search_string : NULL ),
+			( (mode == MSGS_SEARCH) ? search_string : NULL ),
 			NULL,
 			template,
 			(with_headers ? headers_listing : simple_listing),
diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index f058527e3..56f248824 100644
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -13,8 +13,7 @@ enum {
 	MSGS_LAST,
 	MSGS_GT,
 	MSGS_EQ,
-	MSGS_SEARCH,
-	MSGS_EUID
+	MSGS_SEARCH
 };
 
 /*
-- 
2.30.2