Changeset 269
- Timestamp:
- 04/19/06 22:39:01 (3 years ago)
- Files:
-
- 1.7.3/CHANGES (modified) (1 diff)
- 1.7.3/Configure (modified) (9 diffs)
- 1.7.3/MANIFEST (modified) (2 diffs)
- 1.7.3/Patchlevel (modified) (1 diff)
- 1.7.3/config_h.SH (modified) (3 diffs)
- 1.7.3/game/txt/hlp/penncmd.hlp (modified) (2 diffs)
- 1.7.3/game/txt/hlp/pennvers.hlp (modified) (3 diffs)
- 1.7.3/hdrs/atr_tab.h (modified) (6 diffs)
- 1.7.3/hdrs/attrib.h (modified) (3 diffs)
- 1.7.3/hdrs/boolexp.h (added)
- 1.7.3/hdrs/case.h (added)
- 1.7.3/hdrs/command.h (modified) (4 diffs)
- 1.7.3/hdrs/conf.h (modified) (4 diffs)
- 1.7.3/hdrs/dbdefs.h (modified) (5 diffs)
- 1.7.3/hdrs/extchat.h (modified) (4 diffs)
- 1.7.3/hdrs/externs.h (modified) (16 diffs)
- 1.7.3/hdrs/extmail.h (modified) (2 diffs)
- 1.7.3/hdrs/flags.h (modified) (1 diff)
- 1.7.3/hdrs/function.h (modified) (2 diffs)
- 1.7.3/hdrs/game.h (modified) (6 diffs)
- 1.7.3/hdrs/globals.h (modified) (1 diff)
- 1.7.3/hdrs/htab.h (modified) (1 diff)
- 1.7.3/hdrs/ident.h (modified) (1 diff)
- 1.7.3/hdrs/intrface.h (modified) (1 diff)
- 1.7.3/hdrs/lock.h (modified) (4 diffs)
- 1.7.3/hdrs/log.h (added)
- 1.7.3/hdrs/malias.h (modified) (3 diffs)
- 1.7.3/hdrs/match.h (modified) (1 diff)
- 1.7.3/hdrs/mushdb.h (modified) (1 diff)
- 1.7.3/hdrs/mushtype.h (added)
- 1.7.3/hdrs/mysocket.h (modified) (2 diffs)
- 1.7.3/hdrs/parse.h (modified) (5 diffs)
- 1.7.3/hdrs/pcre.h (modified) (1 diff)
- 1.7.3/hdrs/version.h (modified) (1 diff)
- 1.7.3/hints/freebsd.sh (modified) (1 diff)
- 1.7.3/options.h.dist (modified) (2 diffs)
- 1.7.3/po/pennmush.pot (modified) (18 diffs)
- 1.7.3/src/Makefile (modified) (34 diffs)
- 1.7.3/src/access.c (modified) (2 diffs)
- 1.7.3/src/atr_tab.c (modified) (3 diffs)
- 1.7.3/src/attrib.c (modified) (7 diffs)
- 1.7.3/src/boolexp.c (modified) (4 diffs)
- 1.7.3/src/bsd.c (modified) (28 diffs)
- 1.7.3/src/cmdlocal.dst (modified) (2 diffs)
- 1.7.3/src/cmds.c (modified) (3 diffs)
- 1.7.3/src/command.c (modified) (4 diffs)
- 1.7.3/src/comp_b.c (modified) (1 diff)
- 1.7.3/src/comp_h.c (modified) (1 diff)
- 1.7.3/src/comp_w.c (modified) (1 diff)
- 1.7.3/src/compress.c (modified) (2 diffs)
- 1.7.3/src/conf.c (modified) (3 diffs)
- 1.7.3/src/cque.c (modified) (8 diffs)
- 1.7.3/src/create.c (modified) (6 diffs)
- 1.7.3/src/db.c (modified) (12 diffs)
- 1.7.3/src/destroy.c (modified) (5 diffs)
- 1.7.3/src/extchat.c (modified) (3 diffs)
- 1.7.3/src/extmail.c (modified) (10 diffs)
- 1.7.3/src/filecopy.c (modified) (2 diffs)
- 1.7.3/src/flags.c (modified) (2 diffs)
- 1.7.3/src/function.c (modified) (6 diffs)
- 1.7.3/src/fundb.c (modified) (6 diffs)
- 1.7.3/src/funlist.c (modified) (11 diffs)
- 1.7.3/src/funlocal.dst (modified) (1 diff)
- 1.7.3/src/funmath.c (modified) (15 diffs)
- 1.7.3/src/funmisc.c (modified) (2 diffs)
- 1.7.3/src/funstr.c (modified) (2 diffs)
- 1.7.3/src/funtime.c (modified) (2 diffs)
- 1.7.3/src/funufun.c (modified) (1 diff)
- 1.7.3/src/game.c (modified) (13 diffs)
- 1.7.3/src/htab.c (modified) (1 diff)
- 1.7.3/src/ident.c (modified) (7 diffs)
- 1.7.3/src/local.dst (modified) (1 diff)
- 1.7.3/src/lock.c (modified) (6 diffs)
- 1.7.3/src/log.c (modified) (4 diffs)
- 1.7.3/src/look.c (modified) (5 diffs)
- 1.7.3/src/malias.c (modified) (4 diffs)
- 1.7.3/src/match.c (modified) (2 diffs)
- 1.7.3/src/memcheck.c (modified) (1 diff)
- 1.7.3/src/mkindx.c (modified) (1 diff)
- 1.7.3/src/move.c (modified) (5 diffs)
- 1.7.3/src/mycrypt.c (modified) (1 diff)
- 1.7.3/src/mysocket.c (modified) (25 diffs)
- 1.7.3/src/parse.c (modified) (3 diffs)
- 1.7.3/src/player.c (modified) (4 diffs)
- 1.7.3/src/plyrlist.c (modified) (2 diffs)
- 1.7.3/src/predicat.c (modified) (16 diffs)
- 1.7.3/src/rob.c (modified) (3 diffs)
- 1.7.3/src/services.c (modified) (1 diff)
- 1.7.3/src/set.c (modified) (11 diffs)
- 1.7.3/src/speech.c (modified) (3 diffs)
- 1.7.3/src/strtree.c (modified) (1 diff)
- 1.7.3/src/strutil.c (modified) (5 diffs)
- 1.7.3/src/timer.c (modified) (5 diffs)
- 1.7.3/src/unparse.c (modified) (5 diffs)
- 1.7.3/src/utils.c (modified) (3 diffs)
- 1.7.3/src/version.c (modified) (1 diff)
- 1.7.3/src/warnings.c (modified) (3 diffs)
- 1.7.3/src/wild.c (modified) (2 diffs)
- 1.7.3/src/wiz.c (modified) (7 diffs)
- 1.7.3/utils/mkcmds.sh (modified) (1 diff)
- 1.7.3/win32/funs.h (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
1.7.3/CHANGES
r267 r269 15 15 16 16 ========================================================================== 17 18 Version 1.7.3 patchlevel 5 September 7, 2000 19 20 Minor Changes: 21 * FLOATING_POINT is no longer an option (it's always on). [SW] 22 * EXTENDED_ANSI defaults to enabled. [SW] 23 Attributes: 24 * @receive/@oreceive/@areceive triggered on the recipient 25 after a get or give, so you've got access to who caused 26 you to acquire the object and the object's dbref now. 27 * @give/@ogive/@agive triggered on the giver with object's 28 dbref in %0. Suggested by Oriens@Alexandria. 29 Fixes: 30 * Fixes for systems with broken or incomplete IPv6 support. [SW] 31 * Uses of index() changed to strchr() for consistency. [SW] 32 * Much removal of duplicate function prototypes and rearranging 33 of headers. hdrs/globals.h is now hdrs/case.h. hdrs/intrface.h is 34 no more, and hdrs/boolexp.h, hdrs/log.h were added. [SW] 35 * @search supports "quoted player names". 36 * We no longer report failed connect to ident servers in the log. 17 37 18 38 Version 1.7.3 patchlevel 4 August 8, 2000 1.7.3/Configure
r267 r269 273 273 d_fpsetround='' 274 274 i_floatingpoint='' 275 d_gaistr='' 275 276 d_getadinf='' 276 277 d_getdate='' … … 289 290 d_in2p='' 290 291 d_internet='' 292 d_ipv6='' 291 293 d_keepsig='' 292 294 d_memcpy='' … … 3893 3895 $rm -f test_fpset* core 3894 3896 3897 : see if gai_strerror exists 3898 set gai_strerror d_gaistr 3899 eval $inlibc 3900 3895 3901 : see if getaddrinfo exists 3896 3902 set getaddrinfo d_getadinf … … 4378 4384 eval $setvar 4379 4385 4386 : see if we have struct sockaddr_in6. 4387 echo " " 4388 $cat >d_ipv6.c <<EOCP 4389 #include <sys/types.h> 4390 #include <sys/socket.h> 4391 #include <netinet/in.h> 4392 #include <stdio.h> 4393 main() 4394 { 4395 struct sockaddr_in6 test; 4396 int foo = AF_INET6; 4397 printf("%d\n", foo); 4398 } 4399 EOCP 4400 if $cc $ccflags $ldflags d_ipv6.c -o d_ipv6 $libs >/dev/null 2>&1; then 4401 val="$define" 4402 set d_ipv6; eval $setvar 4403 echo "IPv6 structures found." 4404 else 4405 val="$undef" 4406 set d_ipv6; eval $setvar 4407 echo "No IPv6 structures found. No problem." 4408 fi 4380 4409 echo " " 4381 4410 : see if we have sigaction … … 4759 4788 eval $inlibc 4760 4789 4790 : see if sys/types.h has to be included 4791 set sys/types.h i_systypes 4792 eval $inhdr 4793 4794 : see if this is a sys/socket.h system 4795 set sys/socket.h i_syssock 4796 eval $inhdr 4797 4761 4798 : see if we have socklen_t. 4762 4799 echo " " 4763 4800 $cat >d_socklen.c <<EOCP 4801 #$i_systypes I_SYS_TYPES 4802 #$i_syssock I_SYS_SOCKET 4803 #ifdef I_SYS_TYPES 4804 #include <sys/types.h> 4805 #endif 4806 #ifdef I_SYS_SOCKET 4764 4807 #include <sys/socket.h> 4808 #endif 4765 4809 #include <stdio.h> 4766 4810 main() … … 5588 5632 : see if sys/select.h has to be included 5589 5633 set sys/select.h i_sysselct 5590 eval $inhdr5591 5592 : see if this is a sys/socket.h system5593 set sys/socket.h i_syssock5594 5634 eval $inhdr 5595 5635 … … 5680 5720 esac 5681 5721 $rm -f try.c try 5682 5683 : see if sys/types.h has to be included5684 set sys/types.h i_systypes5685 eval $inhdr5686 5722 5687 5723 : see if sys/vlimit.h has to be included … … 6360 6396 d_fpsetmask='$d_fpsetmask' 6361 6397 d_fpsetround='$d_fpsetround' 6398 d_gaistr='$d_gaistr' 6362 6399 d_getadinf='$d_getadinf' 6363 6400 d_getdate='$d_getdate' … … 6375 6412 d_int_max='$d_int_max' 6376 6413 d_internet='$d_internet' 6414 d_ipv6='$d_ipv6' 6377 6415 d_keepsig='$d_keepsig' 6378 6416 d_lrand48='$d_lrand48' 1.7.3/MANIFEST
r267 r269 9 9 hdrs/atr_tab.h 10 10 hdrs/attrib.h 11 hdrs/boolexp.h 11 12 hdrs/command.h 12 13 hdrs/htab.h 13 14 hdrs/privtab.h 14 15 hdrs/switches.h 16 hdrs/case.h 15 17 hdrs/conf.h 16 18 hdrs/copyrite.h … … 23 25 hdrs/game.h 24 26 hdrs/getpgsiz.h 25 hdrs/globals.h26 27 hdrs/help.h 27 28 hdrs/ident.h 28 hdrs/intrface.h29 29 hdrs/lock.h 30 hdrs/log.h 30 31 hdrs/malias.h 31 32 hdrs/match.h 32 33 hdrs/memcheck.h 33 34 hdrs/mushdb.h 35 hdrs/mushtype.h 34 36 hdrs/mymalloc.h 35 37 hdrs/mysocket.h 1.7.3/Patchlevel
r267 r269 1 1 Do not edit this file. It is maintained by the official PennMUSH patches. 2 This is PennMUSH 1.7.3p 42 This is PennMUSH 1.7.3p5 1.7.3/config_h.SH
r267 r269 238 238 * include <netinet/in.h>. Otherwise, you may try <sys/in.h>. 239 239 */ 240 /* I_SYS_IN: 241 * This symbol, if defined, indicates to the C program that it should 242 * include <sys/in.h> instead of <netinet/in.h>. 243 */ 240 244 #$i_niin I_NETINET_IN /**/ 245 #$i_sysin I_SYS_IN /**/ 241 246 242 247 /* I_STDDEF: … … 465 470 #$i_floatingpoint I_FLOATINGPOINT /**/ 466 471 472 /* HAS_GAI_STRERROR: 473 * This symbol, if defined, indicates that getaddrinfo()'s error cores 474 * can be converted to strings for printing. 475 */ 476 #$d_gaistr HAS_GAI_STRERROR /**/ 477 467 478 /* HAS_GETADDRINFO: 468 479 * This symbol, if defined, indicates that the getaddrinfo() routine is … … 539 550 */ 540 551 #$d_in2p HAS_INET_PTON /**/ 552 553 /* HAS_IPV6: 554 * If defined, this system has the sockaddr_in6 struct and AF_INET6. 555 * We can't rely on just AF_INET6 being defined. 556 */ 557 #$d_ipv6 HAS_IPV6 /**/ 541 558 542 559 /* SIGNALS_KEPT: 1.7.3/game/txt/hlp/penncmd.hlp
r267 r269 2006 2006 2007 2007 See also: give, @apay, @opay, and @cost. 2008 & @receive 2009 & @oreceive 2010 & @areceive 2011 @receive <recipient> [=<message>] 2012 @oreceive <recipient> [=<message>] 2013 @areceive <recipient> [=<message>] 2014 2015 @receive sets the message that is shown to the recipient who 2016 acquires an object by 'get'ing it or having it 'give'n to them. 2017 @oreceive is a mesasge shown to others in the recipient's location, 2018 and @areceive is an action run by the recipient. If not set, 2019 the recipient gets a default message ("Jane gave you A Headache"). 2020 2021 %0 will be set to the dbref of the object received. 2022 %1 will be set to the dbref of the giver if a 'give' was performed. 2023 2024 See also: give 2025 & @give 2026 & @ogive 2027 & @agive 2028 @give <giver> [=<message>] 2029 @ogive <giver> [=<message>] 2030 @agive <giver> [=<message>] 2031 2032 @give sets the message that is shown to the giver when giving an object 2033 to someone else. @ogive is a mesasge shown to others in the giver's 2034 location, and @agive is an action run by the giver. If not set, 2035 the giver gets a default message ("Given.") 2036 2037 %0 will be set to the dbref of the object given. 2038 2039 See also: give 2008 2040 & @pcreate 2009 2041 @pcreate <name> = <password> … … 2974 3006 give an object. 2975 3007 2976 See also: @pay, @cost, @lock, inventory 3008 See also: @pay, @cost, @lock, inventory, @receive, @give 2977 3009 & go 2978 3010 & goto 1.7.3/game/txt/hlp/pennvers.hlp
r267 r269 1 1 & changes 2 & 1.7.3p 42 & 1.7.3p5 3 3 This is a list of changes in this patchlevel which are probably of 4 4 interest to players. More information about new commands and functions … … 10 10 be read in 'help patchlevels'. 11 11 12 Version 1.7.3 patchlevel 5 September 7, 2000 13 14 Minor Changes: 15 * FLOATING_POINT is no longer an option (it's always on). [SW] 16 * EXTENDED_ANSI defaults to enabled. [SW] 17 Attributes: 18 * @receive/@oreceive/@areceive triggered on the recipient 19 after a get or give, so you've got access to who caused 20 you to acquire the object and the object's dbref now. 21 * @give/@ogive/@agive triggered on the giver with object's 22 dbref in %0. Suggested by Oriens@Alexandria. 23 Fixes: 24 * Fixes for systems with broken or incomplete IPv6 support. [SW] 25 * Uses of index() changed to strchr() for consistency. [SW] 26 * Much removal of duplicate function prototypes and rearranging 27 of headers. hdrs/globals.h is now hdrs/case.h. hdrs/intrface.h is 28 no more, and hdrs/boolexp.h, hdrs/log.h were added. [SW] 29 * @search supports "quoted player names". 30 * We no longer report failed connect to ident servers in the log. 31 32 & 1.7.3p4 12 33 Version 1.7.3 patchlevel 4 August 8, 2000 13 34 … … 3927 3948 3928 3949 & patchlevels 3929 1.7.3: 0, 1, 2, 3, 4 3950 1.7.3: 0, 1, 2, 3, 4, 5 3930 3951 1.7.2: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 3931 3952 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 1.7.3/hdrs/atr_tab.h
r267 r269 20 20 {(char *) "AFAILURE", AF_NOPROG, NULL, 0, NULL}, 21 21 {(char *) "AFOLLOW", AF_NOPROG, NULL, 0, NULL}, 22 {(char *) "AGIVE", AF_NOPROG, NULL, 0, NULL}, 22 23 {(char *) "AHEAR", AF_NOPROG, NULL, 0, NULL}, 23 24 {(char *) "AIDESCRIBE", AF_NOPROG, NULL, 0, NULL}, … … 31 32 {(char *) "AMOVE", AF_NOPROG, NULL, 0, NULL}, 32 33 {(char *) "APAYMENT", AF_NOPROG, NULL, 0, NULL}, 34 {(char *) "ARECEIVE", AF_NOPROG, NULL, 0, NULL}, 33 35 {(char *) "ASUCCESS", AF_NOPROG, NULL, 0, NULL}, 34 36 {(char *) "ATPORT", AF_NOPROG, NULL, 0, NULL}, … … 56 58 {(char *) "FOLLOWERS", AF_NOPROG | AF_PRIVATE | AF_WIZARD | AF_NOCOPY, 57 59 NULL, 0, NULL}, 60 {(char *) "GIVE", AF_NOPROG, NULL, 0, NULL}, 58 61 {(char *) "HAVEN", AF_NOPROG, NULL, 0, NULL}, 59 62 {(char *) "IDESCRIBE", AF_NOPROG, NULL, 0, NULL}, … … 86 89 {(char *) "OFAILURE", AF_NOPROG, NULL, 0, NULL}, 87 90 {(char *) "OFOLLOW", AF_NOPROG, NULL, 0, NULL}, 91 {(char *) "OGIVE", AF_NOPROG, NULL, 0, NULL}, 88 92 {(char *) "OIDESCRIBE", AF_NOPROG, NULL, 0, NULL}, 89 93 {(char *) "OLEAVE", AF_NOPROG, NULL, 0, NULL}, … … 91 95 {(char *) "OMOVE", AF_NOPROG, NULL, 0, NULL}, 92 96 {(char *) "OPAYMENT", AF_NOPROG, NULL, 0, NULL}, 97 {(char *) "ORECEIVE", AF_NOPROG, NULL, 0, NULL}, 93 98 {(char *) "OXMOVE", AF_NOPROG, NULL, 0, NULL}, 94 99 {(char *) "OSUCCESS", AF_NOPROG, NULL, 0, NULL}, … … 102 107 {(char *) "PAYMENT", AF_NOPROG, NULL, 0, NULL}, 103 108 {(char *) "PREFIX", AF_NOPROG, NULL, 0, NULL}, 109 {(char *) "RECEIVE", AF_NOPROG, NULL, 0, NULL}, 104 110 {(char *) "QUEUE", AF_MDARK | AF_WIZARD, NULL, 0, NULL}, 105 111 1.7.3/hdrs/attrib.h
r267 r269 1 1 #ifndef _ATTRIB_H 2 2 #define _ATTRIB_H 3 4 typedef int dbref; /* offset into db */5 6 /* new attribute foo */7 typedef struct attr ATTR;8 3 9 4 /* the attribute structure */ … … 16 11 }; 17 12 18 struct boolatr { 19 char *name; /* which attribute? */ 20 unsigned char *text; 21 }; 13 /* Stuff that's actually in atr_tab.c */ 14 extern ATTR *aname_hash_lookup _((const char *name)); 15 extern void do_attribute_access 16 _((dbref player, char *name, char *perms, int retroactive)); 17 extern void do_attribute_delete _((dbref player, char *name)); 18 extern void do_attribute_rename _((dbref player, char *old, char *newname)); 19 extern void do_attribute_info _((dbref player, char *name)); 20 extern void do_list_attribs _((dbref player, int lc)); 21 22 /* From attrib.c */ 23 extern ATTR *atr_match _((char const *string)); 24 extern void atr_new_add _((dbref thing, char const *atr, char const *s, 25 dbref player, int flags)); 26 extern int atr_add _((dbref thing, char const *atr, char const *s, 27 dbref player, int flags)); 28 extern int atr_clr _((dbref thing, char const *atr, dbref player)); 29 extern ATTR *atr_get _((dbref thing, char const *atr)); 30 extern ATTR *atr_get_noparent _((dbref thing, char const *atr)); 31 #ifdef CAN_TAKE_ARGS_IN_FP 32 extern int atr_iter_get _((dbref player, dbref thing, char const *name, 33 int (*func) 34 _((dbref player, dbref thing, 35 char const *pattern, ATTR *atr, void *args)), 36 void *args)); 37 #else 38 extern int atr_iter_get _((dbref player, dbref thing, char const *name, 39 int (*func) (), void *args)); 40 #endif 41 extern ATTR *atr_complete_match _((dbref player, char const *atr, dbref privs)); 42 extern void atr_free _((dbref thing)); 43 extern void atr_cpy _((dbref dest, dbref source)); 44 extern char const *const convert_atr _((int oldatr)); 45 extern int atr_comm_match _((dbref thing, dbref player, int type, int end, 46 char const *str, int just_match, char **atrname)); 47 extern int do_set_atr 48 _((dbref thing, char const *atr, char const *s, dbref player, int flags)); 49 extern void do_atrlock _((dbref player, char const *arg1, char const *arg2)); 50 extern void do_atrchown _((dbref player, char const *arg1, char const *arg2)); 51 extern int string_to_atrflag _((dbref player, const char *p)); 52 22 53 23 54 /* possible attribute flags */ … … 53 84 #endif 54 85 55 typedef ATTR ALIST;56 57 86 #define AL_ATTR(alist) (alist) 58 87 #define AL_NAME(alist) ((alist)->name) 1.7.3/hdrs/command.h
r267 r269 1 1 #ifndef __COMMAND_H 2 2 #define __COMMAND_H 3 4 #include "config.h"5 #include "confmagic.h"6 3 7 4 #define NUM_BYTES 20 … … 83 80 #ifdef CAN_NEWSTYLE 84 81 #define COMMAND(command_name) \ 85 void command_name _((COMMAND_INFO *cmd, dbref player, dbref cause, switch_mask sw,char *raw, char *switches, char *args_raw, \ 82 void command_name _((COMMAND_INFO *cmd, dbref player, dbref cause, \ 83 switch_mask sw,char *raw, char *switches, char *args_raw, \ 86 84 char *arg_left, char *args_left[MAX_ARG], \ 87 85 char *arg_right, char *args_right[MAX_ARG])); \ … … 175 173 }; 176 174 177 #include "cmds.h"178 179 175 #define SWITCH_NONE 0 180 176 #include "switches.h" … … 218 214 extern void do_list_commands _((dbref player, int lc)); 219 215 extern int command_check_byname _((dbref player, const char *name)); 216 extern int restrict_command _((const char *name, const char *restriction)); 217 extern void reserve_aliases _((void)); 218 extern void local_commands _((void)); 220 219 221 220 #endif /* __COMMAND_H */ 1.7.3/hdrs/conf.h
r267 r269 6 6 #include "copyrite.h" 7 7 #include "options.h" 8 #include "mushtype.h" 8 9 9 10 #ifdef __GNUC__ … … 71 72 72 73 /* --- DO NOT CHANGE ANYTHING BELOW THIS LINE --- */ 74 /* From conf.c */ 75 extern void do_config_list _((dbref player, const char *type, int lc)); 73 76 74 77 typedef struct fblock_header FBLKHDR; … … 250 253 long dbck_counter; 251 254 int max_attrcount; 252 #ifdef FLOATING_POINTS253 255 int float_precision; 254 #endif255 256 }; 256 257 … … 397 398 #define MUSH_IP_ADDR (options.ip_addr) 398 399 #define MAX_ATTRCOUNT (options.max_attrcount) 399 #ifdef FLOATING_POINTS400 400 #define FLOAT_PRECISION (options.float_precision) 401 #endif402 401 #ifdef WIN32 403 402 /* --------------- Stuff for Win32 services ------------------ */ 1.7.3/hdrs/dbdefs.h
r267 r269 11 11 #include <time.h> 12 12 #endif 13 #include "attrib.h"14 #include "options.h"15 13 16 14 extern int depth; 17 18 typedef int object_flag_type;19 20 #ifdef CHAT_SYSTEM21 /* Must come after dbref is defined */22 #include "extchat.h"23 #endif24 15 25 16 extern dbref first_free; /* pointer to free list */ … … 27 18 /* macro to make set string easier to use */ 28 19 #define SET(a,b) set_string(&(a),b) 29 30 /* set macro for compressed strings */31 32 #ifdef COMPRESS33 #define SETC(a,b) SET(a,compress(b))34 #else35 #define SETC(a,b) SET(a,b)36 #endif /* COMPRESS */37 20 38 21 /*------------------------------------------------------------------------- … … 239 222 */ 240 223 241 /* Boolean expressions, for locks */242 typedef char boolexp_type;243 #define BOOLEXP_AND 0244 #define BOOLEXP_OR 1245 #define BOOLEXP_NOT 2246 #define BOOLEXP_CONST 3247 #define BOOLEXP_ATR 4248 #define BOOLEXP_IND 5249 #define BOOLEXP_CARRY 6250 #define BOOLEXP_IS 7251 #define BOOLEXP_OWNER 8252 #define BOOLEXP_EVAL 9253 #define BOOLEXP_NULL 127 /* Mark a lack of a boolexp */254 255 struct boolexp {256 boolexp_type type; /* and, or, not, indirect, is, carry, etc. */257 struct boolexp *sub1; /* first part of lock */258 struct boolexp *sub2; /* second part of lock */259 dbref thing; /* thing refers to an object */260 struct boolatr *atr_lock;261 };262 263 #define TRUE_BOOLEXP ((struct boolexp *) 0)264 265 /* special dbref's */266 #define NOTHING (-1) /* null dbref */267 #define AMBIGUOUS (-2) /* multiple possibilities, for matchers */268 #define HOME (-3) /* virtual room, represents mover's home */269 #define ANY_OWNER (-2) /* For lstats and @stat */270 271 224 struct object { 272 225 const char *name; … … 326 279 extern dbref db_top; 327 280 328 extern const char *alloc_string _((void));329 extern dbref new_object _((void));330 extern void putstring _((FILE * f, const char *s));331 extern long getref _((FILE * f));332 extern void putref _((FILE * f, long int ref));333 extern const char *getstring_noalloc _((FILE * f));334 extern struct boolexp *getboolexp _((FILE * f));335 extern void putboolexp _((FILE * f, struct boolexp * b));336 extern int db_write_object _((FILE * f, dbref i));337 extern dbref db_write _((FILE * f, int flag));338 extern dbref db_read _((FILE * f));339 /* Warning: destroys existing db contents! */340 extern void free_bool _((struct boolexp * b));341 extern struct boolexp *dup_bool _((struct boolexp * b));342 extern struct boolexp *alloc_bool _((void));343 extern void free_boolexp _((struct boolexp * b));344 extern void db_free _((void));345 extern dbref parse_dbref _((const char *s));346 extern void putlocks _((FILE * f, struct lock_list *l));347 extern void getlocks _((dbref i, FILE * f));348 extern void get_old_locks _((dbref i, FILE * f));349 350 281 #define DOLIST(var, first)\ 351 282 for((var) = (first); GoodObject((var)); (var) = Next(var)) … … 373 304 #endif /* USE_MAILER */ 374 305 375 /* log types */376 #define LT_ERR 0377 #define LT_CMD 1378 #define LT_WIZ 2379 #define LT_CONN 3380 #define LT_TRACE 4381 #define LT_RPAGE 5 /* Obsolete */382 #define LT_CHECK 6383 #define LT_HUH 7384 385 /* tokens for locks */386 #define NOT_TOKEN '!'387 #define AND_TOKEN '&'388 #define OR_TOKEN '|'389 #define AT_TOKEN '@'390 #define IN_TOKEN '+'391 #define IS_TOKEN '='392 #define OWNER_TOKEN '$'393 394 306 #endif /* __DBDEFS_H */ 1.7.3/hdrs/extchat.h
r267 r269 51 51 struct chanuser *next; 52 52 }; 53 typedef struct chanuser CHANUSER;54 53 55 54 /* Flags and macros for channel users */ … … 87 86 struct channel *next; /* Next in linked list */ 88 87 }; 89 typedef struct channel CHAN;90 88 91 89 struct chanlist { … … 93 91 struct chanlist *next; 94 92 }; 95 typedef struct chanlist CHANLIST; 93 96 94 #define Chanlist(x) db[(x)].channels 97 95 … … 195 193 extern void do_chan_title 196 194 _((dbref player, const char *name, const char *title)); 195 extern void do_channel_who _((dbref player, CHAN *chan)); 196 197 /* From chat.c */ 198 extern void init_chat _((void)); 199 extern void do_channel 200 _((dbref player, const char *name, const char *target, const char *com)); 201 extern void do_chat _((dbref player, CHAN *chan, const char *arg1)); 202 extern void do_chan_admin 203 _((dbref player, char *name, const char *perms, int flag)); 204 extern int find_channel _((const char *p, CHAN **chan)); 205 extern int find_channel_partial _((const char *p, CHAN **chan, dbref player)); 206 extern void do_channel_list _((dbref player, const char *partname)); 207 extern int do_chat_by_name 208 _((dbref player, const char *name, const char *msg, int source)); 209 extern void do_chan_decompile _((dbref player, const char *name, int brief)); 210 extern void do_chan_chown 211 _((dbref player, const char *name, const char *newowner)); 212 197 213 198 214 #endif /* CHAT_SYSTEM */ 1.7.3/hdrs/externs.h
r267 r269 22 22 #include "copyrite.h" 23 23 #include "conf.h" 24 #include "intrface.h"25 /* Prototypes for externs not defined elsewhere */26 #include "parse.h" /* Needed for NVAL */27 #include "mushdb.h"28 #include "attrib.h"29 #ifdef CHAT_SYSTEM30 #include "extchat.h"31 #endif32 24 #include "confmagic.h" 33 25 #ifndef HAS_STRCASECMP … … 35 27 extern int strncasecmp _((const char *s1, const char *s2, Size_t n)); 36 28 #endif 29 30 /* these symbols must be defined by the interface */ 31 extern DESC *cdesc; 32 extern time_t mudtime; 33 34 extern int shutdown_flag; /* if non-zero, interface should shut down */ 35 extern void emergency_shutdown _((void)); 36 extern void boot_desc _((DESC *d)); /* remove a player */ 37 extern DESC *player_desc _((dbref player)); /* find descriptors */ 38 extern DESC *inactive_desc _((dbref player)); /* find descriptors */ 39 extern DESC *port_desc _((int port)); /* find descriptors */ 40 extern void WIN32_CDECL flag_broadcast _((object_flag_type inflags, 41 object_flag_type intoggles, 42 const char *fmt, 43 ...)) 44 __attribute__ ((__format__(__printf__, 3, 4))); 45 46 extern void raw_notify _((dbref player, const char *msg)); 47 extern dbref short_page _((const char *match)); 48 extern void do_doing _((dbref player, const char *message)); 49 50 /* the following symbols are provided by game.c */ 51 52 53 54 #define SBUF_LEN 32 55 #define DOING_LEN 40 56 57 extern void process_command _((dbref player, char *command, 58 dbref cause, int from_port)); 59 extern int init_game_dbs _((void)); 60 extern void init_game_config _((const char *conf)); 61 extern void dump_database _((void)); 62 extern void panic _((const char *message)) __attribute__ ((__noreturn__)); 63 37 64 38 65 #ifdef WIN32 … … 41 68 extern void kill_timer _((void)); 42 69 #endif /* WIN32 */ 43 44 /* From attrib.c */45 extern struct boolatr *alloc_atr _((const char *name, char *s));46 extern ATTR *atr_match _((char const *string));47 extern void atr_new_add _((dbref thing, char const *atr, char const *s,48 dbref player, int flags));49 extern int atr_add _((dbref thing, char const *atr, char const *s,50 dbref player, int flags));51 extern int atr_clr _((dbref thing, char const *atr, dbref player));52 extern ATTR *atr_get _((dbref thing, char const *atr));53 extern ATTR *atr_get_noparent _((dbref thing, char const *atr));54 #ifdef CAN_TAKE_ARGS_IN_FP55 extern int atr_iter_get _((dbref player, dbref thing, char const *name,56 int (*func)57 _((dbref player, dbref thing,58 char const *pattern, ATTR *atr, void *args)),59 void *args));60 #else61 extern int atr_iter_get _((dbref player, dbref thing, char const *name,62 int (*func) (), void *args));63 #endif64 extern ATTR *atr_complete_match _((dbref player, char const *atr, dbref privs));65 extern void atr_free _((dbref thing));66 extern void atr_cpy _((dbref dest, dbref source));67 extern char const *const convert_atr _((int oldatr));68 extern int atr_comm_match _((dbref thing, dbref player, int type, int end,69 char const *str, int just_match, char **atrname));70 extern int do_set_atr71 _((dbref thing, char const *atr, char const *s, dbref player, int flags));72 extern void do_atrlock _((dbref player, char const *arg1, char const *arg2));73 extern void do_atrchown _((dbref player, char const *arg1, char const *arg2));74 extern int string_to_atrflag _((dbref player, const char *p));75 70 76 71 /* From bsd.c */ … … 81 76 extern FILE *cmdlog_fp; 82 77 extern int restarting; 78 #ifdef USE_MAILER 83 79 extern struct mail *desc_mail _((dbref player)); 80 extern void desc_mail_set _((dbref player, struct mail * mp)); 81 #endif 84 82 #ifdef SUN_OS 85 83 extern int f_close _((FILE * file)); … … 87 85 #endif 88 86 extern int hidden _((dbref player)); 89 extern void kill_info_slave _((void));90 87 void dump_reboot_db _((void)); 91 88 … … 139 136 #define safe_uncompress(s) (strdup((char *) s)) 140 137 #endif 141 142 /* From conf.c */143 extern void do_config_list _((dbref player, const char *type, int lc));144 138 145 139 /* From cque.c */ … … 167 161 extern dbref do_clone _((dbref player, char *name, int preserve)); 168 162 169 /* From flags.c */170 extern const char *unparse_flags _((dbref thing, dbref player));171 extern const char *flag_description _((dbref player, dbref thing));172 extern object_flag_type find_flag173 _((char *name, int type, int *toggle, int is_conf));174 extern int sees_flag _((dbref privs, dbref thing, char *name));175 extern int handle_flaglists _((dbref player, char *name, char *fstr, int type));176 extern void set_flag177 _((dbref player, dbref thing, char *flag, int negate, int hear, int listener));178 extern const char *power_description _((dbref thing));179 extern object_flag_type find_power _((const char *name));180 181 163 /* From game.c */ 182 164 extern void report _((void)); … … 188 170 extern void fork_and_dump _((int forking)); 189 171 190 /* From log.c */191 extern void start_all_logs _((void));192 extern void end_all_logs _((void));193 extern void WIN32_CDECL do_log194 _((int logtype, dbref player, dbref object, const char *fmt, ...))195 __attribute__ ((__format__(__printf__, 4, 5)));196 extern void WIN32_CDECL do_rawlog _((int logtype, const char *fmt, ...))197 __attribute__ ((__format__(__printf__, 2, 3)));198 199 extern void do_logwipe _((dbref player, int logtype, char *str));200 201 172 /* From look.c */ 202 173 extern void look_room _((dbref player, dbref loc, int flag)); 203 174 extern void do_look_around _((dbref player)); 204 175 extern void do_look_at _((dbref player, const char *name, int key)); 205 206 #ifdef USE_MAILER207 /* From mail.c */208 extern struct mail *maildb;209 extern void do_mail_clear _((dbref player, char *msglist));210 extern void do_mail_purge _((dbref player));211 extern void set_player_folder _((dbref player, int fnum));212 extern void add_folder_name _((dbref player, int fld, const char *name));213 extern struct mail *find_exact_starting_point _((dbref player));214 extern void check_mail _((dbref player, int folder, int silent));215 extern int dump_mail _((FILE * fp));216 extern int load_mail _((FILE * fp));217 extern void mail_init _((void));218 extern int mdb_top;219 #endif /* USE_MAILER */220 176 221 177 /* From move.c */ … … 239 195 extern int password_check _((dbref player, const char *password)); 240 196 extern dbref lookup_player _((const char *name)); 197 /* from player.c */ 198 extern dbref create_player _((const char *name, const char *password, 199 const char *host, const char *ip)); 200 extern dbref connect_player _((const char *name, const char *password, 201 const char *host, const char *ip)); 202 extern void check_last _((dbref player, const char *host, const char *ip)); 203 extern void check_lastfailed _((dbref player, const char *host)); 241 204 242 205 /* From plyrlist.c */ … … 254 217 const char *def, const char *owhat, const char *odef, 255 218 const char *awhat, dbref loc)); 219 extern void real_did_it _((dbref player, dbref thing, const char *what, 220 const char *def, const char *owhat, const char *odef, 221 const char *awhat, dbref loc, char *myenv[10])); 256 222 extern int can_see _((dbref player, dbref thing, int can_see_loc)); 257 223 extern int controls _((dbref who, dbref what)); … … 279 245 /* From set.c */ 280 246 extern void do_edit _((dbref player, dbref thing, char *q, char **argv)); 281 extern void do_chzone _((dbref player, const char *name, const char *newobj));282 extern void do_parent _((dbref player, char *name, char *parent_name));283 extern int do_set _((dbref player, const char *name, char *flag));284 extern void do_name _((dbref player, const char *name, char *newname));285 247 extern void chown_object 286 248 _((dbref player, dbref thing, dbref newowner, int preserve)); 287 extern void do_wipe _((dbref player, char *name));288 249 289 250 /* From speech.c */ … … 300 261 extern void notify_except2 301 262 _((dbref first, dbref exc1, dbref exc2, const char *msg)); 302 extern void do_pemit_list _((dbref player, char *list, const char *message));303 263 extern int filter_found _((dbref thing, const char *msg, int flag)); 304 extern void do_oemit_list _((dbref player, char *list, const char *message));305 264 306 265 /* From strutil.c */ … … 417 376 _((dbref creator, const char *player_name, const char *player_password)); 418 377 extern void do_chownall _((dbref player, const char *name, const char *target)); 419 extern void do_teleport _((dbref player, const char *arg1, const char *arg2));420 378 421 379 /* From function.
