Changeset 925

Timestamp:

06/13/07 00:46:44 (1 year ago)

Author:

shawnw

Message:

1.8.2p5

Files:

• 1.8.2/trunk/CHANGES.182 (modified) (1 diff)
• 1.8.2/trunk/Patchlevel (modified) (1 diff)
• 1.8.2/trunk/game/txt/hlp/pennfunc.hlp (modified) (1 diff)
• 1.8.2/trunk/game/txt/hlp/pennv182.hlp (modified) (2 diffs)
• 1.8.2/trunk/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.2/trunk/hdrs/attrib.h (modified) (1 diff)
• 1.8.2/trunk/hdrs/externs.h (modified) (2 diffs)
• 1.8.2/trunk/hdrs/pcre.h (modified) (1 diff)
• 1.8.2/trunk/hdrs/version.h (modified) (1 diff)
• 1.8.2/trunk/src/Makefile.SH (modified) (1 diff)
• 1.8.2/trunk/src/access.c (modified) (2 diffs)
• 1.8.2/trunk/src/attrib.c (modified) (10 diffs)
• 1.8.2/trunk/src/bsd.c (modified) (4 diffs)
• 1.8.2/trunk/src/notify.c (modified) (5 diffs)
• 1.8.2/trunk/src/strutil.c (modified) (1 diff)
• 1.8.2/trunk/src/wild.c (modified) (17 diffs)
• 1.8.2/trunk/src/wiz.c (modified) (1 diff)

1.8.2/trunk/CHANGES.182

@@ -14 +14 @@
-
-==========================================================================
+
+Version 1.8.2 patchlevel 5                      June 13, 2007
+
+Minor changes:
+  * Removed the gmalloc malloc option. [SW]
+  * Assorted gcc warning fixes. [SW]
+
+Fixes:
+  * Cleaned up some unsafe signal handler functions. [SW]
-
-Version 1.8.2 patchlevel 4                      May 16, 2007

1.8.2/trunk/Patchlevel

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

1.8.2/trunk/game/txt/hlp/pennfunc.hlp

@@ -1878 +1878 @@
- 
-  Returns a space-separated list of the attribute names on the object
-
-you must either be a Wizard or Royalty, own the object, have the
-See_All power, or have the object set VISUAL in order to use this 
-
+ you
+must either be a Wizard or Royalty, own the object, have the See_All
+power, or have the object set VISUAL and pass its examine lock in
+order to use this 
-  
-  If a wildcarded attribute pattern is provided, only attribute names

1.8.2/trunk/game/txt/hlp/pennv182.hlp

@@ -1 @@
-4
+5
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.8.2 patchlevel 5                      June 13, 2007
+
+Minor changes:
+  * Removed the gmalloc malloc option. [SW]
+  * Assorted gcc warning fixes. [SW]
+
+Fixes:
+  * Cleaned up some unsafe signal handler functions. [SW]
+
+& 1.8.2p4
-Version 1.8.2 patchlevel 4                      May 16, 2007
-

1.8.2/trunk/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
+, 5
-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.2/trunk/hdrs/attrib.h

@@ -127 +127 @@
-#define AF_PUBLIC       0x2000000   /**< Override SAFER_UFUN */
-#define AF_ANON         0x4000000   /**< INTERNAL: Attribute doesn't really
-                   
+                                        
-#define AF_NONAME       0x8000000   /**< No name in did_it */
-#define AF_NOSPACE      0x10000000  /**< No space in did_it */

1.8.2/trunk/hdrs/externs.h

@@ -481 +481 @@
-               char **bp);
-
+    char *mush_strncpy(char *restrict, const char *, size_t);
+
-    extern char *replace_string
-      (const char *RESTRICT old, const char *RESTRICT newbit,
@@ -570 +572 @@
-    extern int quick_wild_new(const char *RESTRICT tstr,
-                  const char *RESTRICT dstr, int cs);
-
-
+
+
+
-    extern int quick_regexp_match(const char *RESTRICT s,
-                  const char *RESTRICT d, int cs);
-
-       int cs
+_r
+    int cs, char **, int, char *, int
-    extern int quick_wild(const char *RESTRICT tsr, const char *RESTRICT dstr);
-    extern int atr_wild(const char *RESTRICT tstr, const char *RESTRICT dstr);
-/** Default (case-sensitive) regex match */
-#define regexp_match(s,d) regexp_match_case(s,d,1)
-/** Default (case-insensitive) wildcard match */
-#define wild_match(s,d) wild_match_case(s,d,0)
-/** Default (case-insensitive) local wildcard match */
-#define local_wild_match(s,d) local_wild_match_case(s, d, 0)

1.8.2/trunk/hdrs/pcre.h

@@ -184 +184 @@
-                int *, const unsigned char *);
-  extern int pcre_copy_substring(const char *, int *, int, int, char *, int);
+  int pcre_get_substring(const char *, int *, int, int, const char **);
-  extern int pcre_exec(const pcre *, const pcre_extra *,
-               const char *, int, int, int, int *, int);

1.8.2/trunk/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.8.2"
-4
-4/16
-4
+5
+6/13
+5

1.8.2/trunk/src/Makefile.SH

@@ -207 +207 @@
-    echo '!NO!SUBS!' >> Makefile.SH
-
-
+
+
-indent:
-    (set +e; for file in *.dst *.c  ../hdrs/*.h ; do echo $$file; \
-
-
+
-    -T atr_err -T ATRALIAS -T DESC -T CNode -T CONF -T BQUE -T FUN \
-    -T NVAL -T i_rec -T f_rec -T USERFN_ENTRY -T PRIV -T FLAG \

1.8.2/trunk/src/access.c

@@ -331 +331 @@
-    if (!(ap->can & ACS_SITELOCK)
-    && ((ap->can & ACS_REGEXP)
-regexp_match_case
-regexp_match_case
+quick_regexp_match
+quick_regexp_match
-#ifdef FORCE_IPV4
-regexp_match_case
-regexp_match_case
+quick_regexp_match
+quick_regexp_match
-#endif
-        )
@@ -401 +401 @@
-    if (!(ap->can & ACS_SITELOCK)
-    && ((ap->can & ACS_REGEXP)
-regexp_match_case
-regexp_match_case
+quick_regexp_match
+quick_regexp_match
-#ifdef FORCE_IPV4
-regexp_match_case
-regexp_match_case
+quick_regexp_match
+quick_regexp_match
-#endif
-        )

1.8.2/trunk/src/attrib.c

@@ -402 +402 @@
-  do { \
-    ATTR *std = atr_match(AL_NAME((atr))); \
-    
+     
-      AL_FLAGS(atr) = AL_FLAGS(std); \
-    } else { \
@@ -569 +569 @@
-      }
-    } else {
- 
- 
+
+
-    }
-  }
@@ -661 +661 @@
-    if (!EMPTY_ATTRS) {
-      unsigned char *t = compress(" ");
- 
+
-        mush_panic(T("Unable to allocate memory in atr_add()!"));
-      root->data = chunk_create(t, u_strlen(t), 0);
@@ -1296 +1296 @@
-  int skipcount;
-  int lock_checked = 0;
+  char match_space[BUFFER_LEN * 2];
+  int match_space_len = BUFFER_LEN * 2;
-
-  /* check for lots of easy ways out */
@@ -1369 +1371 @@
-    match_found = 0;
-    if (AF_Regexp(ptr)) {
-
+
+
+
-    match_found = 1;
-    match++;
@@ -1377 +1381 @@
-    match_found = 1;
-    match++;
-
+
+
+
+
-      }
-    }
@@ -1486 +1493 @@
-      match_found = 0;
-      if (AF_Regexp(ptr)) {
-
+
+
+
-      match_found = 1;
-      match++;
@@ -1494 +1503 @@
-      match_found = 1;
-      match++;
-
+
+
+
+
-    }
-      }
@@ -1559 +1571 @@
-  char tbuf2[BUFFER_LEN];
-  char *s;
+  char match_space[BUFFER_LEN * 2];
+  int match_space_len = BUFFER_LEN * 2;
-
-  /* check for lots of easy ways out */
@@ -1592 +1606 @@
-
-  if (AF_Regexp(ptr) ?
-
-
+
+
+
+
+
+
+
+
+
-    if (!eval_lock(player, thing, Command_Lock)
-    || !eval_lock(player, thing, Use_Lock))

1.8.2/trunk/src/bsd.c

@@ -372 +372 @@
-void WIN32_CDECL signal_dump(int sig);
-void reaper(int sig);
+#ifndef WIN32
+sig_atomic_t dump_error = 0;
+WAIT_TYPE dump_status = 0;
+#endif
-extern Pid_t forked_dump_pid;   /**< Process id of forking dump process */
-static void dump_users(DESC *call_by, char *match, int doing);
@@ -385 +389 @@
-static void reap_info_slave(void);
-void kill_info_slave(void);
+sig_atomic_t slave_error = 0;
-#endif
-void reopen_logs(void);
@@ -838 +843 @@
-
-    process_commands();
+
+    /* Check signal handler flags */
+
+#ifndef WIN32
+    if (dump_error) {
+      if (WIFSIGNALED(dump_status)) {
+    do_rawlog(LT_ERR, T("ERROR! forking dump exited with signal %d"),
+          WTERMSIG(dump_status));
+    flag_broadcast("ROYALTY WIZARD", 0,
+               T("GAME: ERROR! Forking database save failed!"));
+      } else if (WIFEXITED(dump_status) && WEXITSTATUS(dump_status) == 0) {
+    time(&globals.last_dump_time);
+    if (DUMP_NOFORK_COMPLETE && *DUMP_NOFORK_COMPLETE)
+      flag_broadcast(0, 0, "%s", DUMP_NOFORK_COMPLETE);
+      }
+      dump_error = 0;
+      dump_status = 0;
+    }
+#ifdef INFO_SLAVE
+    if (slave_error) {
+      do_rawlog(LT_ERR, T("info_slave on pid %d exited unexpectedly!"),
+        slave_error);
+      slave_error = 0;
+    }
+#endif
+#endif              /* !WIN32 */
-
-    if (signal_shutdown_flag) {
@@ -3036 +3067 @@
-#ifdef INFO_SLAVE
-    if (info_slave_pid > -1 && pid == info_slave_pid) {
-      do_rawlog(LT_ERR, T("info_slave on pid %d exited!"), pid);
-      info_slave_state = 0;
-      info_slave_pid = -1;
+      slave_error = pid;
-    } else
-#endif
-    if (forked_dump_pid > -1 && pid == forked_dump_pid) {
-      /* Most failures are handled by the forked mush already */
-
-
-
-
-
-
-
-
-
-
-
+
+
-      forked_dump_pid = -1;
-    }

1.8.2/trunk/src/notify.c

@@ -331 +331 @@
-      bp = tbuf;
-      safe_str((char *) messages[type].message, tbuf, &bp);
-
-
+(char) 
+(char) 
-      *bp = '\0';
-      return (unsigned char *) tbuf;
@@ -371 +371 @@
-      bp = tbuf;
-      safe_str((char *) messages[type].message, tbuf, &bp);
-
-
+(char) 
+(char) 
-      *bp = '\0';
-      return (unsigned char *) tbuf;
@@ -421 +421 @@
-      bp = tbuf;
-      safe_str((char *) messages[type].message, tbuf, &bp);
-
-
+(char) 
+(char) 
-      *bp = '\0';
-      return (unsigned char *) tbuf;
@@ -533 +533 @@
-    bp = tbuf;
-    safe_str((char *) messages[type].message, tbuf, &bp);
-
-
+(char) 
+(char) 
-    *bp = '\0';
-    return (unsigned char *) tbuf;
@@ -915 +915 @@
-    a = atr_get_noparent(target, "LISTEN");
-    if (a) {
+      char match_space[BUFFER_LEN * 2];
+      int match_space_len = BUFFER_LEN * 2;
-      if (!tbuf1)
-    tbuf1 = (char *) mush_malloc(BUFFER_LEN, "string");
-      strcpy(tbuf1, atr_value(a));
-      if (AF_Regexp(a)
-
+
+
+
+
+
+
-                  (char *) notify_makestring(msgbuf, messages,
-                             NA_ASCII, 0),
-
-
-
-
-
+
+
-    if (eval_lock(speaker, target, Listen_Lock))
-      if (PLAYER_AHEAR || (!IsPlayer(target))) {

1.8.2/trunk/src/strutil.c

@@ -1245 +1245 @@
-    *s_len = len + 1;
-  return buff;
+}
+
+/** Safe version of strncpy() that always nul-terminates the
+ * destination string. The only reason it's not called
+ * safe_strncpy() is to avoid confusion with the unrelated
+ * safe_*() pennstr functions.
+ * \param dst the destination string to copy to
+ * \param src the source string to copy from
+ * \param len the maximum number of bytes to copy
+ * return dst
+ */
+char *
+mush_strncpy(char *RESTRICT dst, const char *RESTRICT src, size_t len)
+{
+  size_t n = 0;
+  char *start = dst;
+
+  if (!src || !dst || len == 0)
+    return dst;
+
+  len--;
+
+  while (*src && n < len) {
+    *dst++ = *src++;
+    n++;
+  }
+
+  *dst = '\0';
+  return start;
-}
-

1.8.2/trunk/src/wild.c

@@ -31 +31 @@
-#include "case.h"
-#include "externs.h"
+#include "ansi.h"
-#include "mymalloc.h"
-#include "parse.h"
@@ -47 +48 @@
-const unsigned char *tables = NULL;  /** Pointer to character tables */
-
-static char wspace[3 * BUFFER_LEN + NUMARGS];   /* argument return buffer */
-                        /* big to match tprintf */
-
-static int wild1
-  (const char *RESTRICT tstr, const char *RESTRICT dstr, int arg,
-
-
+
+
+
-static int check_literals(const char *RESTRICT tstr, const char *RESTRICT dstr,
-              int cs);
@@ -272 +271 @@
-static int
-wild1(const char *RESTRICT tstr, const char *RESTRICT dstr, int arg,
-RESTRICT wbuf, int cs
+wbuf, int *len, int cs, char **ary, int max
-{
-  const char *datapos;
@@ -286 +285 @@
-    return 0;
-
-
-
-
+
+
+
+
+
+
-
-      /* Jump to the fast routine if we can. */
-
-NUMARGS
+(int) max || *len < 2
-    return quick_wild_new(tstr + 1, dstr + 1, cs);
-      break;
@@ -316 +318 @@
-  /* If at end of pattern, slurp the rest, and leave. */
-  if (!tstr[1]) {
-
-
-
+
+
+
+
+
+
+
+
-    return 1;
-  }
@@ -331 +338 @@
-       * before a fixed string.
-       */
-
-
+
+
+
+
+
-
-      /* Jump to the fast routine if we can. */
-NUMARGS
+(int) max || *len < 2
-    return quick_wild_new(tstr, dstr, cs);
-
-      /* Fill in any intervening '?'s */
-      while (argpos < arg) {
-
-
-
+
+
+
+
+
+
-
-    /* Jump to the fast routine if we can. */
-NUMARGS
+(int) max || *len < 1
-      return quick_wild_new(tstr, dstr, cs);
-      }
@@ -378 +391 @@
-    while (1) {
-      if (EQUAL(cs, *dstr, *tstr) &&
-NUMARGS) ? wild1(tstr, dstr, arg, wbuf, cs
+(int) max) ? wild1(tstr, dstr, arg, wbuf, len, cs, ary, max
-       : quick_wild_new(tstr, dstr, cs)))
-    break;
@@ -390 +403 @@
-   * First do the '*'...
-   */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-  /* Fill in any trailing '?'s that are left. */
-  while (numextra) {
-NUMARGS
+(int) max || *len < 2
-      return 1;
-
-
-
-
+
+
+
+
+
+
+
-  }
-
@@ -420 +443 @@
- */
-static int
-)
-
-
-
-/* Do fast match
+,
+
+
+
+   remembering this time.
-  while ((*s != '*') && (*s != '?')) {
-    if (*s == '\\')
@@ -441 +464 @@
-
-  /* Do the match. */
-
-
-
-
+
+
+
+
+
- *
- * This routine will cause crashes if fed NULLs instead of strings.
@@ -451 +475 @@
- * \param d string to check.
- * \param cs if 1, case-sensitive; if 0, case-insensitive.
+ * \param ary An array to store the grabs in
+ * \param max Number of elements ary can hold
+ * \param data Buffer used to hold the matches. The elements of ary
+ *    are set to pointers into this  buffer.
+ * \param len The number of bytes in data. Twice the length of d should
+ *    be enough.
- * \retval 1 d matches s.
- * \retval 0 d doesn't match s.
- */
-int
-(const char *RESTRICT s, const char *RESTRICT d, int cs)
-
-
-/* Clear %0-%9 and r(0) - r(9) */
-
-  global_eval_context.wnxt[j] = (char *) NULL;
-for (j = 0; j < NUMQ; j++)
-
-
+_r(const char *RESTRICT s, const char *RESTRICT d, int cs,
+
+
+int n;
+
+for (n = 0; n < nmatches; n++)
+  matches[n] = NULL;
+
+, matches, nmatches, data, len
-}
-
@@ -472 +502 @@
- * \param s regexp to match against.
- * \param d string to check.
-
-
-
+
+
+
+
+
+
+
+
- */
-int
-(const char *RESTRICT s, const char *RESTRICT d, int cs)
-
-
+_r(const char *RESTRICT s, const char *RESTRICT val, int cs,
+
+
-  pcre *re;
-  int i;
-  static char wtmp[NUMARGS][BUFFER_LEN];
-  const char *errptr;
+  const char *d;
+  size_t delenn;
-  int erroffset;
-  int offsets[99];
-  int subpatterns;
+
+  for (i = 0; i < nmatches; i++)
+    matches[i] = NULL;
-
-  if ((re = pcre_compile(s, (cs ? 0 : PCRE_CASELESS), &errptr, &erroffset,
@@ -498 +537 @@
-  }
-  add_check("pcre");
+  d = remove_markup(val, &delenn);
-  /*
-   * Now we try to match the pattern. The relevant fields will
-   * automatically be filled in by this.
-   */
-strlen(d)
+delenn - 1
-      < 0) {
-    mush_free(re, "pcre");
@@ -520 +560 @@
-   */
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -552 +595 @@
-{
-  pcre *re;
+  const char *sptr;
+  size_t slen;
-  const char *errptr;
-  int erroffset;
@@ -573 +618 @@
-  }
-  add_check("pcre");
+  sptr = remove_markup(d, &slen);
-  /*
-   * Now we try to match the pattern. The relevant fields will
-   * automatically be filled in by this.
-   */
-d, strlen(d)
+sptr, slen - 1
-
-  mush_free(re, "pcre");
@@ -643 +689 @@
-  const char delims[] = "?*";
-  char *sp, *dp;
-
-
-
+
+
-  if (!cs) {
-    upcasestr(tbuf1);

1.8.2/trunk/src/wiz.c

@@ -1837 +1837 @@
-    if (!class || !*class || !restriction)
-      continue;
-
-((*class == '#') && *(class + 1
- && isdigit((unsigned char)
+ ((*class == '#') && *(class + 1)
+                   && isdigit((unsigned char
+                         
-      size_t offset = 0;
-      if (*class == '#')