Changeset 718

Timestamp:

03/11/07 20:37:38 (1 year ago)

Author:

penndev

Message:

PennMUSH 1.8.3p1 release candidate.

Files:

• 1.8.3/trunk/CHANGES.182 (modified) (1 diff)
• 1.8.3/trunk/CHANGES.183 (modified) (1 diff)
• 1.8.3/trunk/Configure (modified) (4 diffs)
• 1.8.3/trunk/MANIFEST (modified) (1 diff)
• 1.8.3/trunk/Makefile.SH (modified) (1 diff)
• 1.8.3/trunk/Patchlevel (modified) (1 diff)
• 1.8.3/trunk/README.SQL (modified) (5 diffs)
• 1.8.3/trunk/config_h.SH (modified) (1 diff)
• 1.8.3/trunk/game/mushcnf.dst (modified) (1 diff)
• 1.8.3/trunk/game/restart (modified) (1 diff)
• 1.8.3/trunk/game/txt/hlp/pennchat.hlp (modified) (1 diff)
• 1.8.3/trunk/game/txt/hlp/penncmd.hlp (modified) (6 diffs)
• 1.8.3/trunk/game/txt/hlp/pennv182.hlp (modified) (2 diffs)
• 1.8.3/trunk/game/txt/hlp/pennv183.hlp (modified) (2 diffs)
• 1.8.3/trunk/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.3/trunk/hdrs/atr_tab.h (modified) (1 diff)
• 1.8.3/trunk/hdrs/conf.h (modified) (4 diffs)
• 1.8.3/trunk/hdrs/externs.h (modified) (2 diffs)
• 1.8.3/trunk/hdrs/version.h (modified) (1 diff)
• 1.8.3/trunk/hints/netbsd.sh (copied) (copied from 1.8.3/branches/devel/hints/netbsd.sh)
• 1.8.3/trunk/src/attrib.c (modified) (1 diff)
• 1.8.3/trunk/src/bsd.c (modified) (5 diffs)
• 1.8.3/trunk/src/command.c (modified) (2 diffs)
• 1.8.3/trunk/src/conf.c (modified) (5 diffs)
• 1.8.3/trunk/src/cque.c (modified) (3 diffs)
• 1.8.3/trunk/src/filecopy.c (modified) (1 diff)
• 1.8.3/trunk/src/funlist.c (modified) (17 diffs)
• 1.8.3/trunk/src/funmisc.c (modified) (2 diffs)
• 1.8.3/trunk/src/funstr.c (modified) (2 diffs)
• 1.8.3/trunk/src/funtime.c (modified) (3 diffs)
• 1.8.3/trunk/src/rob.c (modified) (2 diffs)
• 1.8.3/trunk/src/speech.c (modified) (5 diffs)
• 1.8.3/trunk/src/sql.c (modified) (12 diffs)
• 1.8.3/trunk/src/utils.c (modified) (2 diffs)
• 1.8.3/trunk/test/teststringsecs.pl (copied) (copied from 1.8.3/branches/devel/test/teststringsecs.pl)
• 1.8.3/trunk/utils/mkvershlp.pl (modified) (1 diff)

1.8.3/trunk/CHANGES.182

@@ -14 +14 @@
-
-==========================================================================
+
+Version 1.8.2 patchlevel 3                      March 11, 2007
+
+Fixes:
+  * Unterminated buffer in sortkey() fixed. Reported by Balerion.
+    Patch by Javelin.
+  * Memory leaks in setunion() and revwords() fixed by Javelin.
+  * Crash bug in speak() fixed. Reported by Trinsec. Patch by Javelin.
+  * Crash bug in buy fixed. Reported by Amy. Patch by Javelin.
+  * If we should fail to clear a semaphore attribute for some
+    reason (e.g., it's the branch of an attribute tree), reset
+    the semaphore count on the attribute to 0. Patch by Javelin.
+  * iter() dealt badly with freeing buffers when CPU_LIMIT or
+    function_invocation_limit was hit. Found by Ashen-Shugar. [GM]
+  * @ps/all displayed the wrong  queue entry count for mortals.
+    Reported by Cheetah. [SW]
+  * @hook/override of say would get an extra leading " if that was
+    used instead of the literal say command. Reported by Tuxedo Ian.
+    [SW]
+  * Fixed a bug where speech seemed to come from the wrong 
+    object for nospoof information. Reported by Jules. [SW]
+  * The help entry for @poll failed to mention @poll/clear.
+    Reported by Cooee. [SW]
-
-Version 1.8.2 patchlevel 2                      January 27, 2007

1.8.3/trunk/CHANGES.183

@@ -15 +15 @@
-==========================================================================
-
+Version 1.8.3 patchlevel 1                      March 11, 2007
+
+Minor changes:
+  * page command now processes page output through PAGEFORMAT
+    attribute, allowing user-set page messages. [GM]
+  * sql_host configuration option now permits alternate tcp port.
+    Suggested by Mercutio. Patch by Javelin.
+  * Refactoring of fun_stringsecs to help function etime_to_secs.
+    Patch by Javelin.
+  * %1 in @aconnect works like in @adisconnect. Patch by Javelin.
+
+Fixes:
+  * restart script once again includes DATEMSK export for
+    extended convtime support. Reported by KimikoMuffin.
+  * Memory leak in 1.8.3p0 regedit fixed.
+  * Fixes included from 1.8.2p3.
+  * Document change in @chan/title behavior with commas.
+
-Version 1.8.3 patchlevel 0                      January 27, 2007
-
-Major changes:
- 
+
-
-Minor changes:

1.8.3/trunk/Configure

@@ -421 +421 @@
-d_mysql=''
-libmysqlclient=''
+d_postgresql=''
+libpq=''
-glibpth=''
-libpth=''
@@ -4965 +4967 @@
-fi
-
+: see if we should include -lpq
+echo " "
+
+d_postgresql="$undef"
+
+if $test "x$no_postgresql" = "x"; then
+
+  libpq="-lpq"
+
+  $cat > test_postgresql.c <<EOM
+#include <stdio.h>
+#include <stdlib.h>
+#include <postgresql/libpq-fe.h>
+
+int main(int argc, char **argv) {
+  const char *conninfo = "dbname = postgres";
+  PGconn *conn;
+  conn = PQconnectdb(conninfo);
+  PQfinish(conn);
+  exit(0);
+}
+EOM
+
+  if $cc $ccflags $ldflags -o test_postgresql test_postgresql.c $libs $libpq >/dev/null 2>&1 ;
+  then
+      echo 'You have postgresql...' >&4
+      version=`./test_postgresql`
+      if $test $? -eq 0; then
+        d_postgresql="$define"
+      else
+        echo "...but my test program didn't run correctly." >&4
+        libpq=''
+      fi
+  else
+      echo "You don't seem to have postgresql." >&4
+      libpq=''
+  fi
+  $rm -f test_postgresql* core
+
+else
+
+  echo "Skipping postgresql tests." >&4
+  libpq=''
+
+fi
+
-: see if rename exists
-set rename d_rename
@@ -7028 +7076 @@
-d_passnames='$d_passnames'
-d_portable='$d_portable'
+d_postgresql='$d_postgresql'
-d_rand='$d_rand'
-d_random='$d_random'
@@ -7150 +7199 @@
-libc='$libc'
-libmysqlclient='$libmysqlclient'
+libpq='$libpq'
-libpth='$libpth'
-libs='$libs'

1.8.3/trunk/MANIFEST

@@ -185 +185 @@
-src/look.c
-src/malias.c
+src/markup.c
-src/match.c
-src/memcheck.c

1.8.3/trunk/Makefile.SH

@@ -49 +49 @@
-CCFLAGS=$optimize -I.. -I../hdrs $ccflags $warnings
-LDFLAGS=$ldflags
-
+ $libpq
-INSTALL=$install
-INSTALLDIR=$installdir

1.8.3/trunk/Patchlevel

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

1.8.3/trunk/README.SQL

@@ -9 +9 @@
-
-  * MySQL
+  * PostgresQL (from 1.8.3p2)
-
-This document explains how to use (or avoid) SQL with PennMUSH, and covers
@@ -17 +18 @@
-   III. SQL setup tips
-
-
+
+
+
+
+
+
+
+
+
-
-  The Configure script distributed with PennMUSH automatically detects
@@ -37 +46 @@
-  to fix this.
-
+I.b. PostgresQL
+
+  The Configure script distributed with PennMUSH automatically detects
+  the PostgresQL client library (libpq) and attempts to link
+  them into the executable, defining HAS_POSTGRESQL in config.h
+
+  If you want to avoid linking these libraries on systems where they
+  are present, use the '-D no_postgresql' switch to Configure.
+
+  If you installed PostgresQL from a binary package (e.g. rpm or apt),
+  you should be sure that your system also has the development
+  package (usually postgresql-dev, or libpq or similar)
+
+  If you think you have posgresql libraries and header files but
+  Configure isn't finding them, they may be in an unusual location on
+  your system.  Creating symbolic links from the header directory to
+  /usr/include/postgresql and from the libraries in /usr/lib (or adding
+  the postgresql library directory to your /etc/ld.so.conf and running
+  ldconfig) are the easiest ways to fix this.
+
-II. Mush configuration overview
-
@@ -42 +71 @@
-
-  sql_platform provides the name of the SQL database server software
-wo
- or "mysql". If not specified, it 
-
+hree
+, "mysql", or "postgresql". If not specified,
+it 
-
-  sql_host gives the name of the host running the SQL server.
-  It defaults to 127.0.0.1, which makes a TCP connection to the 
-  local host. The keyword "localhost" instead makes a domain socket
-
+
+
+
-
-  sql_database gives the name of the database that contains the 
@@ -117 +148 @@
-    Are you pretty sure you would like to implement this [yes/no]: yes
-
+  B. PostgresQL
+
+    As the postgres user:
+
+    % createuser -A -d -P mush
+    Enter password for new user:            <===========
+    CREATE USER
+
+    % createdb -U mush mush
+    Password:                   <===========
+    CREATE DATABASE
+

1.8.3/trunk/config_h.SH

@@ -850 +850 @@
-#$d_mysql HAS_MYSQL /**/
-
+/* HAS_POSTGRESQL:
+ *     Defined if postgresql client libraries are available.
+ */
+#$d_postgresql HAS_POSTGRESQL /**/
+
-/* HAS_OPENSSL:
- *     Defined if openssl 0.9.6+ is available.

1.8.3/trunk/game/mushcnf.dst

@@ -559 +559 @@
-
-# What SQL server platform should we use? Options include:
-
+postgresql, 
-sql_platform disabled
-
-# What's the SQL hostname? Use '127.0.0.1' for a TCP connection
-
+
+
+
-sql_host 127.0.0.1
-

1.8.3/trunk/game/restart

@@ -139 +139 @@
-
-DATEMSK="${GAMEDIR}/getdate.template"
+export DATEMSK
-
-LC_ALL=$LANG LANG=$LANG ./netmush $GAMEDIR/$CONF_FILE &

1.8.3/trunk/game/txt/hlp/pennchat.hlp

@@ -100 +100 @@
-  when you speak on the channel. If you leave the channel, your
-  title is cleared; use @channel/gag instead (see help @channel3).
+  You should escape any commas in your title with backslashes.
-
-  See "help @channel3" for more.

1.8.3/trunk/game/txt/hlp/penncmd.hlp

@@ -148 +148 @@
-  when a player connects in that location or zone (or, in the case of
-  the master room, anywhere).
+
+  One descriptor variable is passed to @aconnect:
+  %1 = number of player connections (1 if this is an initial connect)
-
-See also: @adisconnect, ACTION LISTS
@@ -2588 +2591 @@
-
-  This changes your password. Please note that passwords ARE case-sensitive.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-& @payment
-  @payment <object> [=<message>]
@@ -2693 +2718 @@
-  See also @emit, @oemit, @remit, NOSPOOF, and SPOOFING.
-& @poll
+  @poll
-  @poll <poll question>
-
-
-
+
+
+
+
+
-
-See also: @doing, WHO, DOING
@@ -4017 +4045 @@
-  If you have already paged someone since connecting, just typing:
-
-page <message>
+'page <message>' or 'page =<message>'
-
-  will send the message to the last person paged. You cannot page a 
@@ -4042 +4070 @@
-  square brackets, in front of the message, in a fashion similar to
-  the way NOSPOOF flags emits.
+
+  When a player is paged, their PAGEFORMAT attribute is checked, and if
+  exists, the page as viewed by the player is set to the results of
+  calling PAGEFORMAT. See help @pageformat
-
-  Page takes five switches: /list, /blind, /noeval, /override, and /port. 
@@ -4054 +4086 @@
-  including connections that have not yet logged into a player.
-  
-
+@pageformat, 
-& :
-& ;

1.8.3/trunk/game/txt/hlp/pennv182.hlp

@@ +1 @@
+& 1.8.2p3
+Version 1.8.2 patchlevel 3                      March 11, 2007
+
+Fixes:
+  * Unterminated buffer in sortkey() fixed. Reported by Balerion.
+    Patch by Javelin.
+  * Memory leaks in setunion() and revwords() fixed by Javelin.
+  * Crash bug in speak() fixed. Reported by Trinsec. Patch by Javelin.
+  * Crash bug in buy fixed. Reported by Amy. Patch by Javelin.
+  * If we should fail to clear a semaphore attribute for some
+    reason (e.g., it's the branch of an attribute tree), reset
+    the semaphore count on the attribute to 0. Patch by Javelin.
+  * iter() dealt badly with freeing buffers when CPU_LIMIT or
+    function_invocation_limit was hit. Found by Ashen-Shugar. [GM]
+  * @ps/all displayed the wrong  queue entry count for mortals.
+    Reported by Cheetah. [SW]
+  * @hook/override of say would get an extra leading " if that was
+    used instead of the literal say command. Reported by Tuxedo Ian.
+    [SW]
+  * Fixed a bug where speech seemed to come from the wrong 
+    object for nospoof information. Reported by Jules. [SW]
+  * The help entry for @poll failed to mention @poll/clear.
+    Reported by Cooee. [SW]
+
-& 1.8.2p2
-Version 1.8.2 patchlevel 2                      January 27, 2007
@@ -18 +42 @@
-    of the name for @ahear/@aahear/@amhear. [SW]
-  * Fixed the distribution of random numbers with a huge range. Reported
-
+
+
-& 1.8.2p1
-Version 1.8.2 patchlevel 1                      November 26, 2006

1.8.3/trunk/game/txt/hlp/pennv183.hlp

@@ -1 @@
-0
+1
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.8.3 patchlevel 1                      March 11, 2007
+
+Minor changes:
+  * page command now processes page output through PAGEFORMAT
+    attribute, allowing user-set page messages. [GM]
+  * sql_host configuration option now permits alternate tcp port.
+    Suggested by Mercutio. Patch by Javelin.
+  * Refactoring of fun_stringsecs to help function etime_to_secs.
+    Patch by Javelin.
+  * %1 in @aconnect works like in @adisconnect. Patch by Javelin.
+
+Fixes:
+  * restart script once again includes DATEMSK export for
+    extended convtime support. Reported by KimikoMuffin.
+  * Memory leak in 1.8.3p0 regedit fixed.
+  * Fixes included from 1.8.2p3.
+  * Document change in @chan/title behavior with commas.
+
+& 1.8.3p0
-Version 1.8.3 patchlevel 0                      January 27, 2007
-
-Major changes:
- 
+
-
-Minor changes:

1.8.3/trunk/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
-
+, 1
+, 2, 3
-1.8.1: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
-1.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13

1.8.3/trunk/hdrs/atr_tab.h

@@ -144 +144 @@
-  {"OZLEAVE", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"PAYMENT", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
+  {"PAGEFORMAT", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"PRICELIST", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"PREFIX", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},

1.8.3/trunk/hdrs/conf.h

@@ -266 +266 @@
-  char trace_log[256]; /**< File to log trace data */
-  char checkpt_log[256]; /**< File to log checkpoint data */
-#ifdef HAS_MYSQL
-  char sql_platform[256]; /**< Type of SQL server, or "disabled" */
-  char sql_host[256]; /**< Hostname of sql server */
@@ -272 +271 @@
-  char sql_password[256]; /**< Password for sql */
-  char sql_database[256]; /**< Database for sql */
-#endif
-};
-
@@ -433 +431 @@
-#define TRACELOG (options.trace_log)
-#define CHECKLOG (options.checkpt_log)
-#ifdef HAS_MYSQL
-#define SQL_PLATFORM (options.sql_platform)
-#define SQL_HOST (options.sql_host)
@@ -439 +436 @@
-#define SQL_USER (options.sql_username)
-#define SQL_PASS (options.sql_password)
-#endif
-
-#define CHUNK_SWAP_FILE (options.chunk_swap_file)

1.8.3/trunk/hdrs/externs.h

@@ -257 +257 @@
-extern void do_unlink(dbref player, const char *name);
-extern dbref do_clone(dbref player, char *name, char *newname, int preserve);
+
+/* From funtime.c */
+extern int etime_to_secs(char *str1, int *secs);
-
-/* From game.c */
@@ -527 +530 @@
-             char *ret, dbref executor, dbref enactor,
-             PE_Info * pe_info);
+    extern int call_attrib(dbref thing, const char *attrname,
+               const char *wenv_args[], int wenv_argc, char *ret,
+               dbref enactor, PE_Info * pe_info);
-    extern int member(dbref thing, dbref list);
-    extern int recursive_member(dbref disallow, dbref from, int count);

1.8.3/trunk/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.8.3"
-0
-1/27
-0
+1
+3/11
+1

1.8.3/trunk/src/attrib.c

@@ -448 +448 @@
-      num_new++;
-    }
+    /* Only GOD can create an AF_NODUMP attribute (used for semaphores)
+     * or add a leaf to a tree with such an attribute
+     */
+    if ((AL_FLAGS(atr) & AF_NODUMP) && (player != GOD)) {
+      missing_name[0] = '\0';
+      return AE_ERROR;
+    }
-    if (Cannot_Write_This_Attr(player, atr, 1)) {
-      missing_name[0] = '\0';

1.8.3/trunk/src/bsd.c

@@ -3347 +3347 @@
-  dbref loc;
-  char tbuf1[BUFFER_LEN];
+  char *myenv[2];
-  dbref zone;
-  dbref obj;
@@ -3416 +3417 @@
-    global_eval_context.rnxt[j] = NULL;
-  strcpy(global_eval_context.ccom, "");
+  /* And then load it up, as follows:
+   * %0 (unused, reserved for "reason for disconnect")
+   * %1 (number of connections after connect)
+   */
+  myenv[0] = NULL;
+  myenv[1] = mush_strdup(unparse_integer(num), "myenv");
+  for (j = 0; j < 2; j++)
+    global_eval_context.wnxt[j] = myenv[j];
-
-  /* do the person's personal connect action */
@@ -3447 +3456 @@
-    (void) queue_attribute(obj, "ACONNECT", player);
-  }
+  for (j = 0; j < 2; j++)
+    if (myenv[j])
+      mush_free(myenv[j], "myenv");
+  for (j = 0; j < 10; j++)
+    global_eval_context.wnxt[j] = NULL;
+  strcpy(global_eval_context.ccom, "");
-}
-
@@ -3787 +3802 @@
-  int start, count;
-  int powered = (*(called_as + 1) != 'M');
-index
+strchr
-
-  if (!is_strict_integer(args[0]) || !is_strict_integer(args[1])) {
@@ -3845 +3860 @@
-  dbref victim;
-  int powered = ((*called_as == 'L') && Priv_Who(executor));
-index
+strchr
-
-  first = 1;

1.8.3/trunk/src/command.c

@@ -249 +249 @@
-  {"@SQL", NULL, cmd_sql, CMD_T_ANY, "WIZARD", "SQL_OK"},
-#else
+#ifdef HAS_POSTGRESQL
+  {"@SQL", NULL, cmd_sql, CMD_T_ANY, "WIZARD", "SQL_OK"},
+#else
-  {"@SQL", NULL, cmd_unimplemented, CMD_T_ANY, "WIZARD", "SQL_OK"},
+#endif
-#endif
-  {"@SITELOCK", "BAN CHECK REGISTER REMOVE NAME", cmd_sitelock,
@@ -913 +917 @@
-  case SAY_TOKEN:
-    replacer = "SAY";
+#if 0
+    /* Messes up hooks when chat_strip_quote is yes. See bug #6677 */
-    if (CHAT_STRIP_QUOTE)
-      p--;          /* Since 'say' strips out the '"' */
+#endif
-    break;
-  case POSE_TOKEN:

1.8.3/trunk/src/conf.c

@@ -193 +193 @@
-  {"pueblo", cf_bool, &options.support_pueblo, 2, 0, "net"}
-  ,
-#ifdef HAS_MYSQL
-  {"sql_platform", cf_str, options.sql_platform, sizeof options.sql_platform, 0,
-   "net"}
@@ -208 +207 @@
-   NULL}
-  ,
-#endif
-
-  {"forking_dump", cf_bool, &options.forking_dump, 2, 0, "dump"}
-  ,
@@ -1188 +1185 @@
-#endif
-  options.mem_check = 0;
-#ifdef HAS_MYSQL
-  strcpy(options.sql_platform, "disabled");
-  strcpy(options.sql_database, "");
@@ -1194 +1190 @@
-  strcpy(options.sql_password, "");
-  strcpy(options.sql_host, "127.0.0.1");
-#endif
-}
-
@@ -1608 +1603 @@
-  notify(player, T(" The MUSH was compiled with MySQL support."));
-#endif
+#ifdef HAS_POSTGRESQL
+  notify(player, T(" The MUSH was compiled with Postgresql support."));
+#endif
-
-#ifdef INFO_SLAVE

1.8.3/trunk/src/cque.c

@@ -124 +124 @@
-    num = parse_integer(atr_value(a));
-  num += am;
-
-
-
-
+
+
+
+
+
+
+
-    (void) atr_clr(player, name, GOD);
-  }
@@ -904 +907 @@
-      (*del)++;
-    else if (q_all || (Owner(tmp->player) == victim)) {
-
-
-
+
+
+
+
+
-    switch (q_type) {
-    case 1:     /* wait queue */
-
+ 
-            unparse_object(player, tmp->player), tmp->comm);
-      break;
-    case 2:     /* semaphore queue */
-      if (tmp->left != 0) {
-
+ 
-              tmp->semattr, tmp->left - mudtime,
-              unparse_object(player, tmp->player), tmp->comm);
-      } else {
-
+ 
-              tmp->semattr, unparse_object(player, tmp->player),
-              tmp->comm);
@@ -924 +929 @@
-      break;
-    default:        /* player or object queue */
-
-
+ 
+ 
-            tmp->comm);
-    }

1.8.3/trunk/src/filecopy.c

@@ -207 +207 @@
-  char FileName[256];
-  if (GetModuleFileName(NULL, FileName, 256) != 0) {
-rindex
+strrchr
-      if (CopyFile("pennmush.exe", "pennmush_run.exe", FALSE)) {
-    do_rawlog(LT_ERR, "Successfully copied executable, starting copy.");

1.8.3/trunk/src/funlist.c

@@ -1212 +1212 @@
-  char outsep[BUFFER_LEN];
-  int i;
-  char tbuff[BUFFER_LEN];
-  char *tp;
-  char const *cp;
-  char result[BUFFER_LEN];
-
-
-
+
+
-
-  /* sortkey(attr,list,sort_type,delim,osep) */
@@ -1234 +1230 @@
-    strcpy(outsep, args[4]);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-  nptrs = list2arr_ansi(ptrs, MAX_SORTSIZE, args[1], sep);
@@ -1253 +1238 @@
-  /* Now we make a list of keys */
-  for (i = 0; i < nptrs; i++) {
-
-
-
-
-
-
-
+
+
+
-    keys[i] = mush_strdup(result, "sortkey");
-  }
@@ -1462 +1443 @@
-  char sep;
-  char **a1, **a2;
-
+, orign1, orign2
-  int lastx1, lastx2, found;
-  char *sort_type = ALPHANUM_LIST;
@@ -1481 +1462 @@
-
-  /* make arrays out of the lists */
-
-
+orign1 = 
+orign2 = 
-
-  if (nargs < 4) {
@@ -1590 +1571 @@
-    }
-  }
-
-
+orig
+orig
-  mush_free((Malloc_t) a1, "ptrarray");
-  mush_free((Malloc_t) a2, "ptrarray");
@@ -2606 +2587 @@
-{
-  char **words;
-
+, origcount
-  char sep;
-  char *osep, osepd[2] = { '\0', '\0' };
@@ -2622 +2603 @@
-  words = (char **) mush_malloc(sizeof(char *) * BUFFER_LEN, "wordlist");
-
-
+origcount = 
-  if (count == 0) {
-    mush_free((Malloc_t) words, "wordlist");
@@ -2633 +2614 @@
-    safe_str(words[--count], buff, bp);
-  }
-
+orig
-  mush_free((Malloc_t) words, "wordlist");
-}
@@ -2783 +2764 @@
-    sp = tbuf2;
-    if (process_expression(buff, bp, &sp, executor, caller, enactor,
-
+
+
-      break;
-
+
+
+
-      break;
+    }
-    funccount = pe_info->fun_invocations;
-    oldbp = *bp;
@@ -3222 +3207 @@
-
-  /* Ansi-less regedits */
-=1 ; i < nargs - 1; i
+ = 1; i < nargs - 1; i 
-    /* If this string has ANSI, switch to using ansi only */
-
-
-
+
+
+
+
-    prelen = strlen(prebuf);
-
@@ -3237 +3223 @@
-    r = args[i];
-    process_expression(tbuf, &tbp, &r, executor, caller, enactor, PE_DEFAULT,
-                
+       
-    *tbp = '\0';
-
-    if ((re = pcre_compile(remove_markup(tbuf, &searchlen),
-                        
+           
-      /* Matching error. */
-      safe_str(T("#-1 REGEXP ERROR: "), buff, bp);
@@ -3256 +3242 @@
-      study = pcre_study(re, 0, &errptr);
-      if (errptr != NULL) {
-        
-        
-        
-        
-        
+   
+   
+   
+   
+   
-      }
-      if (study != NULL)
-        
-        
+   
+   
-    }
-
@@ -3277 +3263 @@
-      safe_str(prebuf, postbuf, &postp);
-      mush_free((Malloc_t) re, "pcre");
+      free_ansi_string(orig);
-      if (study)
-        
+   
-      continue;
-    }
@@ -3298 +3285 @@
-      global_eval_context.re_subpatterns = subpatterns;
-      process_expression(postbuf, &postp, &obp, executor, caller, enactor,
-         
+           
-      if ((*bp == (buff + BUFFER_LEN - 1))
-        
-        
+   
+   
-
-      oldbp = postp;
@@ -3310 +3297 @@
-      /* Make sure we advance at least 1 char */
-      if (offsets[0] == match_offset)
-        
+   
-    } while (all && match_offset < prelen &&
-             
-             
+   
+               
-
-    safe_str(start, postbuf, &postp);
@@ -3336 +3323 @@
-      r = args[i];
-      process_expression(tbuf, &tbp, &r, executor, caller, enactor, PE_DEFAULT,
-                        
+           
-      *tbp = '\0';
-
-      if ((re = pcre_compile(remove_markup(tbuf, &searchlen),
-                        
-        
-