PennMUSH 1.8.3p12

Author: allthecoolkidshaveone <allthecoolkidshaveone@ba372814-4f39-11de-9ad6-1127a62b9fcd>
Date:   Wed Jan 6 16:23:28 2010 +0000

    Issue 26: Allow for / in @mail subjects.
Fixes #179

diff --git a/src/extmail.c b/src/extmail.c
index b925a5522e5ad60d5c8a721e17c11394b41f9653..838c4d0d392f05027a943e5dc598a0c9309d68f4 100644 (file)
--- a/src/extmail.c
+++ b/src/extmail.c
@@ -850,9 +850,18 @@ do_mail_send(dbref player, char *tolist, char *message, mail_flag flags,
   }
   sb = sbuf;
   mb = message;                 /* Save the message pointer */
-  while (*message && (i < SUBJECT_LEN) && *message != SUBJECT_COOKIE) {
-    *sb++ = *message++;
-    i++;
+  while (*message && (i < SUBJECT_LEN)) {
+    if (*message == SUBJECT_COOKIE) {
+      if (*(message + 1) == SUBJECT_COOKIE) {
+       *sb++ = *message;
+       message += 2;
+       i += 1;
+      } else
+       break;
+    } else {
+      *sb++ = *message++;
+      i += 1;
+    }
   }
   *sb = '\0';
   if (*message && (*message == SUBJECT_COOKIE)) {
@@ -860,10 +869,6 @@ do_mail_send(dbref player, char *tolist, char *message, mail_flag flags,
     subject_given = 1;
   } else
     message = mb;               /* Rewind the pointer to the beginning */
-#ifdef ALLOW_NOSUBJECT
-  if (!subject_given)
-    strcpy(sbuf, T("(no subject)"));
-#endif
   /* Parse the player list */
   head = tolist;
   while (head && *head) {