This is patch03 to PennMUSH 1.7.5. After applying this patch, you will
have version 1.7.5p3

To apply this patch, save it to a file in your top-level MUSH directory,
and do the following:
	patch -p1 < 1.7.5-patch03
	make install

If you use GNU patch 2.2, you probably want the above to be 'patch -b -p1',
not just 'patch -p1'.

Unix (or cygwin) users need not worry about failed hunks in src/switchinc.c,
hdrs/switches.h, hdrs/cmds.h, or hdrs/funs.h. These files are automatically
rebuilt on compile.

Then @shutdown and restart your MUSH.
    - Alan/Javelin

In this patch:

Fixes:
  * before() was broken in 1.7.5p2. Reported by Sam Knowlton.
  * capstr() was broken in 1.7.5p2.
  * Win32 portability fixes by Noltar@Korongil.

Prereq: 1.7.5p2
*** 1_7_5.64/Patchlevel Wed, 23 Jan 2002 10:28:03 -0600 dunemush (pennmush/5_Patchlevel 1.17.1.3 600)
--- 1_7_5.65(w)/Patchlevel Thu, 24 Jan 2002 10:49:16 -0600 dunemush (pennmush/5_Patchlevel 1.17.1.4 600)
***************
*** 1,2 ****
  Do not edit this file. It is maintained by the official PennMUSH patches.
! This is PennMUSH 1.7.5p2
--- 1,2 ----
  Do not edit this file. It is maintained by the official PennMUSH patches.
! This is PennMUSH 1.7.5p3
*** 1_7_5.64/CHANGES Wed, 23 Jan 2002 10:28:03 -0600 dunemush (pennmush/g/7_CHANGES 1.21 600)
--- 1_7_5.65(w)/CHANGES Thu, 24 Jan 2002 10:48:59 -0600 dunemush (pennmush/g/7_CHANGES 1.22 600)
***************
*** 17,22 ****
--- 17,29 ----
  
  ==========================================================================
  
+ Version 1.7.5 patchlevel 3                     January 24, 2002
+ 
+ Fixes:
+   * before() was broken in 1.7.5p2. Reported by Sam Knowlton.
+   * capstr() was broken in 1.7.5p2.
+   * Win32 portability fixes by Noltar@Korongil.
+ 
  Version 1.7.5 patchlevel 2                     January 23, 2002
  
  Major changes:
*** 1_7_5.64/game/txt/hlp/pennvers.hlp Wed, 23 Jan 2002 10:28:03 -0600 dunemush (pennmush/12_pennvers.h 1.169.1.42.1.7 600)
--- 1_7_5.65(w)/game/txt/hlp/pennvers.hlp Thu, 24 Jan 2002 10:51:48 -0600 dunemush (pennmush/12_pennvers.h 1.169.1.42.1.8 600)
***************
*** 1,5 ****
  & changes
! & 1.7.5p2
  This is a list of changes in this patchlevel which are probably of
  interest to players. More information about new commands and functions
  can probably be gotten via 'help <name of whatever>'. 'help credits'
--- 1,5 ----
  & changes
! & 1.7.5p3
  This is a list of changes in this patchlevel which are probably of
  interest to players. More information about new commands and functions
  can probably be gotten via 'help <name of whatever>'. 'help credits'
***************
*** 11,16 ****
--- 11,24 ----
  A list of the patchlevels associated with each release can
  be read in 'help patchlevels'.
  
+ Version 1.7.5 patchlevel 3                     January 24, 2002
+ 
+ Fixes:
+   * before() was broken in 1.7.5p2. Reported by Sam Knowlton.
+   * capstr() was broken in 1.7.5p2.
+   * Win32 portability fixes by Noltar@Korongil.
+ 
+ & 1.7.5p2
  Version 1.7.5 patchlevel 2                     January 23, 2002
  
  Major changes:
***************
*** 5051,5132 ****
      TinyMUSH 2.0's. The option to examine public attributes by default
      is configurable.
  
- & 1.7.5p1
- Version 1.7.5 patchlevel 1                     November 14, 2001
- 
- Minor Changes:
-   * Many obsolete db formats are no longer readable. hdrs/oldattrib.h
-     and src/convdb.c are no more. [SW]
-   * Code cleanup. [SW]
- Fixes:
-   * Help file for mix updated. Report by Cmintrnt@M*U*S*H
-   * Updated win32 config.h file and other fixes by Noltar@Korongil
-   * WHO wasn't showing unconnected players. Report by Noltar@Korongil. [SW]
-   * Help fixes. [SW]
- 
- & 1.7.5p0
- Version 1.7.5 patchlevel 0                     November 14, 2001
- 
- Major Changes:
-   * This is now the development minor version. This first release includes
-     relatively few changes, to make converting to it easier.
-   * Internal changes to the lock system. This requires a new minimal.db,
-     which is now distributed. [SW]
-   * Locale-based string collation throughout.
-   * Only ANSI C compilers are still supported; no more K&R. Files are
-     gradually going to be converted to ANSI C only.
-   * There is now an option to make ZMOs and ZMRs not count for
-     control of objects, only ZMPs. [SW]
- Flags:
-   * The ZONE player flag has been renamed SHARED, to help seperate the
-     ZMP control-only meaning from the command-matching of ZMOs and ZMRs. [SW]
- Commands:
-   * /preserve switch for @link prevents @chowning. Suggested by Vexon@M*U*S*H
-   * Admin WHO and SESSION now includes unconnected descriptors. [SW]
-   * Unconnected descriptors can now be booted. Patch by Bellemore@M*U*S*H.
-   * Unconnected descriptors can now be paged by admin with page/port. [SW]
- Functions:
-   * mix() can take more than 10 lists and of unequal length. [3,SW]
-   * iname() returns the name of an object from inside (honoring nameformat)
-     Idea by Jeffrey@TheHotel.
-   * lplayers() returns a list of players in the location. Handy for
-     room parents. By Vexon@M*U*S*H.
-   * lvplayers(), lvcon(), lvexits() are like lplayers/lcon/lexits, but
-     leave out dark things (and disconnected players). Handy for room
-     parents. By Vexon@M*U*S*H.
- Minor Changes:
-   * munge() now passes its delimiter as %1 to make generic sorting easier. [SW]
-   * Word-based attribute compression is faster than before, for both
-     compression and decompression. [SW]
-   * Windows memory-usage information for wizards is now in @uptime, not
-     @stats [SW]
-   * Word-based attribute compression stats can be viewed on non-Windows
-     mushes as well, by defining COMP_STATS. See externs.h for details. [SW]
-   * Setting of the internal QUEUE and semaphore attributes does not modify
-     an object's last-modified timestamp. [SW]
-   * Speaking on a channel that you're gagging is now treated like
-     speaking on a channel that you're not on. Suggested by rodregis@M*U*S*H
-   * You can use @exitto in place of &DESTINATION to set the destinatino
-     for variable exits, though DESTINATION is checked first. [3]
-   * WATCHER is another name for the MONITOR flag. [3]
-   * max_guest_pennies and guest_paycheck config options. Inspired by [SW]
-   * Lock and unlock messages now show object name and dbref, and tell
-     you if you unlock an already unlocked object. Suggested by Jamie Warren.
-   * A version of portmsg for Win32 is in the win32 directory.
-     Donated by CU5@WCX
-   * Tweaks to info_slave, which now uses readv/writev. [SW]
-   * Lots of code cleanup. [SW]
-   * CHAT_SYSTEM, INFO_SLAVE, and FUNCTION_SIDE_EFFECTS are now #define'd
-     by default. [TAP]
- Fixes:
-   * Indentation fixes [SW]
-   * Fixes up to 1.7.4p12 merged in.
- 
  & patchlevels
  For information on a specific patchlevel of one of the versions listed,
  type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
  
! 1.7.5: 0, 0, 1, 1, 2
  1.7.4: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
  1.7.3: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
  1.7.2: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
--- 5059,5069 ----
      TinyMUSH 2.0's. The option to examine public attributes by default
      is configurable.
  
  & patchlevels
  For information on a specific patchlevel of one of the versions listed,
  type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
  
! 1.7.5: 0, 1, 2, 3
  1.7.4: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
  1.7.3: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
  1.7.2: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
*** 1_7_5.64/src/funstr.c Fri, 04 Jan 2002 16:13:39 -0600 dunemush (pennmush/c/13_funstr.c 1.28.1.1.1.2.1.4.1.6.1.1.1.1.1.2.1.1.1.1.1.4 660)
--- 1_7_5.65(w)/src/funstr.c Thu, 24 Jan 2002 11:06:51 -0600 dunemush (pennmush/c/13_funstr.c 1.28.1.1.1.2.1.4.1.6.1.1.1.1.1.2.1.1.1.1.1.5 660)
***************
*** 96,102 ****
    } else if (p != args[0]) {
      char x = *p;
      *p = '\0';
!     safe_strl(args[0], arglens[0], buff, bp);
      *p = x;
    }
    if (*p) {
--- 96,102 ----
    } else if (p != args[0]) {
      char x = *p;
      *p = '\0';
!     safe_str(args[0], buff, bp);
      *p = x;
    }
    if (*p) {
*** 1_7_5.64/src/funlist.c Wed, 23 Jan 2002 10:28:03 -0600 dunemush (pennmush/c/16_funlist.c 1.3.1.1.1.5.1.2.1.1.1.1.1.4.1.2.1.2.1.19.1.2.1.1.1.2.1.5.1.1.1.1.1.1.1.2 660)
--- 1_7_5.65(w)/src/funlist.c Thu, 24 Jan 2002 11:06:51 -0600 dunemush (pennmush/c/16_funlist.c 1.3.1.1.1.5.1.2.1.1.1.1.1.4.1.2.1.2.1.19.1.2.1.1.1.2.1.5.1.1.1.1.1.1.1.3 660)
***************
*** 1858,1864 ****
      p = strstr(args[0], args[1]);
    if (p)
      *p = '\0';
!   safe_strl(args[0], arglens[0], buff, bp);
  }
  
  /* ARGSUSED */
--- 1858,1864 ----
      p = strstr(args[0], args[1]);
    if (p)
      *p = '\0';
!   safe_str(args[0], buff, bp);
  }
  
  /* ARGSUSED */
*** 1_7_5.64/src/db.c Wed, 23 Jan 2002 10:28:03 -0600 dunemush (pennmush/c/25_db.c 1.26.1.1.1.2 660)
--- 1_7_5.65(w)/src/db.c Thu, 24 Jan 2002 11:06:51 -0600 dunemush (pennmush/c/25_db.c 1.26.1.1.1.3 660)
***************
*** 1200,1206 ****
    int c;
    dbref i;
    struct object *o;
-   const char *end;
    int temp = 0;
    time_t temp_time = 0;
    int minimum_flags =
--- 1200,1205 ----
*** 1_7_5.64/hdrs/version.h Wed, 23 Jan 2002 10:28:03 -0600 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.6 660)
--- 1_7_5.65(w)/hdrs/version.h Thu, 24 Jan 2002 11:06:54 -0600 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.7 660)
***************
*** 1,2 ****
! #define VERSION "PennMUSH version 1.7.5 patchlevel 2 [01/23/2002]"
! #define SHORTVN "PennMUSH 1.7.5p2"
--- 1,2 ----
! #define VERSION "PennMUSH version 1.7.5 patchlevel 3 [01/24/2002]"
! #define SHORTVN "PennMUSH 1.7.5p3"
*** 1_7_5.64/hdrs/mysocket.h Tue, 20 Nov 2001 17:08:09 -0600 dunemush (pennmush/e/51_mysocket.h 1.10 660)
--- 1_7_5.65(w)/hdrs/mysocket.h Thu, 24 Jan 2002 11:06:54 -0600 dunemush (pennmush/e/51_mysocket.h 1.11 660)
***************
*** 16,21 ****
--- 16,22 ----
  #include <winsock.h>
  #include <io.h>
  #undef OPAQUE			/* Clashes with flags.h */
+ #undef EINTR			/* Clashes with errno.h */
  #define EINTR WSAEINTR
  #define EWOULDBLOCK WSAEWOULDBLOCK
  #define EINPROGRESS WSAEINPROGRESS
*** 1_7_5.64/win32/funs.h Wed, 23 Jan 2002 10:28:03 -0600 dunemush (pennmush/f/12_funs.h 1.11.1.9.2.8.2.1.1.1.1.2.1.1.1.1.1.1.1.2 660)
--- 1_7_5.65(w)/win32/funs.h Wed, 23 Jan 2002 10:28:12 -0600 dunemush (pennmush/f/12_funs.h 1.11.1.9.2.8.2.1.1.1.1.2.1.1.1.1.1.1.1.3 660)
***************
*** 299,302 ****
  FUNCTION_PROTO(fun_zemit);
  FUNCTION_PROTO(fun_zfun);
  FUNCTION_PROTO(fun_zone);
- FUNCTION_PROTO(local_fun_silly);
--- 299,301 ----
*** 1_7_5.64/win32/config.h Sat, 08 Dec 2001 00:06:09 -0600 dunemush (pennmush/f/14_config.h 1.4 600)
--- 1_7_5.65(w)/win32/config.h Wed, 23 Jan 2002 12:23:48 -0600 dunemush (pennmush/f/14_config.h 1.5 600)
***************
*** 547,553 ****
   *	If defined, this system has the sockaddr_in6 struct and AF_INET6.
   * We can't rely on just AF_INET6 being defined.
   */
! #define HAS_IPV6	/**/
  
  /* SIGNALS_KEPT:
   *	This symbol is defined if signal handlers needn't be reinstated after
--- 547,553 ----
   *	If defined, this system has the sockaddr_in6 struct and AF_INET6.
   * We can't rely on just AF_INET6 being defined.
   */
! /*#define HAS_IPV6	/**/
  
  /* SIGNALS_KEPT:
   *	This symbol is defined if signal handlers needn't be reinstated after
*** 1_7_5.64/win32/cmds.h Wed, 23 Jan 2002 10:28:03 -0600 dunemush (pennmush/f/15_cmds.h 1.9.1.4.1.1.1.1.1.1.1.1.2.1.1.1.2.1.1.2.1.1.1.1.1.2 660)
--- 1_7_5.65(w)/win32/cmds.h Wed, 23 Jan 2002 10:28:12 -0600 dunemush (pennmush/f/15_cmds.h 1.9.1.4.1.1.1.1.1.1.1.1.2.1.1.1.2.1.1.2.1.1.1.1.1.3 660)
***************
*** 61,67 ****
  COMMAND_PROTO(cmd_link);
  COMMAND_PROTO(cmd_list);
  COMMAND_PROTO(cmd_listmotd);
- COMMAND_PROTO(cmd_local_silly);
  COMMAND_PROTO(cmd_lock);
  COMMAND_PROTO(cmd_log);
  COMMAND_PROTO(cmd_logwipe);
--- 61,66 ----