Changeset 495

Timestamp:

08/16/06 02:23:39 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.8.0p6 Archival

Files:

• 1.8.0/CHANGES.180 (modified) (1 diff)
• 1.8.0/Patchlevel (modified) (1 diff)
• 1.8.0/game/txt/hlp/pennv180.hlp (modified) (2 diffs)
• 1.8.0/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.0/hdrs/externs.h (modified) (1 diff)
• 1.8.0/hdrs/version.h (modified) (1 diff)
• 1.8.0/src/access.c (modified) (2 diffs)
• 1.8.0/src/command.c (modified) (4 diffs)
• 1.8.0/src/function.c (modified) (1 diff)
• 1.8.0/src/funlist.c (modified) (2 diffs)
• 1.8.0/src/parse.c (modified) (1 diff)

1.8.0/CHANGES.180

@@ -12 +12 @@
-
-==========================================================================
+
+Version 1.8.0 patchlevel 6                      June 24, 2005
+
+Fixes:
+  * Weird logging ouput with function logargs fixed. Report by Sholevi@M*U*S*H.
+  * sort() and set functions now ignore ansi. Patch by Walker@M*U*S*H.
+  * @hook memory leak fixed. Reported by Shari@M*U*S*H.
+
-
-Version 1.8.0 patchlevel 5                      May 30, 2005

1.8.0/Patchlevel

@@ -1 +1 @@
-Do not edit this file. It is maintained by the official PennMUSH patches.
-5
+6

1.8.0/game/txt/hlp/pennv180.hlp

@@ -1 @@
-5
+6
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.8.0 patchlevel 6                      June 24, 2005
+
+Fixes:
+  * Weird logging ouput with function logargs fixed. Report by Sholevi@M*U*S*H.
+  * sort() and set functions now ignore ansi. Patch by Walker@M*U*S*H.
+  * @hook memory leak fixed. Reported by Shari@M*U*S*H.
+
+
+& 1.8.0p5
-Version 1.8.0 patchlevel 5                      May 30, 2005
-

1.8.0/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
+, 6
-1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-       19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,

1.8.0/hdrs/externs.h

@@ -570 +570 @@
-    extern void save_global_regs(const char *funcname, char *preserve[]);
-    extern void restore_global_regs(const char *funcname, char *preserve[]);
+    extern void free_global_regs(const char *funcname, char *preserve[]);
+    extern void init_global_regs(char *preserve[]);
-    extern void load_global_regs(char *preserve[]);
-    extern void save_global_env(const char *funcname, char *preserve[]);

1.8.0/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.8.0"
-5
-5/30
-5
+6
+6/24
+6

1.8.0/src/access.c

@@ -282 +282 @@
-}
-
+#ifdef FORCE_IPV4
-static char *
-ip4_to_ip6(const char *addr)
@@ -292 +293 @@
-  return tbuf1;
-}
+#endif
-
-

1.8.0/src/command.c

@@ -1171 +1171 @@
-    return NULL;
-  } else {
-
+
+
-    /* If we have a hook/ignore that returns false, we don't do the command */
-    if (run_hook(player, cause, &cmd->hooks.ignore, saveregs, 1)) {
@@ -1191 +1192 @@
-      retval = commandraw;
-    }
+    free_global_regs("hook.regs", saveregs);
-  }
-
@@ -1208 +1210 @@
-{
-  COMMAND_INFO *cmd;
- = { NULL }
+
-
-  if ((cmd = command_find("HUH_COMMAND"))) {
-    if (!(cmd->type & CMD_T_DISABLED)) {
+      init_global_regs(saveregs);
-      if (run_hook(player, cause, &cmd->hooks.ignore, saveregs, 1)) {
-    /* If we have a hook/override, we use that instead */
@@ -1227 +1230 @@
-      do_log(LT_HUH, player, cause, "%s", string);
-      }
+      free_global_regs("hook.regs", saveregs);
-    }
-  }

1.8.0/src/function.c

@@ -72 +72 @@
-      strcpy(global_eval_context.renv[i], preserve[i]);
-      mush_free(preserve[i], funcname);
+      preserve[i] = NULL;
-    } else {
-      global_eval_context.renv[i][0] = '\0';
-    }
+  }
+}
+
+/** Free the storage array for the q-registers, without restoring
+ * \param funcname name of function calling (for memory leak testing)
+ * \param preserve pointer to array to free q-registers from.
+ */
+void
+free_global_regs(const char *funcname, char *preserve[])
+{
+  int i;
+  for (i = 0; i < NUMQ; i++) {
+    if (preserve[i])
+      mush_free(preserve[i], funcname);
+  }
+}
+
+/** Initilalize an array for the q-registers, setting all NULL.
+ * \param preserve pointer to array to free q-registers from.
+ */
+void
+init_global_regs(char *preserve[])
+{
+  int i;
+  for (i = 0; i < NUMQ; i++) {
+    preserve[i] = NULL;
-  }
-}

1.8.0/src/funlist.c

@@ -11 +11 @@
-#include <string.h>
-#include <ctype.h>
+#include "ansi.h"
-#include "conf.h"
-#include "case.h"
@@ -790 +791 @@
-GENRECORD(gen_alphanum)
-{
-
+
+
+
+
+
+
+
-}
-

1.8.0/src/parse.c

@@ -1134 +1134 @@
-          safe_str(fargs[logi], logstr, &logp);
-          if (logi + 1 < nfargs)
-str(fargs[logi]
+chr(','
-        }
-        safe_chr(')', logstr, &logp);