Changeset 463

Timestamp:

08/16/06 01:09:41 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p32 Archival

Files:

• 1.7.7/CHANGES.177 (modified) (2 diffs)
• 1.7.7/Configure (modified) (5 diffs)
• 1.7.7/INSTALL (modified) (1 diff)
• 1.7.7/MANIFEST (modified) (4 diffs)
• 1.7.7/Makefile.SH (modified) (5 diffs)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/README.SQL (added)
• 1.7.7/README.SSL (modified) (1 diff)
• 1.7.7/UPGRADING (modified) (1 diff)
• 1.7.7/config_h.SH (modified) (1 diff)
• 1.7.7/game/README (modified) (2 diffs)
• 1.7.7/game/mushcnf.dst (modified) (2 diffs)
• 1.7.7/game/restart (modified) (5 diffs)
• 1.7.7/game/txt/hlp/pennattr.hlp (modified) (3 diffs)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (8 diffs)
• 1.7.7/game/txt/hlp/pennconf.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennflag.hlp (modified) (3 diffs)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (4 diffs)
• 1.7.7/game/txt/hlp/penntop.hlp (modified) (4 diffs)
• 1.7.7/game/txt/hlp/pennv177.hlp (modified) (3 diffs)
• 1.7.7/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.7.7/hdrs/attrib.h (modified) (2 diffs)
• 1.7.7/hdrs/bufferq.h (added)
• 1.7.7/hdrs/command.h (modified) (1 diff)
• 1.7.7/hdrs/compile.h (added)
• 1.7.7/hdrs/conf.h (modified) (6 diffs)
• 1.7.7/hdrs/dbdefs.h (modified) (4 diffs)
• 1.7.7/hdrs/extchat.h (modified) (3 diffs)
• 1.7.7/hdrs/externs.h (modified) (8 diffs)
• 1.7.7/hdrs/flags.h (modified) (1 diff)
• 1.7.7/hdrs/game.h (modified) (1 diff)
• 1.7.7/hdrs/lock.h (modified) (1 diff)
• 1.7.7/hdrs/log.h (modified) (2 diffs)
• 1.7.7/hdrs/mushdb.h (modified) (2 diffs)
• 1.7.7/hdrs/mushtype.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/Makefile.SH (modified) (18 diffs)
• 1.7.7/src/attrib.c (modified) (29 diffs)
• 1.7.7/src/boolexp.c (modified) (6 diffs)
• 1.7.7/src/bsd.c (modified) (8 diffs)
• 1.7.7/src/bufferq.c (added)
• 1.7.7/src/chunk.c (modified) (7 diffs)
• 1.7.7/src/cmdlocal.dst (modified) (1 diff)
• 1.7.7/src/cmds.c (modified) (3 diffs)
• 1.7.7/src/command.c (modified) (5 diffs)
• 1.7.7/src/conf.c (modified) (4 diffs)
• 1.7.7/src/create.c (modified) (1 diff)
• 1.7.7/src/csrimalloc.c (modified) (1 diff)
• 1.7.7/src/db.c (modified) (1 diff)
• 1.7.7/src/extchat.c (modified) (15 diffs)
• 1.7.7/src/extmail.c (modified) (1 diff)
• 1.7.7/src/flaglocal.dst (modified) (1 diff)
• 1.7.7/src/flags.c (modified) (2 diffs)
• 1.7.7/src/function.c (modified) (3 diffs)
• 1.7.7/src/fundb.c (modified) (3 diffs)
• 1.7.7/src/funlocal.dst (modified) (1 diff)
• 1.7.7/src/funstr.c (modified) (3 diffs)
• 1.7.7/src/funtime.c (modified) (1 diff)
• 1.7.7/src/game.c (modified) (32 diffs)
• 1.7.7/src/help.c (modified) (1 diff)
• 1.7.7/src/ident.c (modified) (1 diff)
• 1.7.7/src/local.dst (modified) (1 diff)
• 1.7.7/src/lock.c (modified) (4 diffs)
• 1.7.7/src/log.c (modified) (4 diffs)
• 1.7.7/src/look.c (modified) (2 diffs)
• 1.7.7/src/malias.c (modified) (1 diff)
• 1.7.7/src/move.c (modified) (2 diffs)
• 1.7.7/src/mysocket.c (modified) (1 diff)
• 1.7.7/src/notify.c (modified) (3 diffs)
• 1.7.7/src/parse.c (modified) (2 diffs)
• 1.7.7/src/pcre.c (modified) (1 diff)
• 1.7.7/src/player.c (modified) (1 diff)
• 1.7.7/src/plyrlist.c (modified) (1 diff)
• 1.7.7/src/predicat.c (modified) (10 diffs)
• 1.7.7/src/ptab.c (modified) (1 diff)
• 1.7.7/src/rob.c (modified) (8 diffs)
• 1.7.7/src/set.c (modified) (1 diff)
• 1.7.7/src/sig.c (modified) (1 diff)
• 1.7.7/src/speech.c (modified) (2 diffs)
• 1.7.7/src/sql.c (added)
• 1.7.7/src/strtree.c (modified) (1 diff)
• 1.7.7/src/tables.c (modified) (2 diffs)
• 1.7.7/src/timer.c (modified) (2 diffs)
• 1.7.7/src/unparse.c (modified) (1 diff)
• 1.7.7/src/warnings.c (modified) (1 diff)
• 1.7.7/src/wiz.c (modified) (3 diffs)
• 1.7.7/test/testatree.pl (modified) (2 diffs)
• 1.7.7/utils/gentables.c (modified) (3 diffs)
• 1.7.7/win32/cmds.h (modified) (2 diffs)
• 1.7.7/win32/config.h (modified) (2 diffs)
• 1.7.7/win32/funs.h (modified) (1 diff)
• 1.7.7/win32/pennmush.dsp (modified) (6 diffs)

1.7.7/CHANGES.177

@@ -19 +19 @@
-==========================================================================
-
+Version 1.7.7 patchlevel 32                     May 26, 2004
+
+Major Changes:
+  * SQL support. PennMUSH can now operate as an SQL client and perform
+    queries against an SQL server. Currently only the MySQL server is
+    supported. This adds the @sql command, the sql() and sqlescape()
+    functions, and the Sql_Ok power. See README.SQL for some 
+    additional information.  Mostly based on patches by Hans Engelen.
+  * Creating a leaf attribute automatically creates associated branch
+    attributes if they are not already present. [TAP]
+  * When a $command matches on an object, but the object's use-lock or
+    command-lock prevents the command from being run, the object's
+    COMMAND_LOCK`FAILURE, COMMAND_LOCK`OFAILURE, and COMMAND_LOCK`AFAILURE
+    attributes will be triggered if the $command never successfully 
+    matched, rather than returning a Huh? to the player.
+  * Exits and rooms may now run $commands. Rooms are treated as being
+    located in themselves for purposes of location checks. Exits are
+    treated as being located in their source room. Suggested by [TAP].
+Commands:
+  * 'empty <object>' attempts to get each item in <object> and put
+    it alongside <object> (in <object>'s location).
+  * 'give <object> to <player>' syntax added.
+Minor Changes (user-visible):
+  * @COST attribute is now evaluated, so you can make costs depend
+    on who's paying, a selected item, etc. Suggested by Walker@M*U*S*H.
+    Also, the amount given is passed in as %0, so you can code
+    vendors that accept any amount.
+  * New OBJID^<objid> lock atom.
+  * The server now maintains a rolling log of activity (commands issued,
+    evaluations parsed, and locks evaluated), that is dumped to the log 
+    file on panic, or can be seen by God with @uptime. This aids 
+    debugging code that causes a "clean" panic rather than a crash. 
+    Suggested by Intrevis@M*U*S*H.
+  * When checking a use/command/listen-lock on an object with patterns
+    that get matched, we only check the lock once and cache the result,
+    to prevent multiple lock evaluations if multiple patterns match. [TAP]
+  * @chan/recall now shows nospoof tags for @cemit'd lines.
+    Suggested by Sholevi@M*U*S*H.
+  * SUSPECT flag can now be applied to any type of object.
+    Suggested by Oriens@Alexandria.
+Minor Changes (internals):
+  * fun_escape() and fun_secure() use the same list of special characters, 
+    rather than each having their own copy. [SW]
+  * Buffer queue code used by @chan/buffer and the activity log refactored
+    into src/bufferq.c and hdrs/bufferq.h.
+  * Added mush_panicf(), with printf()-style format and arguments. [SW]
+Fixes: 
+  * @scan correctly shows attributes on parents again. Report by
+    Wayne@PDX.
+  * @shutdown/panic and @shutdown/paranoid work again. [SW]
+  * A panic DB could be created before the database files were actually read,
+    causing problems on the next restart. [SW]
+  * Win32 and Debian installer portability fixes. [EEH]
+  * Code cleanup around errno. [SW]
+  * The locate() function now respects visibility and interactions.
+    Report by Jules@M*U*S*H.
+
+
-Version 1.7.7 patchlevel 31                     May 11, 2004
-
+Minor Changes:
+  * netmush is now started with only a single argument - the path to
+    the configuration file. The error log file (typically game/netmush.log)
+    is now configured in mush.cnf. Suggested by Vadiv@M*U*S*H.
+  * The restart script now bases its decision about whether the mush
+    is already running on the full path to the configuration file,
+    which means you can leave mush.cnf named mush.cnf without fear
+    of restart problems when multiple mushes are using the same
+    host. This also facilitates make update. Suggested by Vadiv@M*U*S*H.
+  * The GAMEDIR environment variable can be passed to 'make update'
+    to cause it to update *.cnf files in directories other than
+    game/ (using the template *.dst files in game/). 
+    E.g.: make GAMEDIR=/home/othermush/game update
+Commands:
+  * @nscemit. Suggested by Mystery8@ST:AW.
+Functions:
+  * nscemit(). Suggested by Mystery8@ST:AW.
-Flags:
-  * New HEAVY admin flag, prevents an object from being teleported
@@ -26 +101 @@
-    flag can now be teleported.
-Fixes:
+  * Help fixes by Anri@AkaneaMUSH and Intrevis@M*U*S*H.
-  * mix() now treats empty lists as empty, instead of containing a single
-    null element. Report by Luke@M*U*S*H.

1.7.7/Configure

@@ -21 +21 @@
-# $Id: Head.U 1.1 Thu, 20 Jul 2000 17:42:54 -0500 dunemush $
-#
-Sep 30 23:26:16 CDT 2002
+May 24 11:39:50 CDT 2004
-
-cat >/tmp/c1$$ <<EOF
@@ -417 +417 @@
-installdir=''
-libc=''
+d_mysql=''
+libmysqlclient=''
-glibpth=''
-libpth=''
@@ -4782 +4784 @@
-eval $inlibc
-
+: see if we should include -lmysqlclient
+echo " "
+
+d_mysql="$undef"
+
+if $test "x$no_mysql" = "x"; then
+
+  libmysqlclient="-lmysqlclient"
+
+  $cat > test_mysql.c <<EOM
+#include <stdio.h>
+#include <stdlib.h>
+#include <mysql/mysql.h>
+#include <mysql/errmsg.h>
+
+int main(int argc, char **argv) {
+   printf("Your mysql is version %s\n",mysql_get_client_info());
+   exit(0);
+}
+EOM
+
+  if $cc $ccflags $ldflags -o test_mysql test_mysql.c $libs $libmysqlclient >/dev/null 2>&1 ;
+  then
+      echo 'You have mysql...' >&4
+      version=`./test_mysql`
+      if $test $? -eq 0; then
+    echo "$version" >&4
+        d_mysql="$define"
+      else
+        echo "...but my test program didn't run correctly." >&4
+        libmysqlclient=''
+      fi
+  else
+      echo "You don't seem to have mysql." >&4
+      libmysqlclient=''
+  fi
+  $rm -f test_mysql* core
+
+else
+
+  echo "Skipping mysql tests." >&4
+  libmysqlclient=''
+
+fi
+
-: check for a new-style definitions
-echo " "
@@ -6930 +6977 @@
-d_memset='$d_memset'
-d_mymalloc='$d_mymalloc'
+d_mysql='$d_mysql'
-d_newstyle='$d_newstyle'
-d_oldsock='$d_oldsock'
@@ -7056 +7104 @@
-libc='$libc'
-libcrypto='$libcrypto'
+libmysqlclient='$libmysqlclient'
-libpth='$libpth'
-libs='$libs'

1.7.7/INSTALL

@@ -162 +162 @@
-game subdirectory for each MUSH (run it once per MUSH you plan to run).
-Files in these subdirectories will already be customized in many ways,
-
+ This is probably broken.
-
-7. Read game/README and follow those instructions. 
-
-   On cygwin systems, you will likely have to edit the game/restart
-   script and explicitly set GAMEDIR (to /usr/src/pennmush/game)
-
-A final thing you may want to think about is compiling announce.c or

1.7.7/MANIFEST

@@ -13 +13 @@
-hdrs/attrib.h
-hdrs/boolexp.h
+hdrs/bufferq.h
-hdrs/command.h
+hdrs/compile.h
-hdrs/chunk.h
-hdrs/htab.h
@@ -54 +56 @@
-src/boolexp.c
-src/bsd.c
+src/bufferq.c
-src/chunk.c
-src/cmds.c
@@ -110 +113 @@
-src/sig.c
-src/speech.c
+src/sql.c
-src/switchinc.c
-src/strdup.c
@@ -213 +217 @@
-README
-README.SSL
+README.SQL
-INSTALL
-UPGRADING

1.7.7/Makefile.SH

@@ -50 +50 @@
-CCFLAGS=$optimize -I.. -I../hdrs $ccflags $warnings
-LDFLAGS=$ldflags
-
+ $libmysqlclient
-INSTALL=$install
-INSTALLDIR=$installdir
@@ -90 +90 @@
-autogen: hdrs/cmds.h hdrs/funs.h hdrs/switches.h
-
-
+src/sql.c 
-    (cd utils; sh mkcmds.sh commands)
-
@@ -99 +99 @@
-    (cd utils; sh mkcmds.sh switches)
-
-
+src/sql.c 
-    (cd utils; sh mkcmds.sh functions)
-
@@ -165 +165 @@
-    -@$perl utils/customize.pl
-
+# The default place to find the runtime files is in this directory,
+# but it can be overridden with env variables so people can use
+# other game directories.
+GAMEDIR=game
+
-update-conf: game/mushcnf.dst game/aliascnf.dst game/restrictcnf.dst game/namescnf.dst
-    -@$touch game/mushcnf.dst
-game
+\$(GAMEDIR)
-    -@$touch game/aliascnf.dst
-game
+\$(GAMEDIR)
-    -@$touch game/restrictcnf.dst
-game
-game/names.cnf ]; then \$(CP) game/namescnf.dst game
-
-game
+\$(GAMEDIR)
+\$(GAMEDIR)/names.cnf ]; then \$(CP) game/namescnf.dst \$(GAMEDIR)
+
+\$(GAMEDIR)
-    -@$touch game/aliascnf.dst
-game
-
-game
+\$(GAMEDIR)
+
+\$(GAMEDIR)
-    -@$touch game/restrictcnf.dst
-game
-
-game
+\$(GAMEDIR)
+
+\$(GAMEDIR)
-    if [ ! -f game/names.cnf ]; then \
-game
+\$(GAMEDIR)
-    fi
-
-game
+\$(GAMEDIR)
-    -@$touch game/mushcnf.dst
-game
+\$(GAMEDIR)
-
-update: update-hdr update-conf
@@ -291 +296 @@
-    (cd game/txt; make clean compose.sh)
-    $(INSTALLDIR) $(DEB_INSTALL)
+    $(INSTALLDIR) $(DEB_BIN)
-    $(CP) -R game/* $(DEB_INSTALL)
-    -rm -f $(DEB_INSTALL)/netmush $(DEB_INSTALL)/info_slave

1.7.7/Patchlevel

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

1.7.7/README.SSL

@@ -1 +1 @@
-                            Use SSL with PennMUSH
-e
+
-
-

1.7.7/UPGRADING

@@ -77 +77 @@
-If you've modified the restart script, you'll have to decide if
-your modified script is still appropriate, or modify the distributed
-
+ The latter is encouraged.
-
-You can also copy your old game/access.cnf, game/sitelock.cnf, and

1.7.7/config_h.SH

@@ -834 +834 @@
-#$i_stdarg I_STDARG     /**/
-
+/* HAS_MYSQL:
+ *     Defined if mysql client libraries are available.
+ */
+#$d_mysql HAS_MYSQL /**/
+
-/* HAS_OPENSSL:
- *     Defined if openssl 0.9.6+ is available.

1.7.7/game/README

@@ -12 +12 @@
-
-WIN32:
-DO NOT rename mush.cnf
-Also, ignore the restart script.  In the configuration file, turn off
-disk database compression; it is not supported.  
-Then go to the game directory and run PennMUSH.exe.  
+ignore the restart script
+In the configuration file, turn off disk database compression; it is
+not supported.  Then go to the game directory and run PennMUSH.exe.
+
-
-UNIX:
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-You should now be ready to start the game.  This distribution can
@@ -40 +39 @@
-
-The logfiles in the "log" directory generally contain useful
-main
-the restart script) every time, since errors and other importan
-messages get 
+error
+mush.cnf) every time, since errors and other important messages ge
+
-
-============================================================================

1.7.7/game/mushcnf.dst

@@ -475 +475 @@
-###
-
+# Filename to log important messages (startups, errors, shutdowns)
+error_log  log/netmush.log
+
-# Filename to log connections to
-connect_log log/connect.log
@@ -538 +541 @@
-
-###
+### SQL connectivity
+###
+
+# What SQL server platform should we use? Options include:
+# mysql, disabled (the default)
+sql_platform disabled
+
+# What's the SQL hostname? Use '127.0.0.1' for a TCP connection
+# to the local host, and 'localhost' for a domain socket connection.
+sql_host 127.0.0.1
+
+# What's the SQL database? You have to set this to a database that
+# you create.
+sql_database mush
+
+# What username to access the database?
+sql_username mush
+
+# What password for that user? Change this!
+sql_password mush
+
+###
-### Options affecting commands and functions
-### (See also restrict_command to restrict command use)

1.7.7/game/restart

@@ -1 +1 @@
-#!/bin/sh
-#
+# usage: restart
+#
+# REQUIRED: You must set this to the path to your game directory.
+# E.g.: /home/mush/game
+GAMEDIR=
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-# Uncomment the line below to attempt to allow crashes to produce
@@ -20 +13 @@
-# to debug them.
-#ulimit -c unlimited
-
-if [ ! -d $GAMEDIR ]; then
-  echo "GAMEDIR doesn't appear to be a directory. It's: $GAMEDIR"
-  exit 1
-fi
-
-cd $GAMEDIR
-echo Running from `pwd`
-
-if [ ! -f $CONF_FILE ]; then
-  echo "CONF_FILE doesn't exist. It's: $CONF_FILE"
-  echo "Create $CONF_FILE from $GAMEDIR/mushcnf.dst"
-  exit 1
-fi
-
-# Internationalization stuff
@@ -50 +29 @@
-#TZ=:EST5EDT
-#export TZ
+
+
+# The config file. Best to keep this as is. If you must change
+# the name, make it a link to mush.cnf.
+CONF_FILE=mush.cnf
+
+#######################################################################
+
+if [ -z $GAMEDIR ]; then
+  echo "You must set GAMEDIR in the restart script."
+  exit 1
+fi
+
+if [ ! -d $GAMEDIR ]; then
+  echo "GAMEDIR doesn't appear to be a directory. It's: $GAMEDIR"
+  exit 1
+fi
+
+cd $GAMEDIR
+echo Running from `pwd`
+
+if [ ! -f $CONF_FILE ]; then
+  echo "CONF_FILE doesn't exist. It's: $CONF_FILE"
+  echo "Create $CONF_FILE from $GAMEDIR/mushcnf.dst"
+  exit 1
+fi
-
-# If netmush isn't here, they probably didn't make install
@@ -81 +86 @@
-# Prevent double-starting things. You may need to provide a pathname for
-#  some of the commands. System V flavors need "ps -f" instead of "ps uwx".
-x | grep " 
+wx | grep " $GAMEDIR/
-
-
-if [ $mush -gt 0 ]; then
-
+GAMEDIR/$
-  exit 0
-fi
@@ -135 +140 @@
-export DATEMSK
-
-CONF_FILE $LOG
+GAMEDIR/$CONF_FILE

1.7.7/game/txt/hlp/pennattr.hlp

@@ -19 +19 @@
-A branch attribute is an attribute that has other branches or leaves
-beneath it; a leaf attribute is one that does not. Any attribute may
-Branch attributes must exist in order to create any
-leaf attributes from them
+If you try to create an unsupported leaf, branch
+attributes will be created as needed to support it
-
-See help attribute trees2 for more information and examples.
@@ -76 +76 @@
-child has its own overriding attribute. However, children that wish
-to override a leaf attribute must also have their own (overriding)
-So this doesn't work
+This means that when you do
-
-  &BRANCH parent = a branch
-  &BRANCH`LEAF parent = a leaf
-
+
+
+
+
+
-
-If a branch on the parent is set no_inherit, it will not be inherited,
@@ -90 +94 @@
-access to inherited parent data.
-
-

1.7.7/game/txt/hlp/penncmd.hlp

@@ -72 +72 @@
-  @motd          @newpassword   @pcreate       @poll          @poor          
-  @power         @purge         @quota         @readcache     @rejectmotd    
-
-
+
+
+
- 
-& ]
@@ -713 +714 @@
-
-  This sets the number of pennies that need to be given to an object to
-
+
+
+
-
-  Example:
@@ -723 +726 @@
-    > Your exit has been created.
-    (The exit will also have been opened by the machine.)
+
+    @cost charity=%0
+    @pay charity=Thanks for your donation of %0.
-
-See also: give, MONEY, @pay, money()
@@ -2000 +2006 @@
-    @lock/use Admin Commands=flag^wizard|flag^royalty
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-& locktypes
-& locklist
@@ -2589 +2590 @@
-See also: MONEY
-& @power
+  @power/list [<power name pattern>]
+  @power <power>
-  @power <object>=[!]<power>
-  
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-& @prefix
-  @prefix <object> = <message>
@@ -2971 +3029 @@
-  if their host-pattern matches <string> exactly.
- 
+& @sql
+  @sql <query>
+
+  This command issues and SQL query if the MUSH supports SQL and
+  can connect to an SQL server. You must be WIZARD or have the
+  Sql_Ok power to use @sql.
+
+  Generally, the sql() function is more useful for coding, as it
+  delimits its return values, but @sql is handy for INSERT-type
+  queries and quick checks. If you pass arbitrary data to @sql,
+  be sure you call sqlescape() on it (see the example in help sql()).
+
+  Example: @sql SHOW TABLES
+
+  See also: sql(), sqlescape()
-& @squota
-  @squota <victim> [= [+|-] <amount>]
@@ -3611 +3684 @@
-
-See also: follow, unfollow, dismiss, followers(), following()
+& empty
+  empty <object>
+
+  The empty command attempts to move all the contents of <object>
+  to <object>'s location. You must either be holding <object>
+  (in which case the command is like getting <object>'s <item>
+  for each item) or be in the same location as <object> (in which
+  case the command is like getting <object>'s <item> and dropping it).
+
+  The empty command assumes that all <object>'s items pass through the
+  hands of the player running the command. Therefore, the same kinds of
+  locks and messages that are applied in a possessive get (and, possibly,
+  a drop) are applied to each item in <object>. It is therefore possible
+  to fail to empty an object for many reasons, even when you could do so
+  using "extraphysical" methods (teleporting items, forcing the object
+  to drop them, or forcing the items to leave the object.)
+
+See also: get, drop
-& get
-& take
@@ -3624 +3715 @@
-& give
-  give[/silent] <player>=<number>
+  give[/silent] <number> to <player>
-  give <player>=<object>
+  give <object> to <player>
-
-  Gives player the specified <number> of pennies or <object>. You can't give 

1.7.7/game/txt/hlp/pennconf.hlp

@@ -218 +218 @@
-  guests=<boolean>: Are guest logins allowed?
-  pueblo=<boolean>: Is Pueblo support turned on?
+  sql_platform=<string>: What kind of SQL server are we using? 
+                         ("mysql" or "disabled")
+  sql_host=<string>: What is the hostname or ip address of the SQL server
-& @config tiny
- Options that help control compability with TinyMUSH servers.

1.7.7/game/txt/hlp/pennflag.hlp

@@ -57 +57 @@
-  ? - Unregistered      ^ - Listen_Parent       ~ - Noaccents
-  " - NoSpoof
-
+--
-Some flags may not be enabled on some MUSHes. @flag/list will show
-which are available.
@@ -578 +578 @@
-  Flag:  ROYALTY  (all types)
-
-
-
-
-
-
-
+
+
+
+
+
-& SAFE
-  Flag:  SAFE  (all types)
@@ -602 +601 @@
-  (See DROP-TOs). This flag is meaningless for exits.
-& SUSPECT
-player
+all type
-
-  This flag is only settable by wizards. Players with this flag have
-  their connects, disconnects, name changes, and kills reported to
-ll their actions are also logged to the MUSH
-
+ctions by any object with this flag are
+also logged to the MUSH 
-& TEMPLE
-  The TEMPLE flag is no longer available in PennMUSH. Please see help

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -52 +52 @@
-  Math functions:  number manipulation, generic or integers only (ADD, DIV)
-  Regular expression functions: Regular expressions (REGMATCH, REGEDIT)
+  SQL functions: Access SQL databases (SQL, SQLESCAPE)
-  String functions:  string manipulation (ESCAPE, FLIP)
-  Time functions: Formatting and display of time (TIME, CONVSECS)
@@ -181 +182 @@
-  vmax()        vmin()        vmul()        vsub()        vunit()
-& Regular expression functions
-is
+ese
-  it against assorted things.
-  
@@ -190 +191 @@
- 
-  See also: string functions, regexp
+& SQL functions
+  These functions perform queries or other operations on an SQL
+  database to which the MUSH is connected, if SQL support is
+  available and enabled.
+
+  sql()         sqlescape()
+
-& String functions
-  String functions take at least one string and return a transformed
@@ -3374 +3382 @@
-    You say, "foo moof baz"
-  
+& SQL()
+  sql(<query string>,[<row delimiter>[,<field delimiter>])
+
+  Performs an SQL query if the MUSH is configured to connect to an 
+  SQL database server. This function requires a WIZARD flag or
+  the Sql_Ok power.
+
+  By default, SELECT queries will return their data space-separated.
+  Usually, it's more useful to specify a character to delimit 
+  rows returned (and sometimes another character to delimit the
+  fields/columns returned, if they may contain spaces).
+
+  <query string> is evaluated, so it's useful to either read it from
+  another attribute with u() or use lit() to protect commas. If 
+  you will be interpolating user-provided values into the query,
+  be careful to escape them with sqlescape(), like this:
+
+     &SEL_GETID obj = SELECT id FROM mytable WHERE name = '[sqlescape(%0)]'
+     &DOIT obj = $do *: ... [setq(0,u(SEL_GETID,%0))] ...
+
+  See also: sqlescape(), @sql
+
+& SQLESCAPE()
+  sqlescape(<string>)
+
+  This function performs SQL-server-implemented escaping of strings.
+  It's important to escape arbitrary data before passing it to the
+  sql() function or @sql command to prevent SQL injection attacks.
+
+  Example:
+    > think sqlescape(You don't say)
+    You don\'t say
+
+  When used in an SQL query, the results of an sqlescape() function
+  should be enclosed in single quotes.
+
+  You must be a WIZARD or have the Sql_Ok power to use this function.
+
+  See also: sql(), @sql
+