Changeset 817

Timestamp:

05/05/07 23:46:54 (2 years ago)

Author:

shawnw

Message:

One last forgotten configure check, bumped patchlevel, ran make indent, versions.

Files:

• 1.8.3/branches/devel/CHANGES.182 (modified) (1 diff)
• 1.8.3/branches/devel/CHANGES.183 (modified) (1 diff)
• 1.8.3/branches/devel/Patchlevel (modified) (1 diff)
• 1.8.3/branches/devel/config.h.in (modified) (1 diff)
• 1.8.3/branches/devel/configure (modified) (3 diffs)
• 1.8.3/branches/devel/configure.in (modified) (2 diffs)
• 1.8.3/branches/devel/game/txt/hlp/pennv182.hlp (modified) (1 diff)
• 1.8.3/branches/devel/game/txt/hlp/pennv183.hlp (modified) (2 diffs)
• 1.8.3/branches/devel/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.3/branches/devel/hdrs/attrib.h (modified) (4 diffs)
• 1.8.3/branches/devel/hdrs/case.h (modified) (1 diff)
• 1.8.3/branches/devel/src/Makefile.in (modified) (1 diff)
• 1.8.3/branches/devel/src/attrib.c (modified) (12 diffs)
• 1.8.3/branches/devel/src/chunk.c (modified) (1 diff)
• 1.8.3/branches/devel/src/csrimalloc.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/db.c (modified) (1 diff)
• 1.8.3/branches/devel/src/gmalloc.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/move.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/set.c (modified) (1 diff)
• 1.8.3/branches/devel/src/wiz.c (modified) (2 diffs)

1.8.3/branches/devel/CHANGES.182

@@ -15 +15 @@
-==========================================================================
-
-?
+May 
-
-Minor changes:

1.8.3/branches/devel/CHANGES.183

@@ -15 +15 @@
-==========================================================================
-
-??   
+May
-
-Major changes:

1.8.3/branches/devel/Patchlevel

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

1.8.3/branches/devel/config.h.in

@@ -197 +197 @@
-
-#undef SENDMAIL
+
+#undef HAVE_SAFE_TOUPPER
-
-/* Optional language features */

1.8.3/branches/devel/configure

@@ -7985 +7985 @@
-
-
+  { echo "$as_me:$LINENO: checking for uint8_t" >&5
+echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6; }
+if test "${ac_cv_c_uint8_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_c_uint8_t=no
+     for ac_type in 'uint8_t' 'unsigned int' 'unsigned long int' \
+     'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(($ac_type) -1 >> (8 - 1) == 1)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+     { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+     { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  case $ac_type in
+  uint8_t) ac_cv_c_uint8_t=yes ;;
+  *) ac_cv_c_uint8_t=$ac_type ;;
+esac
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       test "$ac_cv_c_uint8_t" != no && break
+     done
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_uint8_t" >&5
+echo "${ECHO_T}$ac_cv_c_uint8_t" >&6; }
+  case $ac_cv_c_uint8_t in #(
+  no|yes) ;; #(
+  *)
+
+cat >>confdefs.h <<\_ACEOF
+#define _UINT8_T 1
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint8_t $ac_cv_c_uint8_t
+_ACEOF
+;;
+  esac
+
+
-  { echo "$as_me:$LINENO: checking for uint16_t" >&5
-echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6; }
@@ -13240 +13333 @@
-
-
- and defines
+, defines and other misc. stuff
-
-{ echo "$as_me:$LINENO: checking whether h_errno is declared" >&5
@@ -13332 +13425 @@
-_ACEOF
-
+
+fi
+
+
+
+# Will toupper()ing an already uppercase character be a problem?
+{ echo "$as_me:$LINENO: checking if it is safe to toupper uppers" >&5
+echo $ECHO_N "checking if it is safe to toupper uppers... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+int
+main ()
+{
+
+if (toupper('A') == 'A')
+    return 0;
+else
+    return 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+     { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+     { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_safe_toupper=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_safe_toupper=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_safe_toupper" >&5
+echo "${ECHO_T}$ac_safe_toupper" >&6; }
+if test "x$ac_safe_toupper" = xyes; then
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_SAFE_TOUPPER 1
+_ACEOF
-
-fi

1.8.3/branches/devel/configure.in

@@ -175 +175 @@
-
-
- and defines
+, defines and other misc. stuff
-
-AC_CHECK_DECLS(h_errno, [AC_DEFINE(HAVE_H_ERRNO)],,[AC_INCLUDES_DEFAULT
@@ -183 +183 @@
-])
-
+# Will toupper()ing an already uppercase character be a problem?
+AC_MSG_CHECKING(if it is safe to toupper uppers)
+AC_TRY_COMPILE(
+[#include <ctype.h>],
+[
+if (toupper('A') == 'A')
+    return 0;
+else
+    return 1;
+], ac_safe_toupper=yes, ac_safe_toupper=no)
+AC_MSG_RESULT([$ac_safe_toupper])
+if test "x$ac_safe_toupper" = xyes; then
+    AC_DEFINE(HAVE_SAFE_TOUPPER)
+fi
+
+
+
-# Which flavor of child killing to use? Prefer SIGCHLD.
-

1.8.3/branches/devel/game/txt/hlp/pennv182.hlp

@@ +1 @@
+& 1.8.2p4
+Version 1.8.2 patchlevel 4                      May ??, 2007
+
+Minor changes:
+  * speak() uses accented names. Sketch.
+  * config() no longer lists options that can't be set
+    with @config/set. Suggested by Trispis. [SW]
+  * 'page foo\=bar' pages the last person you paged. Fix by Nathan
+    Baum.
+  * Receipt of a SIGUSR1 (Causing a shutdown/reboot) is explictly
+    logged. Suggested by Interloper. [SW]
+  * @wipe reports the number of attributes deleted. [183]
+
+Fixes:
+  * You can no longer save objects slated to be destroyed
+    by using @set foo=!GOING (The help file for GOING now tells
+    the truth) Reported by Cooee. [SW] 
+  * Useless variable in real_unparse() removed. Reported by
+    Taladan. [SW]
+  * 'make portmsg' works, and portmsg.c rewritten to current
+    Penn standards. [SW]
+  * case() would replace #$ in the default argument, contrary
+    to the help file. Reported by Talvo. [SW]
+  * Memory leak in grep(). [SW]
+  * Quotes can be around the player name on the login screen
+    always, instead of just when player_name_spaces was
+    on. Suggested by Dan Widdis. [SW]
+  * '{think foo} bar' exhibited odd behavior. [GM]
+  * 'make test' wouldn't work right unless '.' was in you path.
+     Fix by Nathan Baum.
+  * stdin and stdout weren't getting closed, potentially causing
+    problems when trying to log out of a shell after starting
+    a mush. Reported by K Moon. [SW]
+  * NetBSD compile and general warning fixes. [SW]
+  * Favor difftime(3) over subtraction of time_t variables. [SW]
+  * Clarification of attribute trees in HELP @WIPE. Suggested by
+    Talvo.
+  * Loading a db with empty attributes used as the roots of
+    attribute trees didn't work if empty_attrs is set to no.
+    Reported by Kevin. [SW]
+  * Bugs in wiping attribute trees with attributes the wiper
+    doesn't have permission to delete fixed. [SW]
+ 
-& 1.8.2p3
-Version 1.8.2 patchlevel 3                      March 11, 2007

1.8.3/branches/devel/game/txt/hlp/pennv183.hlp

@@ -1 @@
-1
+2
-& 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 2                      May ??, 2007
+
+Major changes:
+  * configuration is now done by autoconf. ./Configure is
+    now ./configure and its options have changed. See
+    INSTALL and ./configure --help [SW]
+  * Support for the postgresql SQL server. Javelin.
+  * Support for sqlite3 SQL databases. [SW]
+
+Minor changes:
+  * You can no longer run a mush as root. [SW]
+  * @cemit/noisy. Suggested by Kimiko. [SW]
+  * @function sorts the list of user-defined functions
+    by object and then name. Suggested by Trinsec. [SW]
+  * Better logging of the register login screen command
+    for systems without a sendmail program. [SW]
+  * Assorted refactoring of source code. [SW]
+  
+Functions:
+  * isobjid(). By Balerion.
+  * player() returns the dbref of the player connected to a given
+    port.  By  Nathan Baum.
+  * root(X,3) uses the C cbrt() function if available. [SW]
+  * New formats for align() that allow flowing text. Javelin.
+  * isdbref() understands objids. By Balerion.
+
+Fixes:
+  * regmatch() broken with %q-registers. Javelin. 
+  * Better checking of dbref config options to make sure they're
+    valid objects. Suggested by Talvo. [SW]
+  * Fixed assorted cases of accidently modifying const objects.
+    Thanks to Jake. [SW]
+  * Fixed a crash bug in strmatch(). [GM]
+  * wrap() of Pueblo tags didn't work very well. Fixed by
+    Sketch.
+  * @wipe's count is accurate when attribute trees are being
+    deleted. Reported by Talvo.
+ 
+& 1.8.3p1
-Version 1.8.3 patchlevel 1                      March 11, 2007
-

1.8.3/branches/devel/game/txt/hlp/pennvOLD.hlp

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

@@ -42 +42 @@
-  AE_OKAY = 0, /**< Success */
-  AE_ERROR = -1, /**< general failure */
- 
+    
-  AE_BADNAME = -3, /**< invalid name */
-  AE_TOOMANY = -4, /**< too many attribs */
- 
+    
-  AE_NOTFOUND = -6 /** No such attribute */
-} atr_err;
@@ -56 +56 @@
-            uint8_t derefs);
-extern atr_err atr_add(dbref thing, char const *RESTRICT atr,
-
+    
-extern atr_err atr_clr(dbref thing, char const *atr, dbref player);
-extern atr_err wipe_atr(dbref thing, char const *atr, dbref player);
@@ -110 +110 @@
-#define AF_CASE         0x800   /**< Match $/^ patterns case-sensitive */
-#define AF_SAFE         0x1000  /**< This attribute may not be modified */
-  
-  
-  
+ 
+ 
+ 
-#define AF_STATIC       0x10000 /**< OBSOLETE! Leave here but don't use */
-#define AF_COMMAND      0x20000 /**< INTERNAL: value starts with $ */
@@ -129 +129 @@
-#define AF_MHEAR        0x20000000  /**< ^-listens can be triggered by %! */
-#define AF_AHEAR        0x40000000  /**< ^-listens can be triggered by anyone */
-      
+ 
-
-#define AF_MAXVALUE          0x100000000     /**< Largest attribute flag value. */
-
-
+
+
-
-#define AL_ATTR(alist)          (alist)

1.8.3/branches/devel/hdrs/case.h

@@ -4 +4 @@
-#include "config.h"
-
-S
+VE
-#define DOWNCASE(x)     tolower((unsigned char)x)
-#define UPCASE(x)       toupper((unsigned char)x)

1.8.3/branches/devel/src/Makefile.in

@@ -157 +157 @@
-    @INDENT@ -npro -kr -ci2 -ss -psl -ip4 -i2 -cs -l80 -lc75 \
-    -T accent_info -T acsflag -T aig_func -T ALIST -T ansi_string \
-
+atr_err -T 
-    -T boolexp_type -T BQUE -T branch_chain -T BUFFERQ \
-    -T build_ansi_codes -T bvm_opcode -T BYTE -T CDESC -T CHAN \

1.8.3/branches/devel/src/attrib.c

@@ -65 +65 @@
-static ATTR *alloc_atr(void);
-static ATTR *pop_free_list(void);
-
-
+ 
+ 
-static ATTR *find_atr_pos_in_list(ATTR ***pos, char const *name);
-static int can_create_attr(dbref player, dbref obj, char const *atr_name,
@@ -563 +563 @@
-    root->data = chunk_create(t, u_strlen(t), 0);
-    free(t);
-      
-
-
-
+
+
+
+
-  AL_FLAGS(ptr) = flags;
-  AL_FLAGS(ptr) &= ~AF_COMMAND & ~AF_LISTEN;
@@ -661 +661 @@
-      free(t);
-    }
- 
+
-    AL_FLAGS(root) |= AF_ROOT;
-
@@ -721 +721 @@
-
-  for (sub = atr_sub_branch(root);
-
-
+
-    if (AL_FLAGS(sub) & AF_ROOT) {
-      if (!atr_clear_children(player, thing, sub)) {
@@ -744 +743 @@
-    atr_free_one(sub);
-    AttrCount(thing)--;
-
+
-  }
-
@@ -778 +777 @@
-
-  if ((AL_FLAGS(ptr) & AF_ROOT) && !we_are_wiping)
-  
+
-
-  /* We only hit this if wiping. */
-  if (AL_FLAGS(ptr) & AF_ROOT)
-    can_clear = atr_clear_children(player, thing, ptr);
-
+
-  if (can_clear) {
-    char *p;
@@ -795 +794 @@
-    atr_free_one(ptr);
-    AttrCount(thing)--;
-
+
-    /* If this was the only leaf of a tree, clear the AF_ROOT flag from
-     * the parent. */
@@ -811 +810 @@
-    if (!atr_sub_branch(root))
-      AL_FLAGS(root) &= ~AF_ROOT;
-        
+
-    }
-
@@ -1724 +1723 @@
-  was_hearer = Hearer(thing);
-  was_listener = Listener(thing);
-
-
+
-    : atr_clr(thing, name, player);
-  switch (res) {
@@ -1735 +1733 @@
-    if (!s) {
-      notify_format(player,
-
+
+
-            name);
-      return 0;
-    } else {
-      notify_format(player,
-
-
+
+
+
-      return 0;
-    }
@@ -1983 +1983 @@
- * \return the pointer to an attribute, or NULL on error.
- */
-
+ 
-pop_free_list(void)
-{
@@ -2000 +2000 @@
- */
-static void
- 
+
-{
-  memset(a, 0, sizeof(*a));

1.8.3/branches/devel/src/chunk.c

@@ -957 +957 @@
-static void
-write_used_chunk(uint16_t region, uint16_t offset, uint16_t full_len,
-
-
+
-{
-  unsigned char *cptr = ChunkPointer(region, offset);

1.8.3/branches/devel/src/csrimalloc.c

@@ -970 +970 @@
-#ifdef CSRI_TRACE
-/* Tracing malloc definitions - helps find leaks */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-univptr_t
-  trace__ecalloc _((size_t nelem, size_t sz, const char *fname, int linenum));
-
-
-
-
+
+
+
+
+
+
+
+
+
-    void
-
+
+
-    void
-
+
+
-#else               /* CSRI_TRACE */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif              /* CSRI_TRACE */
-
@@ -1032 +1023 @@
-     int is_end_ptr, const char *filename, int linenumber));
-    void
- 
+
-    void
- 
+
-#ifdef CSRI_DEBUG
-    void
- 
+
-    int
- 
+
-#endif
-    void
- 
+
-    void
- 
+
-    void
- 
+
-    void
- 
+
-    void
- 
+
-#ifdef CSRI_PROFILESIZES
-    void
- 
+
-#endif
-    void
- 
+
-    void
- 
+
-
-#ifdef CSRI_TRACE

1.8.3/branches/devel/src/db.c

@@ -1382 +1382 @@
-      }
-
-
+ 
-    char buff[BUFFER_LEN + 1];  /* The name plus a NUL */
-    strncpy(buff, o->name, PLAYER_NAME_LIMIT);

1.8.3/branches/devel/src/gmalloc.c

@@ -378 +378 @@
-
-/* Search index in the info table.  */
-
-
+
-
-/* Limit of valid info table indices.  */
-
-
+
-
-/* Free lists for each fragment size.  */
@@ -390 +388 @@
-
-/* Instrumentation.  */
-
-
-
-
-
-
-
-
+
+
+
+
-
-/* Are you experienced?  */

1.8.3/branches/devel/src/move.c

@@ -1179 +1179 @@
-  strcpy(flwr, unparse_dbref(follower));
-  strcpy(tbuf1, atr_value(a));
-
-
+
-}
-
@@ -1196 +1195 @@
-  strcpy(ldr, unparse_dbref(leader));
-  strcpy(tbuf1, atr_value(a));
-
-
+
-}
-

1.8.3/branches/devel/src/set.c

@@ -1110 +1110 @@
-  case AE_TREE:
-    notify_format(player,
-
+
+
-          AL_NAME(atr));
-    /* Fall through */

1.8.3/branches/devel/src/wiz.c

@@ -204 +204 @@
-    limit = owned;
-
-
-
+
-
-  notify_format(player, T("Objects: %d   Limit: %d"), owned, limit);
@@ -270 +269 @@
-    (void) atr_add(who, "RQUOTA", "0", GOD, 0);
-      else
-
-
+
-    }
-  }