This is patch07 to PennMUSH 1.7.6. After applying this patch, you will have version 1.7.6p7 To apply this patch, save it to a file in your top-level MUSH directory, and do the following: patch -p1 < 1.7.6-patch07 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: * Some sloppy coding in src/access.c could generate runtime debugging exceptions. Reported by BladedThoth@M*U*S*H. * wrap() could behave incorrectly when a line was exactly the length of the wrap width and the total input size was larger than any previously wrapped input. Reported by Liam@Firdeloth. * Extra NUL characters were sent after telnet codes, which confused Mudnet and maybe some clients. Patch by Alierak. Prereq: 1.7.6p6 *** 1_7_6.112/Patchlevel Thu, 23 Jan 2003 10:20:38 -0600 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.1.1.6 600) --- 1_7_6.117(w)/Patchlevel Thu, 20 Feb 2003 09:34:41 -0600 dunemush (pennmush/5_Patchlevel 1.17.1.11.1.1.1.6 600) *************** *** 1,2 **** Do not edit this file. It is maintained by the official PennMUSH patches. ! This is PennMUSH 1.7.6p6 --- 1,2 ---- Do not edit this file. It is maintained by the official PennMUSH patches. ! This is PennMUSH 1.7.6p7 *** 1_7_6.112/CHANGES.OLD Wed, 14 Nov 2001 14:49:26 -0600 dunemush (pennmush/7_CHANGES.OL 1.6.1.4 600) --- 1_7_6.117(w)/CHANGES.OLD Wed, 19 Feb 2003 13:19:29 -0600 dunemush (pennmush/7_CHANGES.OL 1.6.1.5 600) *************** *** 1719,1731 **** * @tel me=home or @tel home now works in all cases where 'home' works. Report by Vedui. - - Version 1.6.10 patchlevel 6 May 11, 1997 - - Fixes: - * inc() and dec() didn't work right with NULL_EQ_ZERO. - Fixed. Report by Dennis DeMarco - Version 1.7.1 patchlevel 3 January 12, 1998 Minor Changes: --- 1719,1724 ---- *************** *** 1814,1824 **** * help @list fixed to show the correct @config switches. Reported by Leo@ATS TrekMUSH * @chan/gag now works correctly. Report by Vedui. - - - Version 1.7.0 patchlevel 11 November 18, 1997 - - Fixes: * Help for remove() updated. Reported by Vedui@Robotech. * hasattr() didn't check if the invoker had permission to read the attribute. Reported by Vedui@Robotech. --- 1807,1812 ---- *** 1_7_6.112/CHANGES Thu, 23 Jan 2003 10:20:38 -0600 dunemush (pennmush/g/17_CHANGES 1.10.1.6.1.2.1.2.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.9.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.2.1.1.1.1 600) --- 1_7_6.117(w)/CHANGES Thu, 20 Feb 2003 09:34:37 -0600 dunemush (pennmush/g/17_CHANGES 1.10.1.6.1.2.1.2.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.9.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1 600) *************** *** 18,23 **** --- 18,35 ---- ========================================================================== + Version 1.7.6 patchlevel 7 February 20, 2003 + + Fixes: + * Some sloppy coding in src/access.c could generate runtime + debugging exceptions. Reported by BladedThoth@M*U*S*H. + * wrap() could behave incorrectly when a line was exactly the length + of the wrap width and the total input size was larger than + any previously wrapped input. Reported by Liam@Firdeloth. + * Extra NUL characters were sent after telnet codes, which + confused Mudnet and maybe some clients. Patch by Alierak. + + Version 1.7.6 patchlevel 6 January 23, 2003 Minor changes: *** 1_7_6.112/game/txt/hlp/pennvers.hlp Thu, 23 Jan 2003 10:20:38 -0600 dunemush (pennmush/12_pennvers.h 1.169.1.42.1.3.1.2.2.2.1.1.1.3.1.1.1.5.1.4.1.1.1.1.1.1.1.1.1.5.1.1.1.3.1.1.1.3.1.1.1.54.1.10.1.2.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.7.1.1.1.1.1.2.1.1.1.4.1.2.1.1.1.1.1.1.1.2.1.1.1.2.1.1.1.1.1.1.1.1.1.1 600) --- 1_7_6.117(w)/game/txt/hlp/pennvers.hlp Wed, 19 Feb 2003 13:19:40 -0600 dunemush (pennmush/12_pennvers.h 1.169.1.42.1.3.1.2.2.2.1.1.1.3.1.1.1.5.1.4.1.1.1.1.1.1.1.1.1.5.1.1.1.3.1.1.1.3.1.1.1.54.1.10.1.2.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.2.1.1.1.1.1.7.1.1.1.1.1.2.1.1.1.4.1.2.1.1.1.1.1.1.1.2.1.1.1.2.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1 600) *************** *** 1,5 **** & changes ! & 1.7.6p6 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 '. 'help credits' --- 1,5 ---- & changes ! & 1.7.6p7 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 '. 'help credits' *************** *** 11,16 **** --- 11,29 ---- A list of the patchlevels associated with each release can be read in 'help patchlevels'. + Version 1.7.6 patchlevel 7 January 23, 2003 + + Fixes: + * Some sloppy coding in src/access.c could generate runtime + debugging exceptions. Reported by BladedThoth@M*U*S*H. + * wrap() could behave incorrectly when a line was exactly the length + of the wrap width and the total input size was larger than + any previously wrapped input. Reported by Liam@Firdeloth. + * Extra NUL characters were sent after telnet codes, which + confused Mudnet and maybe some clients. Patch by Alierak. + + + & 1.7.6p6 Version 1.7.6 patchlevel 6 January 23, 2003 Minor changes: *************** *** 3178,3191 **** * @tel me=home or @tel home now works in all cases where 'home' works. Report by Vedui. - - & 1.6.10p6 - Version 1.6.10 patchlevel 6 May 11, 1997 - - Fixes: - * inc() and dec() didn't work right with NULL_EQ_ZERO. - Fixed. Report by Dennis DeMarco - & 1.7.1p3 Version 1.7.1 patchlevel 3 January 12, 1998 --- 3191,3196 ---- *************** *** 3278,3289 **** * help @list fixed to show the correct @config switches. Reported by Leo@ATS TrekMUSH * @chan/gag now works correctly. Report by Vedui. - - - & 1.7.0p11 - Version 1.7.0 patchlevel 11 November 18, 1997 - - Fixes: * Help for remove() updated. Reported by Vedui@Robotech. * hasattr() didn't check if the invoker had permission to read the attribute. Reported by Vedui@Robotech. --- 3283,3288 ---- *************** *** 5855,5861 **** For information on a specific patchlevel of one of the versions listed, type 'help p'. For example, 'help 1.7.2p3' ! 1.7.6: 0, 1, 2, 3, 4, 5, 6 1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 1.7.4: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 --- 5854,5860 ---- For information on a specific patchlevel of one of the versions listed, type 'help p'. For example, 'help 1.7.2p3' ! 1.7.6: 0, 1, 2, 3, 4, 5, 6, 7 1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 1.7.4: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 *************** *** 5863,5870 **** 1.7.2: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 1.7.1: 0, 1, 2, 3 ! 1.7.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 11 ! 1.6.10: 0, 1, 2, 3, 4, 5, 6, 6 1.6.9: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 1.6.8: 0, 1 1.6.7: 0, 1, 2, 3, 4, 5, 6 --- 5862,5869 ---- 1.7.2: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 1.7.1: 0, 1, 2, 3 ! 1.7.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ! 1.6.10: 0, 1, 2, 3, 4, 5, 6 1.6.9: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 1.6.8: 0, 1 1.6.7: 0, 1, 2, 3, 4, 5, 6 *** 1_7_6.112/src/funstr.c Sat, 30 Nov 2002 15:49:22 -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.1.1.1.1.1.1.1.1.1.1.1.1.2.1.3.1.5.1.3.1.2 660) --- 1_7_6.117(w)/src/funstr.c Thu, 20 Feb 2003 09:36:04 -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.1.1.1.1.1.1.1.1.1.1.1.1.2.1.3.1.5.1.3.1.2.1.1 660) *************** *** 1482,1488 **** * so %r will not mess with any alignment * functions. */ ! while (i <= length + 1) { if ((str[i] == '\n') || (str[i] == '\r')) return i; i++; --- 1482,1488 ---- * so %r will not mess with any alignment * functions. */ ! while (i < length) { if ((str[i] == '\n') || (str[i] == '\r')) return i; i++; *** 1_7_6.112/src/bsd.c Mon, 13 Jan 2003 20:30:53 -0600 dunemush (pennmush/c/38_bsd.c 1.58.1.11.1.2.1.5.1.7.1.14.1.13.1.9.1.4.1.2.1.12.1.1.1.1.1.2.1.1.1.13.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.8.2.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1 660) --- 1_7_6.117(w)/src/bsd.c Thu, 20 Feb 2003 09:36:01 -0600 dunemush (pennmush/c/38_bsd.c 1.58.1.11.1.2.1.5.1.7.1.14.1.13.1.9.1.4.1.2.1.12.1.1.1.1.1.2.1.1.1.13.1.1.1.1.1.1.1.1.1.1.1.3.1.1.1.1.1.1.1.1.1.1.1.1.1.1.1.3.1.8.2.1.1.1.1.1.1.1.1.2.1.1.1.1.1.1.1.1 660) *************** *** 3391,3397 **** /* Use rfc 1184 to test telnet support, as it tries to set linemode with client-side editing. Good for Broken Telnet Programs. */ if (!(d->conn_flags & (CONN_TELNET | CONN_TELNET_QUERY))) { ! queue_newwrite(d, TELNET_QUERY, sizeof(TELNET_QUERY)); d->conn_flags |= CONN_TELNET_QUERY; process_output(d); } --- 3391,3397 ---- /* Use rfc 1184 to test telnet support, as it tries to set linemode with client-side editing. Good for Broken Telnet Programs. */ if (!(d->conn_flags & (CONN_TELNET | CONN_TELNET_QUERY))) { ! queue_newwrite(d, TELNET_QUERY, 3); d->conn_flags |= CONN_TELNET_QUERY; process_output(d); } *************** *** 3463,3469 **** q++; if (*q == LINEMODE) { ! queue_newwrite(d, SET_LINEMODE, sizeof(SET_LINEMODE)); } else { char reply[5]; reply[0] = (char) IAC; --- 3463,3469 ---- q++; if (*q == LINEMODE) { ! queue_newwrite(d, SET_LINEMODE, 7); } else { char reply[5]; reply[0] = (char) IAC; *** 1_7_6.112/src/access.c Sat, 30 Nov 2002 15:49:22 -0600 dunemush (pennmush/c/43_access.c 1.11.1.2.1.4 660) --- 1_7_6.117(w)/src/access.c Thu, 20 Feb 2003 09:36:01 -0600 dunemush (pennmush/c/43_access.c 1.11.1.2.1.4.1.1 660) *************** *** 203,210 **** comment = NULL; /* Is this the @sitelock entry? */ if (!strncasecmp(p, "@sitelock", 9)) { ! can = ACS_SITELOCK; ! buf[9] = '\0'; } else { if ((comment = strchr(p, '#'))) { *comment++ = '\0'; --- 203,210 ---- comment = NULL; /* Is this the @sitelock entry? */ if (!strncasecmp(p, "@sitelock", 9)) { ! if (!add_access_node("@sitelock", AMBIGUOUS, ACS_SITELOCK, 0, "")) ! do_log(LT_ERR, GOD, GOD, T("Failed to add sitelock node!")); } else { if ((comment = strchr(p, '#'))) { *comment++ = '\0'; *************** *** 219,231 **** if (!parse_access_options(p, &who, &can, &cant, NOTHING)) /* Nothing listed, so assume we can't do anything! */ cant = ACS_DEFAULT; ! ! } ! if (!add_access_node(buf, who, can, cant, comment)) { ! /* Something very bad happened */ ! do_log(LT_ERR, GOD, GOD, T("Failed to add access node!")); ! fclose(fp); ! retval = 0; } } } --- 219,226 ---- if (!parse_access_options(p, &who, &can, &cant, NOTHING)) /* Nothing listed, so assume we can't do anything! */ cant = ACS_DEFAULT; ! if (!add_access_node(buf, who, can, cant, comment)) ! do_log(LT_ERR, GOD, GOD, T("Failed to add access node!")); } } } *** 1_7_6.112/hdrs/version.h Thu, 23 Jan 2003 10:20:38 -0600 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.2.1.5 660) --- 1_7_6.117(w)/hdrs/version.h Thu, 20 Feb 2003 09:36:07 -0600 dunemush (pennmush/c/47_version.h 1.32.1.2.1.7.1.9.1.1.1.17.1.2.1.5 660) *************** *** 1,2 **** ! #define VERSION "PennMUSH version 1.7.6 patchlevel 6 [01/23/2003]" ! #define SHORTVN "PennMUSH 1.7.6p6" --- 1,2 ---- ! #define VERSION "PennMUSH version 1.7.6 patchlevel 7 [02/20/2003]" ! #define SHORTVN "PennMUSH 1.7.6p7" *** 1_7_6.112/game/txt/hlp/penncode.hlp Mon, 11 Nov 2002 20:51:42 -0600 dunemush (pennmush/d/40_penncode.h 1.5.1.3 600) --- 1_7_6.117(w)/game/txt/hlp/penncode.hlp Wed, 19 Feb 2003 13:20:51 -0600 dunemush (pennmush/d/40_penncode.h 1.5.1.4 600) *************** *** 15,22 **** This code version is being maintained by Javelin, aka Alan Schwartz. Suggestions, comments, and bug reports are welcome; send email to ! dunemush@pennmush.org. For information about changes in versions of the ! code, see 'help changes'. & i18n & internationalization & locale --- 15,22 ---- This code version is being maintained by Javelin, aka Alan Schwartz. Suggestions, comments, and bug reports are welcome; send email to ! pennmush-developers@pennmush.org. For information about changes in ! versions of the code, see 'help changes'. & i18n & internationalization & locale