Changeset 1284

Timestamp:

09/23/08 14:10:05 (2 months ago)

Author:

shawnw

Message:

GC: Sync with p6

Files:

• 1.8.3/branches/gc/CHANGES.182 (modified) (2 diffs)
• 1.8.3/branches/gc/CHANGES.183 (modified) (1 diff)
• 1.8.3/branches/gc/MANIFEST (modified) (1 diff)
• 1.8.3/branches/gc/Makefile.in (modified) (2 diffs)
• 1.8.3/branches/gc/Patchlevel (modified) (1 diff)
• 1.8.3/branches/gc/aclocal.m4 (modified) (1 diff)
• 1.8.3/branches/gc/config.h.in (modified) (3 diffs)
• 1.8.3/branches/gc/configure (modified) (11 diffs)
• 1.8.3/branches/gc/configure.in (modified) (4 diffs)
• 1.8.3/branches/gc/confmagic.h (modified) (2 diffs)
• 1.8.3/branches/gc/game/txt/hlp/penncmd.hlp (modified) (4 diffs)
• 1.8.3/branches/gc/game/txt/hlp/pennfunc.hlp (modified) (1 diff)
• 1.8.3/branches/gc/game/txt/hlp/penntop.hlp (modified) (1 diff)
• 1.8.3/branches/gc/game/txt/hlp/pennv182.hlp (modified) (2 diffs)
• 1.8.3/branches/gc/game/txt/hlp/pennv183.hlp (modified) (2 diffs)
• 1.8.3/branches/gc/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.3/branches/gc/hdrs/ansi.h (modified) (2 diffs)
• 1.8.3/branches/gc/hdrs/command.h (modified) (3 diffs)
• 1.8.3/branches/gc/hdrs/externs.h (modified) (2 diffs)
• 1.8.3/branches/gc/hdrs/mypcre.h (copied) (copied from 1.8.3/tags/p6/hdrs/mypcre.h)
• 1.8.3/branches/gc/hdrs/mysocket.h (modified) (1 diff)
• 1.8.3/branches/gc/hdrs/parse.h (modified) (1 diff)
• 1.8.3/branches/gc/hdrs/pcre.h (deleted)
• 1.8.3/branches/gc/hdrs/shs.h (modified) (1 diff)
• 1.8.3/branches/gc/hdrs/strtree.h (modified) (1 diff)
• 1.8.3/branches/gc/hdrs/version.h (modified) (1 diff)
• 1.8.3/branches/gc/hints/openbsd.txt (modified) (1 diff)
• 1.8.3/branches/gc/src/Makefile.in (modified) (72 diffs)
• 1.8.3/branches/gc/src/access.c (modified) (1 diff)
• 1.8.3/branches/gc/src/atr_tab.c (modified) (1 diff)
• 1.8.3/branches/gc/src/attrib.c (modified) (1 diff)
• 1.8.3/branches/gc/src/bsd.c (modified) (7 diffs)
• 1.8.3/branches/gc/src/cmdlocal.dst (modified) (3 diffs)
• 1.8.3/branches/gc/src/cmds.c (modified) (1 diff)
• 1.8.3/branches/gc/src/command.c (modified) (26 diffs)
• 1.8.3/branches/gc/src/conf.c (modified) (1 diff)
• 1.8.3/branches/gc/src/cque.c (modified) (1 diff)
• 1.8.3/branches/gc/src/create.c (modified) (1 diff)
• 1.8.3/branches/gc/src/extchat.c (modified) (5 diffs)
• 1.8.3/branches/gc/src/extmail.c (modified) (2 diffs)
• 1.8.3/branches/gc/src/flaglocal.dst (modified) (1 diff)
• 1.8.3/branches/gc/src/flags.c (modified) (1 diff)
• 1.8.3/branches/gc/src/funcrypt.c (modified) (1 diff)
• 1.8.3/branches/gc/src/function.c (modified) (1 diff)
• 1.8.3/branches/gc/src/fundb.c (modified) (3 diffs)
• 1.8.3/branches/gc/src/funlist.c (modified) (14 diffs)
• 1.8.3/branches/gc/src/funmath.c (modified) (5 diffs)
• 1.8.3/branches/gc/src/game.c (modified) (1 diff)
• 1.8.3/branches/gc/src/help.c (modified) (11 diffs)
• 1.8.3/branches/gc/src/htmltab.c (modified) (3 diffs)
• 1.8.3/branches/gc/src/ident.c (modified) (16 diffs)
• 1.8.3/branches/gc/src/info_master.c (modified) (2 diffs)
• 1.8.3/branches/gc/src/info_slave.c (modified) (21 diffs)
• 1.8.3/branches/gc/src/lmathtab.c (modified) (2 diffs)
• 1.8.3/branches/gc/src/lock.c (modified) (1 diff)
• 1.8.3/branches/gc/src/log.c (modified) (2 diffs)
• 1.8.3/branches/gc/src/look.c (modified) (9 diffs)
• 1.8.3/branches/gc/src/markup.c (modified) (20 diffs)
• 1.8.3/branches/gc/src/move.c (modified) (3 diffs)
• 1.8.3/branches/gc/src/myrlimit.c (modified) (2 diffs)
• 1.8.3/branches/gc/src/mysocket.c (modified) (13 diffs)
• 1.8.3/branches/gc/src/notify.c (modified) (2 diffs)
• 1.8.3/branches/gc/src/parse.c (modified) (3 diffs)
• 1.8.3/branches/gc/src/pcre.c (modified) (3 diffs)
• 1.8.3/branches/gc/src/set.c (modified) (3 diffs)
• 1.8.3/branches/gc/src/shs.c (modified) (5 diffs)
• 1.8.3/branches/gc/src/speech.c (modified) (5 diffs)
• 1.8.3/branches/gc/src/ssl_slave.c (modified) (13 diffs)
• 1.8.3/branches/gc/src/strtree.c (modified) (2 diffs)
• 1.8.3/branches/gc/src/strutil.c (modified) (2 diffs)
• 1.8.3/branches/gc/src/timer.c (modified) (2 diffs)
• 1.8.3/branches/gc/src/wait.c (modified) (5 diffs)
• 1.8.3/branches/gc/src/wild.c (modified) (7 diffs)
• 1.8.3/branches/gc/src/wiz.c (modified) (8 diffs)
• 1.8.3/branches/gc/win32/cmds.h (modified) (1 diff)
• 1.8.3/branches/gc/win32/confmagic.h (modified) (1 diff)
• 1.8.3/branches/gc/win32/funs.h (modified) (1 diff)

1.8.3/branches/gc/CHANGES.182

@@ -14 +14 @@
-==========================================================================
-
+Version 1.8.2 patchlevel 8                     Jan 01, 2008
+
+Minor changes:
+ * 'make versions' now provides some feedback.
+
+Fixes:
+ * width() and height() do not return 0 when set to invalid input.
+   By Talvo.
+ * Array underflow bug found by running under Valgrind.
+ * Crash bug when too many objects are nested. Reported by Paige, fixed
+   by Javelin and Intervis.
+
-Version 1.8.2 patchlevel 7                     October 6, 2007
-
@@ -26 +38 @@
-  * The open database file wasn't getting closed on a failed save.
-  * Crash bug in sortkey(). Fix by Nathan Baum.
+  * Crash bug in pathological container cases reported by Paige@M*U*S*H
+    fixed by Javelin.
-  * 'help @desc' brings up @describe instead of @descformat.
-    Suggested by Nymeria.

1.8.3/branches/gc/CHANGES.183

@@ -14 +14 @@
-
-==========================================================================
+
+Version 1.8.3 patchlevel 6                      Jan 01, 2008
+
+Major changes:
+ * If configure finds a copy of the pcre library installed, that will
+   be used instead of the (old) version bundled with Penn. use
+   --with-pcre=/path/to/it if it's not in the usual places, or
+   --with-pcre=no to force use of the bundled version.
+
+Minor changes:
+ * @sitelock when there are no rules will now say that instead of
+   having no output. By Talvo.
+ * Log files use locking to prevent the small chance of more than one
+   process writing to the same error log at the same time.
+ * info_slave's logging is more clear as to its source.
+ * Several places that used the select() system call now favor poll()
+   and/or socket timeouts instead. (The main event loop still uses
+   select() for now.)
+ * A wildcard help topic search (help foo*) that only matches one
+   entry will display that entry. Suggested by Cheetah.
+ * New switches for commands no longer have to be added to the
+   SWITCHES file; the internal list of switches is now built based on
+   what switches are given in the command table and cmdlocal.c
+   additions. Suggested by Talek. 
+
+
+Flags and powers:
+ * The announce power now also grants the ability to change the motd.
+   Suggested by Yuriko.
+ * New hook power grants rights to use @hook. Suggested by Paige.
+ * Windows compile fixes by Intrevis.
+
+Commands:
+ * @motd gives better feedback when clearing a message.
+ * The @tport/@otport/@atport/etc. attributes that get evalulated on a
+   @teleport now get the dbref of the object doing the teleport in %0
+   and the teleported object's old location in %1. Suggested by Daniel
+   Cheng.
+
+Functions:
+ * root() uses an improved algorithm to give a more precise
+   result.
+ * log(N,2) uses the C log2() function if available.
+ * log(N,e) takes the natural logarithm of N, like ln().
+ * lports() now takes an optional viewer argument, a la lwho(). By
+   Talvo.
+
+Fixes:
+ * Typo in info_slave preventing simultaneous hostname lookups fixed.
+ * Compiliation fix with some compilers. Reported by Kimiko.
+ * ident lookups of new connections was broken for several
+   patchlevels.  Works again. Sometimes.
+ * Cleaned up some warnings generated by gcc 4.2
+ * Fixed some minor bugs detected by running under valgrind.
+ * OpenBSD configuration fixes.
-
-Version 1.8.3 patchlevel 5                      October 6, 2007

1.8.3/branches/gc/MANIFEST

@@ -111 +111 @@
-hdrs/oldflags.h
-hdrs/parse.h
-
+my
-hdrs/privtab.h
-hdrs/ptab.h

1.8.3/branches/gc/Makefile.in

@@ -4 +4 @@
-
-VERSION=1.8.3
-5
+6
-
-#
@@ -21 +21 @@
-SQL_LDFLAGS=@MYSQL_LDFLAGS@ @POSTGRESQL_LDFLAGS@ @SQLITE3_LDFLAGS@
-
-
--lgc
-
+ @PCRE_CFLAGS@
+
+ @PCRE_LIBS@ -lgc -lpthread
-INSTALL=@INSTALL@
-INSTALLDIR=$installdir

1.8.3/branches/gc/Patchlevel

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

1.8.3/branches/gc/aclocal.m4

@@ -882 +882 @@
- fi
-])
+##### http://autoconf-archive.cryp.to/ax_path_lib_pcre.html
+#
+# SYNOPSIS
+#
+#   AX_PATH_LIB_PCRE [(A/NA)]
+#
+# DESCRIPTION
+#
+#   check for pcre lib and set PCRE_LIBS and PCRE_CFLAGS accordingly.
+#
+#   also provide --with-pcre option that may point to the $prefix of
+#   the pcre installation - the macro will check $pcre/include and
+#   $pcre/lib to contain the necessary files.
+#
+#   the usual two ACTION-IF-FOUND / ACTION-IF-NOT-FOUND are supported
+#   and they can take advantage of the LIBS/CFLAGS additions.
+#
+# LAST MODIFICATION
+#
+#   2006-10-13
+#
+# COPYLEFT
+#
+#   Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de>
+#
+#   This program is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation; either version 2 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+#   02111-1307, USA.
+#
+#   As a special exception, the respective Autoconf Macro's copyright
+#   owner gives unlimited permission to copy, distribute and modify the
+#   configure scripts that are the output of Autoconf when processing
+#   the Macro. You need not follow the terms of the GNU General Public
+#   License when using or distributing such scripts, even though
+#   portions of the text of the Macro appear in them. The GNU General
+#   Public License (GPL) does govern all other use of the material that
+#   constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the
+#   Autoconf Macro released by the Autoconf Macro Archive. When you
+#   make and distribute a modified version of the Autoconf Macro, you
+#   may extend this special exception to the GPL to apply to your
+#   modified version as well.
+
+AC_DEFUN([AX_PATH_LIB_PCRE],[dnl
+AC_MSG_CHECKING([lib pcre])
+AC_ARG_WITH(pcre,
+[  --with-pcre[[=prefix]]    path to system pcre],,
+     with_pcre="yes")
+if test ".$with_pcre" = ".no" ; then
+  AC_MSG_RESULT([disabled])
+  m4_ifval($2,$2)
+else
+  AC_MSG_RESULT([(testing)])
+  AC_CHECK_LIB(pcre, pcre_study)
+  if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then
+     PCRE_LIBS="-lpcre"
+     AC_MSG_CHECKING([lib pcre])
+     AC_MSG_RESULT([$PCRE_LIBS])
+     m4_ifval($1,$1)
+  else
+     OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS -L$with_pcre/lib"
+     OLDCPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS -I$with_pcre/include"
+     OLDLIBS="$LIBS"
+     AC_CHECK_LIB(pcre, pcre_compile)
+     CPPFLAGS="$OLDCPPFLAGS"
+     LDFLAGS="$OLDLDFLAGS"
+     LIBS="$OLDLIBS"
+     if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then
+        AC_MSG_RESULT(.setting PCRE_LIBS -L$with_pcre/lib -lpcre)
+        PCRE_LIBS="-L$with_pcre/lib -lpcre"
+        test -d "$with_pcre/include" && PCRE_CFLAGS="-I$with_pcre/include"
+        AC_MSG_CHECKING([lib pcre])
+        AC_MSG_RESULT([$PCRE_LIBS])
+        m4_ifval($1,$1)
+     else
+        AC_MSG_CHECKING([lib pcre])
+        AC_MSG_RESULT([no, (WARNING)])
+        m4_ifval($2,$2)
+     fi
+  fi
+fi
+AC_SUBST([PCRE_LIBS])
+AC_SUBST([PCRE_CFLAGS])
+])

1.8.3/branches/gc/config.h.in

@@ -67 +67 @@
-#undef HAVE_SYS_UIO_H
-
+#undef HAVE_POLL_H
+
+#undef HAVE_SYS_EPOLL_H
+
+#undef HAVE_SYS_SELECT_H
+
-/* C99ish headers. The first two are really really nice to have. */
-
@@ -88 +94 @@
-#define HAS_OPENSSL
-#endif
+
+#undef HAVE_PCRE
-
-/* Types */
@@ -277 +285 @@
-#undef HAVE_GETPPID
-
+#undef HAVE_PSELECT
+
+#undef HAVE_POLL
+
+#undef HAVE_PPOLL
+
+#undef HAVE_POLLTS
+
-#undef HAVE_KQUEUE
+
+#undef HAVE_EPOLL_CTL
-
-#undef HAVE_VALLOC

1.8.3/branches/gc/configure

@@ -682 +682 @@
-EGREP
-HAVE_SSL
+PCRE_LIBS
+PCRE_CFLAGS
-MYSQL_CONFIG
-MYSQL_VERSION
@@ -1284 +1286 @@
-                          with the default search path)
-
+  --with-pcre[=prefix]    path to system pcre
-  --with-mysql=[ARG]      use MySQL client library [default=yes], optionally
-                          specify path to mysql_config
@@ -7303 +7306 @@
-
-
+
+
+for ac_header in poll.h sys/epoll.h sys/select.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+           { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $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.  */
+$ac_includes_default
+#include <$ac_header>
+_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); } && {
+     test -z "$ac_c_werror_flag" ||
+     test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $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 <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+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_cpp conftest.$ac_ext") 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); } >/dev/null && {
+     test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+     test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+           { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
-### C language support
-# Only need to check C99 and GNU extensions
@@ -11591 +11735 @@
-
-if test "$HAVE_SSL" = "yes"; then
-   
+   
-#define HAVE_SSL 1
+_ACEOF
+
+fi
+
+# system libpcre
+{ echo "$as_me:$LINENO: checking lib pcre" >&5
+echo $ECHO_N "checking lib pcre... $ECHO_C" >&6; }
+
+# Check whether --with-pcre was given.
+if test "${with_pcre+set}" = set; then
+  withval=$with_pcre;
+else
+  with_pcre="yes"
+fi
+
+if test ".$with_pcre" = ".no" ; then
+  { echo "$as_me:$LINENO: result: disabled" >&5
+echo "${ECHO_T}disabled" >&6; }
+
+else
+  { echo "$as_me:$LINENO: result: (testing)" >&5
+echo "${ECHO_T}(testing)" >&6; }
+
+{ echo "$as_me:$LINENO: checking for pcre_study in -lpcre" >&5
+echo $ECHO_N "checking for pcre_study in -lpcre... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pcre_pcre_study+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcre_study ();
+int
+main ()
+{
+return pcre_study ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+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_link") 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); } && {
+     test -z "$ac_c_werror_flag" ||
+     test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_pcre_pcre_study=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_cv_lib_pcre_pcre_study=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_study" >&5
+echo "${ECHO_T}$ac_cv_lib_pcre_pcre_study" >&6; }
+if test $ac_cv_lib_pcre_pcre_study = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPCRE 1
+_ACEOF
+
+  LIBS="-lpcre $LIBS"
+
+fi
+
+  if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then
+     PCRE_LIBS="-lpcre"
+     { echo "$as_me:$LINENO: checking lib pcre" >&5
+echo $ECHO_N "checking lib pcre... $ECHO_C" >&6; }
+     { echo "$as_me:$LINENO: result: $PCRE_LIBS" >&5
+echo "${ECHO_T}$PCRE_LIBS" >&6; }
+
+  else
+     OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS -L$with_pcre/lib"
+     OLDCPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS -I$with_pcre/include"
+     OLDLIBS="$LIBS"
+
+{ echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5
+echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpcre  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pcre_compile ();
+int
+main ()
+{
+return pcre_compile ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+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_link") 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); } && {
+     test -z "$ac_c_werror_flag" ||
+     test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_pcre_pcre_compile=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_cv_lib_pcre_pcre_compile=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_compile" >&5
+echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6; }
+if test $ac_cv_lib_pcre_pcre_compile = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPCRE 1
+_ACEOF
+
+  LIBS="-lpcre $LIBS"
+
+fi
+
+     CPPFLAGS="$OLDCPPFLAGS"
+     LDFLAGS="$OLDLDFLAGS"
+     LIBS="$OLDLIBS"
+     if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then
+        { echo "$as_me:$LINENO: result: .setting PCRE_LIBS -L$with_pcre/lib -lpcre" >&5
+echo "${ECHO_T}.setting PCRE_LIBS -L$with_pcre/lib -lpcre" >&6; }
+        PCRE_LIBS="-L$with_pcre/lib -lpcre"
+        test -d "$with_pcre/include" && PCRE_CFLAGS="-I$with_pcre/include"
+        { echo "$as_me:$LINENO: checking lib pcre" >&5
+echo $ECHO_N "checking lib pcre... $ECHO_C" >&6; }
+        { echo "$as_me:$LINENO: result: $PCRE_LIBS" >&5
+echo "${ECHO_T}$PCRE_LIBS" >&6; }
+
+     else
+        { echo "$as_me:$LINENO: checking lib pcre" >&5
+echo $ECHO_N "checking lib pcre... $ECHO_C" >&6; }
+        { echo "$as_me:$LINENO: result: no, (WARNING)" >&5
+echo "${ECHO_T}no, (WARNING)" >&6; }
+
+     fi
+  fi
+fi
+
+
+
+if test "no$PCRE_LIBS" != "no"; then
+   cat >>confdefs.h <<\_ACEOF
+#define HAVE_PCRE 1
-_ACEOF
-
@@ -12319 +12666 @@
-
-_ACEOF
-
-compile
-
-
-
-
-
-compile
+ conftest$ac_exeext
+link
+
+
+
+
+
+link
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
@@ -12335 +12682 @@
-     test -z "$ac_c_werror_flag" ||
-     test ! -s conftest.err
-
+
+
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
@@ -12350 +12698 @@
-fi
-
-
+
+
-
-{ echo "$as_me:$LINENO: checking for gai_strerror" >&5
@@ -14178 +14527 @@
-
-
-
-
+
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14273 +14621 @@
-
-
-
+
+
+
+
+
+
+
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -16559 +16913 @@
-EGREP!$EGREP$ac_delim
-HAVE_SSL!$HAVE_SSL$ac_delim
+PCRE_LIBS!$PCRE_LIBS$ac_delim
+PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
-MYSQL_CONFIG!$MYSQL_CONFIG$ac_delim
-MYSQL_VERSION!$MYSQL_VERSION$ac_delim
@@ -16574 +16930 @@
-_ACEOF
-
-1
+3
-    break
-  elif $ac_last_try; then

1.8.3/branches/gc/configure.in

@@ -106 +106 @@
-AC_CHECK_HEADER(sys/types.h, [AC_DEFINE(I_SYS_TYPES)])
-AC_CHECK_HEADERS([sys/un.h ieeefp.h sys/resource.h sys/event.h sys/uio.h])
-
+
-### C language support
-# Only need to check C99 and GNU extensions
@@ -149 +149 @@
-CHECK_SSL
-if test "$HAVE_SSL" = "yes"; then
-
+
+
+
+
+
+
+
-fi
-
@@ -163 +169 @@
-AC_CHECK_FUNCS([fpsetmask fpsetround])
-AC_MSG_CHECKING([for isnormal])
-COMPILE
+LINK
-#include <math.h>
-int main(void) {
@@ -191 +197 @@
-fi
-AC_CHECK_FUNCS([cbrt log2 getuid geteuid seteuid getpriority setpriority])
-kqueue 
-
+
+ pselect poll ppoll pollts kqueue epoll_ctl
-
-AC_FUNC_SNPRINTF

1.8.3/branches/gc/confmagic.h

@@ -13 +13 @@
-#define _confmagic_h_
-
-
+
+
+
- * (which isn't exportable from the U.S.), then don't encrypt
- */
@@ -55 +57 @@
-#endif
-
+#if defined(HAVE_POLLTS) && !defined(HAVE_PPOLL)
+/* Linux's ppoll() is identical to NetBSD's pollts() in all but name. */
+#define ppoll pollts
+#define HAVE_PPOLL
-#endif
+
+#endif

1.8.3/branches/gc/game/txt/hlp/penncmd.hlp

@@ -356 +356 @@
-  in its new location.
-
-
+
+
+
+
-& @atrchown
-  @atrchown <object>/<attribute> = <new_owner>.
@@ -2564 +2567 @@
-  is teleported to. If you want to set a message that will be shown
-  to the room that the object is teleported OUT of, use @oxtport.
+
+  %0 is the object causing the teleport, and %1 is the old location
+  of the teleported object.
-
-  If the =<message> part is omitted, the message will be reset.
@@ -3304 +3310 @@
-  @teleport[/silent][/inside] [<object>=] <room>. 
-
- not
-supply a thing, the object is assumed to be yourself. The destination
-must be either JUMP_OK or controlled by you, and you must either
-control <object> or <object>'s current location. Also, the destination
-if a room, cannot be teleport-locked against <object>. Mortals canno
-teleport HEAVY objects. If the target room has a drop-to, <object>
-will go to the drop-to room instead. 
+
+not supply a thing, the object is assumed to be yourself. The
+destination must be either JUMP_OK or controlled by you, and you
+must either control <object> or <object>'s current location. Also
+the destination, if a room, cannot be teleport-locked agains
+<object>. Mortals cannot teleport HEAVY objects. If the target room
+has a drop-to, <object> will go to the drop-to room instead.
-
-  Privileged players who teleport a player to another player send them
-
-in 
+ in
+
-
-  Teleportation from a room can be stopped by setting the NO_TEL flag.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-See also: JUMP_OK, NO_TEL, @oxtport, @tport, @otport, @atport, @lock
@@ -3331 +3340 @@
-
-  Sets the <message> shown to <object> when <object> is teleported.
+
+  %0 is the object causing the teleport, and %1 is the old location
+  of the teleported object.
+
+See also: @otport, @atport, @oxtport
-& @trigger
-  @trigger <object>/<attribute> [=<value 0>,<val. 1>,...,<val 9>]

1.8.3/branches/gc/game/txt/hlp/pennfunc.hlp

@@ -2274 +2274 @@
-  log(<number>[, <base>])
- 
-
+
+
+
+
+
-& LPARENT()
-  lparent(<object>)

1.8.3/branches/gc/game/txt/hlp/penntop.hlp

@@ -1050 +1050 @@
-  halt                  Can @halt others' objects and do @allhalt.
-  hide                  Can hide on the WHO list.
+  hook                  Can use the @hook command.
-  idle                  No inactivity timeout.
-  link_anywhere         Can @link an exit to anyplace.

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

@@ +1 @@
+