Changeset 529

Timestamp:

08/16/06 03:15:28 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.8.1p9 Archival

Files:

• 1.8.1/CHANGES.180 (modified) (1 diff)
• 1.8.1/CHANGES.181 (modified) (1 diff)
• 1.8.1/MANIFEST (modified) (1 diff)
• 1.8.1/Patchlevel (modified) (1 diff)
• 1.8.1/game/txt/hlp/pennv180.hlp (modified) (1 diff)
• 1.8.1/game/txt/hlp/pennv181.hlp (modified) (2 diffs)
• 1.8.1/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.1/hdrs/version.h (modified) (1 diff)
• 1.8.1/src/function.c (modified) (1 diff)
• 1.8.1/src/funlist.c (modified) (4 diffs)
• 1.8.1/test/testsetfuns.pl (added)

1.8.1/CHANGES.180

@@ -13 +13 @@
-
-==========================================================================
+
+Version 1.8.0 patchlevel 13                     July 5, 2006
+
+Fixes:
+  * Crash bug in pcreate() fixed. Report by Phreq@M*U*S*H.
+  * Crash bug in setunion() fixed. Report by Gurenk@ST:Legacy.
+
-
-Version 1.8.0 patchlevel 12                     March 25, 2006

1.8.1/CHANGES.181

@@ -14 +14 @@
-
-==========================================================================
+
+Version 1.8.1 patchlevel 9                      July 9, 2006
+
+Fixes:
+  * Fixes from 1.8.0p13.
+
-
-Version 1.8.1 patchlevel 8                      June 3, 2006

1.8.1/MANIFEST

@@ -241 +241 @@
-test/testreswitch.pl
-test/testtr.pl
+test/testsetfuns.pl
-utils/clwrapper.sh
-utils/customize.pl

1.8.1/Patchlevel

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

1.8.1/game/txt/hlp/pennv180.hlp

@@ +1 @@
+& 1.8.0p13
+Version 1.8.0 patchlevel 13                     July 5, 2006
+
+Fixes:
+  * Crash bug in pcreate() fixed. Report by Phreq@M*U*S*H.
+  * Crash bug in setunion() fixed. Report by Gurenk@ST:Legacy.
+
+
-& 1.8.0p12
-Version 1.8.0 patchlevel 12                     March 25, 2006

1.8.1/game/txt/hlp/pennv181.hlp

@@ -1 @@
-8
+9
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.8.1 patchlevel 9                      July 9, 2006
+
+Fixes:
+  * Fixes from 1.8.0p13.
+
+
+& 1.8.1p8
-Version 1.8.1 patchlevel 8                      June 3, 2006
-

1.8.1/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
-
+, 9
+, 13
-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.1/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.8.1"
-8
-6/03
-8
+9
+7/05
+9

1.8.1/src/function.c

@@ -541 +541 @@
-  {"OWNER", fun_owner, 1, 1, FN_REG},
-  {"PARENT", fun_parent, 1, 2, FN_REG},
-1
+2
-  {"PEMIT", fun_pemit, 2, -2, FN_REG},
-  {"PLAYERMEM", fun_playermem, 1, 1, FN_REG},

1.8.1/src/funlist.c

@@ -1264 +1264 @@
-
-/* ARGSUSED */
-FUNCTION(fun_setunion)
-{
-  char sep;
-  char **a1, **a2;
-  char *tempbuff;
-  int n1, i, a;
-  char *sort_type = ALPHANUM_LIST;
-  char *osep = NULL, osepd[2] = { '\0', '\0' };
-
-  /* if no lists, then no work */
-  if (!*args[0] && !*args[1])
-    return;
-
-  if (!delim_check(buff, bp, nargs, args, 3, &sep))
-    return;
-
-  tempbuff = (char *) mush_malloc((BUFFER_LEN * 2) + 4, "string");
-  a1 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray");
-  a2 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray");
-  if (!tempbuff || !a1 || !a2)
-    mush_panic("Unable to allocate memory in fun_setunion");
-  /* Concat both lists, make array, sort */
-  if (!*args[0])
-    memcpy(tempbuff, args[1], arglens[1] + 1);
-  else if (!*args[1])
-    memcpy(tempbuff, args[0], arglens[0] + 1);
-  else
-    sprintf(tempbuff, "%s%c%s", args[0], sep, args[1]);
-  n1 = list2arr(a1, MAX_SORTSIZE, tempbuff, sep);
-
-  if (nargs < 4) {
-    osepd[0] = sep;
-    osep = osepd;
-  } else if (nargs == 4) {
-    sort_type = get_list_type_noauto(args, nargs, 4);
-    if (sort_type == UNKNOWN_LIST) {
-      sort_type = ALPHANUM_LIST;
-      osep = args[3];
-    } else {
-      osepd[0] = sep;
-      osep = osepd;
-    }
-  } else if (nargs == 5) {
-    sort_type = get_list_type(args, nargs, 4, a1, n1);
-    osep = args[4];
-  }
-
-  do_gensort(executor, a1, NULL, n1, sort_type);
-
-  /* Strip the duplicates and make a2 contain the list */
-  a = 0;
-  for (i = 0; i < n1; i++) {
-    if (((a == 0) || (gencomp(executor, a1[i], a2[a - 1], sort_type) != 0))) {
-      a2[a] = a1[i];
-      a++;
-    }
-  }
-
-  /* Return our sorted result */
-  arr2list(a2, a, buff, bp, osep);
-  mush_free((Malloc_t) tempbuff, "string");
-  mush_free((Malloc_t) a1, "ptrarray");
-  mush_free((Malloc_t) a2, "ptrarray");
-}
-
-/* ARGSUSED */
-FUNCTION(fun_setinter)
-{
@@ -1349 +1283 @@
-  a2 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray");
-  if (!a1 || !a2)
-setunion
+inter
-
-  /* make arrays out of the lists */
@@ -1445 +1379 @@
-
-/* ARGSUSED */
+FUNCTION(fun_setunion)
+{
+  char sep;
+  char **a1, **a2;
+  int n1, n2, x1, x2, val;
+  int lastx1, lastx2, found;
+  char *sort_type = ALPHANUM_LIST;
+  int osepl = 0;
+  char *osep = NULL, osepd[2] = { '\0', '\0' };
+
+  /* if no lists, then no work */
+  if (!*args[0] && !*args[1])
+    return;
+
+  if (!delim_check(buff, bp, nargs, args, 3, &sep))
+    return;
+
+  a1 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray");
+  a2 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray");
+  if (!a1 || !a2)
+    mush_panic("Unable to allocate memory in fun_setunion");
+
+  /* make arrays out of the lists */
+  n1 = list2arr(a1, MAX_SORTSIZE, args[0], sep);
+  n2 = list2arr(a2, MAX_SORTSIZE, args[1], sep);
+
+  if (nargs < 4) {
+    osepd[0] = sep;
+    osep = osepd;
+    if (sep)
+      osepl = 1;
+  } else if (nargs == 4) {
+    sort_type = get_list_type_noauto(args, nargs, 4);
+    if (sort_type == UNKNOWN_LIST) {
+      sort_type = ALPHANUM_LIST;
+      osep = args[3];
+      osepl = arglens[3];
+    } else {
+      osepd[0] = sep;
+      osep = osepd;
+      if (sep)
+    osepl = 1;
+    }
+  } else if (nargs == 5) {
+    sort_type = get_list_type(args, nargs, 4, a1, n1);
+    osep = args[4];
+    osepl = arglens[4];
+  }
+  /* sort each array */
+  do_gensort(executor, a1, NULL, n1, sort_type);
+  do_gensort(executor, a2, NULL, n2, sort_type);
+
+  /* get values for the union, in order, skipping duplicates */
+  lastx1 = lastx2 = -1;
+  found = x1 = x2 = 0;
+  if (n1 == 1 && !*a1[0])
+    n1 = 0;
+  if (n2 == 1 && !*a2[0])
+    n2 = 0;
+  while ((x1 < n1) || (x2 < n2)) {
+    /* If we've already copied off something from a1, and our current
+     * look at a1 is the same element, or we've copied from a2 and
+     * our current look at a1 is the same element, skip forward in a1.
+     */
+    if (x1 < n1 && lastx1 >= 0) {
+      val = gencomp(executor, a1[lastx1], a1[x1], sort_type);
+      if (val == 0) {
+    x1++;
+    continue;
+      }
+    }
+    if (x1 < n1 && lastx2 >= 0) {
+      val = gencomp(executor, a2[lastx2], a1[x1], sort_type);
+      if (val == 0) {
+    x1++;
+    continue;
+      }
+    }
+    if (x2 < n2 && lastx1 >= 0) {
+      val = gencomp(executor, a1[lastx1], a2[x2], sort_type);
+      if (val == 0) {
+    x2++;
+    continue;
+      }
+    }
+    if (x2 < n2 && lastx2 >= 0) {
+      val = gencomp(executor, a2[lastx2], a2[x2], sort_type);
+      if (val == 0) {
+    x2++;
+    continue;
+      }
+    }
+    if (x1 >= n1) {
+      /* Just copy off the rest of a2 */
+      if (x2 < n2) {
+    if (found)
+      safe_strl(osep, osepl, buff, bp);
+    safe_str(a2[x2], buff, bp);
+    lastx2 = x2;
+    x2++;
+    found = 1;
+      }
+    } else if (x2 >= n2) {
+      /* Just copy off the rest of a1 */
+      if (x1 < n1) {
+    if (found)
+      safe_strl(osep, osepl, buff, bp);
+    safe_str(a1[x1], buff, bp);
+    lastx1 = x1;
+    x1++;
+    found = 1;
+      }
+    } else {
+      /* At this point, we're merging. Take the lower of the two. */
+      val = gencomp(executor, a1[x1], a2[x2], sort_type);
+      if (val <= 0) {
+    if (found)
+      safe_strl(osep, osepl, buff, bp);
+    safe_str(a1[x1], buff, bp);
+    lastx1 = x1;
+    x1++;
+    found = 1;
+      } else {
+    if (found)
+      safe_strl(osep, osepl, buff, bp);
+    safe_str(a2[x2], buff, bp);
+    lastx2 = x2;
+    x2++;
+    found = 1;
+      }
+    }
+  }
+  mush_free((Malloc_t) a1, "ptrarray");
+  mush_free((Malloc_t) a2, "ptrarray");
+}
+
+/* ARGSUSED */
-FUNCTION(fun_setdiff)
-{
@@ -1464 +1535 @@
-  a2 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray");
-  if (!a1 || !a2)
-setunion
+diff
-
-  /* make arrays out of the lists */