Ticket #7492: foo.patch

diff -u -r pennmush-1.8.3p5\confmagic.h pennmush-1.8.3p5-patched\confmagic.h
--- pennmush-1.8.3p5\confmagic.h    Sun Jul 08 19:50:12 2007
+++ pennmush-1.8.3p5-patched\confmagic.h    Fri Nov 23 03:24:17 2007
@@ -12,7 +12,9 @@
 #ifndef _confmagic_h_
 #define _confmagic_h_
 
- /*
+#define inline __inline
+
+/*
  * (which isn't exportable from the U.S.), then don't encrypt
  */
 #ifndef HAS_CRYPT
diff -u -r pennmush-1.8.3p5\src\markup.c pennmush-1.8.3p5-patched\src\markup.c
--- pennmush-1.8.3p5\src\markup.c   Fri Oct 05 14:36:32 2007
+++ pennmush-1.8.3p5-patched\src\markup.c   Fri Nov 23 03:20:41 2007
@@ -54,7 +54,7 @@
 /* Now the code */
 
 static int write_ansi_close(char *buff, char **bp);
-static int write_ansi_letters(ansi_data cur, char *buff, char **bp);
+static int write_ansi_letters(const ansi_data *cur, char *buff, char **bp);
 static int safe_markup(char const *a_tag, char *buf, char **bp, char type);
 static int
  safe_markup_cancel(char const *a_tag, char *buf, char **bp, char type);
@@ -405,7 +405,7 @@
   int retval = 0;
   retval += safe_chr(TAG_START, buff, bp);
   retval += safe_chr(MARKUP_COLOR, buff, bp);
-  retval += write_ansi_letters(*cur, buff, bp);
+  retval += write_ansi_letters(cur, buff, bp);
   retval += safe_chr(TAG_END, buff, bp);
   return retval;
 }
@@ -422,15 +422,15 @@
 }
 
 static int
-write_ansi_letters(const ansi_data cur, char *buff, char **bp)
+write_ansi_letters(const ansi_data *cur, char *buff, char **bp)
 {
   int retval = 0;
   char *save;
   save = *bp;
-  if (cur.fore == 'n') {
-    retval += safe_chr(cur.fore, buff, bp);
+  if (cur->fore == 'n') {
+    retval += safe_chr(cur->fore, buff, bp);
   } else {
-#define CBIT_SET(x,y) (x.bits & y)
+#define CBIT_SET(x,y) (x->bits & y)
     if (CBIT_SET(cur, CBIT_FLASH))
       retval += safe_chr('f', buff, bp);
     if (CBIT_SET(cur, CBIT_HILITE))
@@ -440,7 +440,7 @@
     if (CBIT_SET(cur, CBIT_UNDERSCORE))
       retval += safe_chr('u', buff, bp);
 #undef CBIT_SET
-#define CBIT_SET(x,y) (x.offbits & y)
+#define CBIT_SET(x,y) (x->offbits & y)
     if (CBIT_SET(cur, CBIT_FLASH))
       retval += safe_chr('F', buff, bp);
     if (CBIT_SET(cur, CBIT_HILITE))
@@ -451,10 +451,10 @@
       retval += safe_chr('U', buff, bp);
 #undef CBIT_SET
 
-    if (cur.fore)
-      retval += safe_chr(cur.fore, buff, bp);
-    if (cur.back)
-      retval += safe_chr(cur.back, buff, bp);
+    if (cur->fore)
+      retval += safe_chr(cur->fore, buff, bp);
+    if (cur->back)
+      retval += safe_chr(cur->back, buff, bp);
   }
 
   if (retval)
@@ -464,7 +464,7 @@
 
 
 void
-nest_ansi_data(ansi_data * old, ansi_data * cur)
+nest_ansi_data(ansi_data *old, ansi_data *cur)
 {
   if (cur->fore != 'n') {
     cur->bits |= old->bits;
@@ -768,12 +768,12 @@
   markup_information *info;
 
   ansi_data ansistack[BUFFER_LEN];
-  ansistack[0] = ansi_null;
   int stacktop = 0;
 
   ansi_data tmpansi;
   int oldcodes = 0;
 
+  ansistack[0] = ansi_null;
 
   if (!source)
     return NULL;
@@ -1027,6 +1027,8 @@
 optimize_ansi_string(ansi_string *as)
 {
   int i, j;
+  int target = -1;
+  int len = 0;
 
   if (!as)
     return;
@@ -1065,8 +1067,6 @@
     }                           /* end outer loop */
   }
   /* end if_optimized */
-  int target = -1;
-  int len = 0;
   j = 0;
 
   /* Get rid of all removed markups
@@ -1259,6 +1259,9 @@
 
   markup_information *dm, *sm;
 
+  ansi_data backansi;
+
+
   /* If src->len == 0, we might have only markup. Stand-alones. Ew! */
   if (src->len <= 0 && src->nmarkups <= 0)
     return 0;
@@ -1334,7 +1337,7 @@
   /* Determine what old ansi might stretch across the new text.
    * This sets backansi to any ansi values (bits, colors) that
    * are continuous across an entire length of text. */
-  ansi_data backansi = ansi_null;
+  backansi = ansi_null;
   if (0 < loc && loc < dst->len) {
     backansi.offbits = dst->ansi[loc - 1].offbits & dst->ansi[loc].offbits;
     backansi.bits = dst->ansi[loc - 1].bits & dst->ansi[loc].bits;
@@ -1392,6 +1395,7 @@
   int end, d_end;
   int diff;
   int retval = 0;
+  ansi_data backansi;
   markup_information *dm, *sm;
 
   if (loc < 0)
@@ -1514,7 +1518,7 @@
    * This sets backansi to any ansi values (bits, colors) that
    * are continuous across an entire length of text.
    */
-  ansi_data backansi = dst->ansi[loc];
+  backansi = dst->ansi[loc];
   for (i = loc; i < end && !ansi_isnull(backansi); i++) {
     backansi.offbits &= dst->ansi[i].offbits;
     backansi.bits &= dst->ansi[i].bits;
@@ -1911,7 +1915,6 @@
   char type;
 
   ansi_data ansistack[BUFFER_LEN];
-  ansistack[0] = ansi_null;
   ansi_data oldansi;
   ansi_data tmpansi;
   int ansitop = 0;
@@ -1925,6 +1928,8 @@
 
   int retval = 0;
 
+  ansistack[0] = ansi_null;
+
   if (!str || !*str)
     return 0;
 
@@ -2074,7 +2079,7 @@
       }
       if (!ansi_isnull(tmpansi) && !ansi_equal(oldansi, tmpansi)) {
         retval += safe_str("[ansi(", buff, bp);
-        retval += write_ansi_letters(tmpansi, buff, bp);
+        retval += write_ansi_letters(&tmpansi, buff, bp);
         retval += safe_chr(',', buff, bp);
         howmanyopen++;
       }
diff -u -r pennmush-1.8.3p5\win32\cmds.h pennmush-1.8.3p5-patched\win32\cmds.h
--- pennmush-1.8.3p5\win32\cmds.h   Thu Nov 16 04:36:30 2006
+++ pennmush-1.8.3p5-patched\win32\cmds.h   Fri Nov 23 03:05:54 2007
@@ -74,6 +74,7 @@
 COMMAND_PROTO(cmd_mail);
 COMMAND_PROTO(cmd_malias);
 COMMAND_PROTO(cmd_map);
+COMMAND_PROTO(cmd_message);
 COMMAND_PROTO(cmd_motd);
 COMMAND_PROTO(cmd_mvattr);
 COMMAND_PROTO(cmd_name);
diff -u -r pennmush-1.8.3p5\win32\confmagic.h pennmush-1.8.3p5-patched\win32\confmagic.h
--- pennmush-1.8.3p5\win32\confmagic.h  Sun Jul 08 19:50:12 2007
+++ pennmush-1.8.3p5-patched\win32\confmagic.h  Fri Nov 23 03:24:17 2007
@@ -12,7 +12,9 @@
 #ifndef _confmagic_h_
 #define _confmagic_h_
 
- /*
+#define inline __inline
+
+/*
  * (which isn't exportable from the U.S.), then don't encrypt
  */
 #ifndef HAS_CRYPT
diff -u -r pennmush-1.8.3p5\win32\funs.h pennmush-1.8.3p5-patched\win32\funs.h
--- pennmush-1.8.3p5\win32\funs.h   Tue Jul 10 00:44:12 2007
+++ pennmush-1.8.3p5-patched\win32\funs.h   Fri Nov 23 03:05:15 2007
@@ -199,6 +199,7 @@
 FUNCTION_PROTO(fun_median);
 FUNCTION_PROTO(fun_member);
 FUNCTION_PROTO(fun_merge);
+FUNCTION_PROTO(fun_message);
 FUNCTION_PROTO(fun_mid);
 FUNCTION_PROTO(fun_min);
 FUNCTION_PROTO(fun_mix);