Changeset 519

Timestamp:

08/16/06 02:58:08 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.8.1p4 Archival

Files:

• 1.8.1/CHANGES.180 (modified) (1 diff)
• 1.8.1/CHANGES.181 (modified) (1 diff)
• 1.8.1/MANIFEST (modified) (1 diff)
• 1.8.1/Makefile.SH (modified) (1 diff)
• 1.8.1/Patchlevel (modified) (1 diff)
• 1.8.1/game/txt/hlp/pennattr.hlp (modified) (4 diffs)
• 1.8.1/game/txt/hlp/pennchat.hlp (modified) (4 diffs)
• 1.8.1/game/txt/hlp/penncmd.hlp (modified) (4 diffs)
• 1.8.1/game/txt/hlp/pennfunc.hlp (modified) (10 diffs)
• 1.8.1/game/txt/hlp/pennmail.hlp (modified) (2 diffs)
• 1.8.1/game/txt/hlp/pennv180.hlp (modified) (1 diff)
• 1.8.1/game/txt/hlp/pennv181.hlp (modified) (2 diffs)
• 1.8.1/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.8.1/hdrs/atr_tab.h (modified) (1 diff)
• 1.8.1/hdrs/conf.h (modified) (2 diffs)
• 1.8.1/hdrs/externs.h (modified) (2 diffs)
• 1.8.1/hdrs/extmail.h (modified) (1 diff)
• 1.8.1/hdrs/game.h (modified) (1 diff)
• 1.8.1/hdrs/mushtype.h (modified) (1 diff)
• 1.8.1/hdrs/myssl.h (modified) (1 diff)
• 1.8.1/hdrs/version.h (modified) (1 diff)
• 1.8.1/src/Makefile.SH (modified) (17 diffs)
• 1.8.1/src/bsd.c (modified) (12 diffs)
• 1.8.1/src/cmds.c (modified) (1 diff)
• 1.8.1/src/command.c (modified) (8 diffs)
• 1.8.1/src/conf.c (modified) (20 diffs)
• 1.8.1/src/extchat.c (modified) (8 diffs)
• 1.8.1/src/extmail.c (modified) (4 diffs)
• 1.8.1/src/flags.c (modified) (1 diff)
• 1.8.1/src/function.c (modified) (5 diffs)
• 1.8.1/src/funlist.c (modified) (1 diff)
• 1.8.1/src/funmisc.c (modified) (2 diffs)
• 1.8.1/src/funstr.c (modified) (4 diffs)
• 1.8.1/src/game.c (modified) (1 diff)
• 1.8.1/src/help.c (modified) (8 diffs)
• 1.8.1/src/local.dst (modified) (1 diff)
• 1.8.1/src/myrlimit.c (added)
• 1.8.1/src/myssl.c (modified) (3 diffs)
• 1.8.1/src/notify.c (modified) (17 diffs)
• 1.8.1/src/speech.c (modified) (2 diffs)
• 1.8.1/src/unparse.c (modified) (1 diff)
• 1.8.1/win32/cmds.h (modified) (1 diff)
• 1.8.1/win32/funs.h (modified) (6 diffs)

1.8.1/CHANGES.180

@@ -12 +12 @@
-
-==========================================================================
+
+Version 1.8.0 patchlevel 9                      December 12, 2005
+
+Fixes:
+  * On amd64 systems running FreeBSD (and possibly others), connections
+    could break after about 32 connections. Report by nails@M*U*S*H.
+  * The CONF and CONFGROUP structures are renamed PENNCONF and
+    PENNCONFGROUP to work around brokenness in Debian's openssl0.9.8
+    package.
+
-
-Version 1.8.0 patchlevel 8                      September 15, 2005

1.8.1/CHANGES.181

@@ -13 +13 @@
-
-==========================================================================
+
+Version 1.8.1 patchlevel 4                      December 6, 2005
+
+Major Changes:
+  * Errors in matching switches to commands are ignored when the
+    command is hook/ignored or hook/overriden, so you can override
+    a built-in command and provide your own switches. Suggested by
+    Trinsec@M*U*S*H.
+Mail:
+  * @mailfilter attribute causes incoming mail to be be automatically
+    filed to a folder if it evaluates to a folder name/number.
+    Patch by Sketch@M*U*S*H.
+Commands:
+  * @prompt/@nsprompt work like @pemit/list, but add a telnet GOAHEAD
+    at the end of the message when emitting to players; players whose
+    clients handle GOAHEAD (e.g. tf) will get the message displayed
+    as a prompt in the input window. Suggested by Trinsec@M*U*S*H.
+  * The PROMPT_NEWLINES socket command can be used to add a newline
+    after the GOAHEAD in a prompt, for clients that mix up prompt
+    lines with other output.
+Functions:
+  * namegrab() and namegraball(). Patch by Walker@M*U*S*H.
+  * prompt() and nsprompt() (the function equivalents of @prompt/@nsprompt).
+  * textentries(). Suggested by Trinsec@M*U*S*H.
+  * cdesc(), cusers(), cmsgs(), cbuffer(), cstatus(), clflags() 
+    functions. Suggested by d'Ark@M*U*S*H.
+  * numversion() returns Penn version as an integer (1008001004) 
+    for softcode use.
+Minor changes:
+  * @chan/list works better for people who increase CHAN_NAME_LEN.
+    Suggested by Trinsec@M*U*S*H.
+  * Help fixes by Trinsec@M*U*S*H, Chili@M*U*S*H.
+  * Several powers (tport_anything, tport_anywhere, no_money, no_quota,
+    debit, sql_ok) are now aliased to TinyMUSH/TinyMUX equivalents
+    as well, for better code portability. [3,MUX]
+Fixes:
+  * center() behaves better when given a fourth argument but
+    not a third one. Also fixes to cases where the right fill
+    string is one longer than the left. Report by Ian@M*U*S*H
+  * Fixes from 1.8.0p9.
+
-
-Version 1.8.1 patchlevel 3                      September 15, 2005

1.8.1/MANIFEST

@@ -100 +100 @@
-src/mycrypt.c
-src/mymalloc.c
+src/myrlimit.c
-src/mysocket.c
-src/myssl.c

1.8.1/Makefile.SH

@@ -130 +130 @@
-    "LDFLAGS=$(LDFLAGS)" "CLIBS=$(CLIBS)" )
-
+ssl_slave:
+    (cd src; make ssl_slave "CC=$(CC)" "CCFLAGS=$(CCFLAGS)" \
+    "LDFLAGS=$(LDFLAGS)" "CLIBS=$(CLIBS)" "MAKE=$(MAKE)" \
+    "MAKEFLAGS=$(MAKEFLAGS)")
+
-versions: CHANGES*
-    -@rm -rf CHANGES*~ CHANGES*bak

1.8.1/Patchlevel

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

1.8.1/game/txt/hlp/pennattr.hlp

@@ -1 +1 @@
-& ATTRIBUTE TREES
-& ATTR TREES
+& ATTRIB TREES
+& `
-Attributes can be arranged in a hierarchical tree; these are called
-"attribute trees", and a conceptually similar to the way that
@@ -26 +28 @@
-& ATTRIBUTE TREES2
-& ATTR TREES2
+& ATTRIB TREES2
+& `2
+Attributes can be arranged in a hierarchical tree; these are called
-Attribute trees provide two immediate benefits. First, they reduce
-spam when examining objects. The usual * and ? wildcards for attributes
@@ -47 +52 @@
-& ATTRIBUTE TREES3
-& ATTR TREES3
+& ATTRIB TREES3
+& `3
-The second benefit of attributes trees is convenient access control.
-Attribute flags that restrict attribute access or execution
@@ -71 +78 @@
-& ATTRIBUTE TREES4
-& ATTR TREES4
+& ATTRIB TREES4
+& `4
-Attribute trees interact with @parent in several ways.
-

1.8.1/game/txt/hlp/pennchat.hlp

@@ -246 +246 @@
-  ctitle(<channel>,<object>)
-
-s>
+>'s
-  be able to examine the object, or it must visible be on a channel
-  which you are allowed to join.
+& CSTATUS()
+  cstatus(<channel>,<object>)
+
+  Returns <object>'s status with respect to <channel>, which may be
+  "Off", "On", or "Gag". You must either be able to examine the object,
+  or it must visible be on the channel; "Off" is returned for
+  objects that you can not see on the channel.
+& CDESC()
+& CUSERS()
+& CMSGS()
+& CBUFFER()
+  cdesc(<channel>)
+  cusers(<channel>)
+  cmsgs(<channel>)
+  cbuffer(<channel>)
+
+  Return the description, number of users, number of messages,
+  or buffer size of <channel>, respectively. This information is
+  also displayed in @chan/list.
-& CWHO()
-  cwho(<channel>)
@@ -265 +284 @@
-  cflags(<channel>)
-  cflags(<channel>,<object>)
+  clflags(<channel>)
+  clflags(<channel>,<object>)
-
-  With one argument, cflags() returns a list of flags set on the
@@ -278 +299 @@
-  to use this function. If the object is not on the channel, an
-  error is returned.
+
+  The clflags versions return a space-separated list of flag names,
+  rather than a string of flag characters.
-& CHANNELS()
-  channels([<delimiter>])
@@ -309 +333 @@
-  Channel functions work with the channel system.
-
-
-
+
+
+

1.8.1/game/txt/hlp/penncmd.hlp

@@ -58 +58 @@
-  @halt          @lemit         @listmotd      @mail          @map
-  @notify        @nsemit        @nslemit       @nsoemit       @nspemit
-remit       @nszemit       @oemit         @password      @pemit
-s            @remit         @restart       @scan          @search
-elect        @stats         @sweep         @switch        @teleport
-trigger       @verb          @version       @wait          @whereis
-
+prompt      @nsremit       @nszemit       @oemit         @password      
+emit         @prompt        @ps            @remit         @restart       
+can          @search        @select        @stats         @sweep         
+switch        @teleport      @trigger       @verb          @version       
+wait          @whereis       @
-
-& @-WIZARD
@@ -2281 +2281 @@
-& @nszemit
-& @nsoemit
+& @nsprompt
-  @nsemit[/<switch>] [<message>]
-  @nslemit[/<switch>] <message>
-  @nspemit[/switches] <object>=<message>
+  @nsprompt[/switches] <object>=<message>
-  @nsremit[/switches] <object> = <message>.
-  @nsoemit[/<switch>] [<room>/]<object> [<object>...] = <message>
-  @nszemit <zone> = <message>
-
-
+prompt, @
-  @oemit, and @zemit, respectively, but will not include nospoof information.
-  They are meant to be used by commands in the master room where the
@@ -2294 +2296 @@
-  of their respective commands.
-
-
-
+
+
+
-& @odeath
-  @odeath <player> [=<message>]
@@ -2631 +2634 @@
-  This wizard-only command creates a player with the given name and
-  password.
+& @prompt
+  @prompt[/<switch>] <dbref list> = <message>
+
+  A variation of @pemit/list that adds a telnet GOAHEAD control code
+  to the end of messages sent to players. Players with clients
+  that handle GOAHEAD may get the message as a prompt in their
+  client's input area.
+
+  @prompt supports the following @pemit switches: /silent, /noisy,
+  /spoof, /noeval
+
+  See also: @pemit, @nsprompt, prompt(), nsprompt(), PROMPT_NEWLINES
+& PROMPT_NEWLINES
+  PROMPT_NEWLINES <1|0>
+
+  This socket-level command is used to indicate whether a newline should
+  be sent after the telnet GOAHEAD code issued by @prompt/prompt()
+  to telnet-capable clients.  By default, in order to maximize
+  portability, newlines are sent.
+
+  Some clients, like TinyFugue, are smart enough to interpret GOAHEAD and
+  treat prompts specially by putting them into their input window. These
+  clients do not require the newline, and sending the newline results in
+  a blank line in their output window. The 'PROMPT_NEWLINES 0' command
+  can be used to disable the newline and is recommended for users with
+  these clients.
+
+  See also: @prompt, prompt()
-& @pemit
-  @pemit[/<switch>] <object> = <message>

1.8.1/game/txt/hlp/pennfunc.hlp

@@ -101 +101 @@
-
-  cemit()       emit()        lemit()       nsemit()      nslemit()
-remit()     nszemit()     oemit()
-pemit() 
+prompt()    nsremit()     nszemit()     
+oemit()       pemit()       prompt()
-& Connection functions
-  Connection functions return information about the connections open 
@@ -145 +145 @@
-  graball()     index()       insert()      itemize()     items()
-  iter()        last()        ldelete()     map()         match()
-
-
-
-
+
+
+
+
+
-    
-  See also: LISTS
@@ -222 +223 @@
-  null()        objeval()     open()        pcreate()     r-function
-  rand()        s-function    scan()        set()         setq()
-file
-
+entries
+textfile()    
-
-& @@()
@@ -2590 +2591 @@
-
-  Related functions: FULLNAME(), ACCNAME(), INAME() 
+& NAMEGRAB()
+& NAMEGRABALL()
+  namegrab(<dbref list>,<name>)
+  namegraball(<dbref list>,<name>)
+
+  The namegrab() function, when given a list of dbrefs and a name, returns
+  the first dbref in the list that would match <name> as if you were
+  checking num() or locate(). An exact match has priority over non-exact matches.
+
+  namegraball() returns all dbrefs whose names would be matched by<name>.
+
+  eg: @@(#0: Room Zero. #1: One. #2: Master Room)
+    > th namegrab(#0 #1 #2,room)
+    #0
+    > th namegrab(#0 #1 #2,master room)
+    #2
+    > th namegraball(#0 #1 #2,room)
+    #0 #2
-& NAND()
-  nand(<boolean>, <boolean>,...)
@@ -2818 +2837 @@
-& PEMIT()
-& NSPEMIT()
+& PROMPT()
+& NSPROMPT()
-  pemit(<object list>,<message>)
-  nspemit(<object list>,<message>)
-
-
+
+
+
+
-  the @pemit/list command. It returns nothing. It respects page-locks and
-  HAVEN flags on players.
-
-  nspemit() is a wizard-only variation that works like @nspemit/list.
-
+
+
+
+
+
+
-& PI()
-  pi()
@@ -3632 +3660 @@
-  See also: mean(), median()
-& STRCAT()
-
+ [, <string3> ...]
- 
-  Concatenates two strings together, with no space between them.
@@ -3832 +3860 @@
-  other players is restricted to see_all objects.  
-& TEXTFILE()
+& TEXTENTRIES()
-& dynhelp()
-  textfile(<type>,<entry>)
+  textentries(<type>,<entry>[,<separator>])
-
-  textfile() returns the text of entries from cached text files (such as
@@ -3839 +3869 @@
-  so you may want to edit %r's and squish the result if you plan to use
-  the text as a list of words rather than a display.
+
+  textentries() returns the topic names of matching entries. <entry>
+  may include wildcards, in which case a list of matching topic names
+  will be return, separated by the <separator> string if one is
+  provided, and space-separated otherwise.
-
-  Examples: 
@@ -3988 +4023 @@
-  See also: MERGE()
-& TRIM()
+& TRIMPENN()
+& TRIMTINY()
-  trim(<string>[,<character to trim>][,<trim style>])
-  trimpenn(<string>[,<character to trim>][,<trim style>])
@@ -4242 +4279 @@
-
-& VERSION()
-
-
-
-
+
+
+
+
+
+
+
- 
-  Example:
-     > say version()
-
+
+
+
-
-& VISIBLE()

1.8.1/game/txt/hlp/pennmail.hlp

@@ -115 +115 @@
-        This command moves all messages in msg-list from the current
-        folder to a new folder, <folder#>.
+
+  See also: @mailfilter
+& @mailfilter
+& mailfilter
+  The @mailfilter attribute specifies automatic filing of incoming
+  @mail messages into folders. When an @mail message is received,
+  the contents of @mailfilter are evaluated, with the following 
+  arguments passed:
+     %0     dbref of message sender
+     %1     message subject
+     %2     message body
+     %3     message status flags (a string containing U, F, and/or R,
+            for urgent, forwarded, and/or reply, respectively)
+
+  If @mailfilter evaluates to a folder name or number, the message
+  will be filed into that folder. If @mailfilter evaluates to a null
+  string, the message remains in the incoming folder.
+
+  Example: Filter urgent messages into folder 1
+  > @mailfilter me=if(strmatch(%3,*U*),1)
+
+  See also: mail-folders
-& mail-admin
-  
@@ -315 +337 @@
-  pass their @lock/mailforward. An empty @lock/mailforward disallows
-  forwarding to you, and is the default.
-  

1.8.1/game/txt/hlp/pennv180.hlp

@@ +1 @@
+& 1.8.0p9
+Version 1.8.0 patchlevel 9                      December 12, 2005
+
+Fixes:
+  * On amd64 systems running FreeBSD (and possibly others), connections
+    could break after about 32 connections. Report by nails@M*U*S*H.
+  * The CONF and CONFGROUP structures are renamed PENNCONF and
+    PENNCONFGROUP to work around brokenness in Debian's openssl0.9.8
+    package.
+
+
-& 1.8.0p8
-Version 1.8.0 patchlevel 8                      September 15, 2005

1.8.1/game/txt/hlp/pennv181.hlp

@@ -1 @@
-3
+4
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.8.1 patchlevel 4                      December 6, 2005
+
+Major Changes:
+  * Errors in matching switches to commands are ignored when the
+    command is hook/ignored or hook/overriden, so you can override
+    a built-in command and provide your own switches. Suggested by
+    Trinsec@M*U*S*H.
+Mail:
+  * @mailfilter attribute causes incoming mail to be be automatically
+    filed to a folder if it evaluates to a folder name/number.
+    Patch by Sketch@M*U*S*H.
+Commands:
+  * @prompt/@nsprompt work like @pemit/list, but add a telnet GOAHEAD
+    at the end of the message when emitting to players; players whose
+    clients handle GOAHEAD (e.g. tf) will get the message displayed
+    as a prompt in the input window. Suggested by Trinsec@M*U*S*H.
+  * The PROMPT_NEWLINES socket command can be used to add a newline
+    after the GOAHEAD in a prompt, for clients that mix up prompt
+    lines with other output.
+Functions:
+  * namegrab() and namegraball(). Patch by Walker@M*U*S*H.
+  * prompt() and nsprompt() (the function equivalents of @prompt/@nsprompt).
+  * textentries(). Suggested by Trinsec@M*U*S*H.
+  * cdesc(), cusers(), cmsgs(), cbuffer(), cstatus(), clflags() 
+    functions. Suggested by d'Ark@M*U*S*H.
+  * numversion() returns Penn version as an integer (1008001004) 
+    for softcode use.
+Minor changes:
+  * @chan/list works better for people who increase CHAN_NAME_LEN.
+    Suggested by Trinsec@M*U*S*H.
+  * Help fixes by Trinsec@M*U*S*H, Chili@M*U*S*H.
+  * Several powers (tport_anything, tport_anywhere, no_money, no_quota,
+    debit, sql_ok) are now aliased to TinyMUSH/TinyMUX equivalents
+    as well, for better code portability. [3,MUX]
+Fixes:
+  * center() behaves better when given a fourth argument but
+    not a third one. Also fixes to cases where the right fill
+    string is one longer than the left. Report by Ian@M*U*S*H
+  * Fixes from 1.8.0p9.
+
+
+& 1.8.1p3
-Version 1.8.1 patchlevel 3                      September 15, 2005
-

1.8.1/game/txt/hlp/pennvOLD.hlp

@@ -4418 +4418 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
-
+, 4
+, 9
-1.7.7: 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.8.1/hdrs/atr_tab.h

@@ -105 +105 @@
-  {"MAILFILTERS", AF_WIZARD | AF_NOPROG | AF_LOCKED | AF_PREFIXMATCH,
-   NULL_CHUNK_REFERENCE, 0, NULL},
+  {"MAILFILTER", AF_NOPROG | AF_PREFIXMATCH, NULL_CHUNK_REFERENCE, 0, NULL},
-  {"MAILFOLDERS", AF_WIZARD | AF_NOPROG | AF_LOCKED | AF_PREFIXMATCH,
-   NULL_CHUNK_REFERENCE, 0, NULL},

1.8.1/hdrs/conf.h

@@ -94 +94 @@
-  int overridden;       /**< Has the default been overridden? */
-  const char *group;        /**< The option's group name */
-
+PENN
-
-/** Runtime configuration options.
@@ -277 +277 @@
-extern HASHTAB local_options;
-
-
-
-
-
+PENN
+    
+PENN
+PENN
-
-int cf_bool(const char *opt, const char *val, void *loc, int maxval,

1.8.1/hdrs/externs.h

@@ -125 +125 @@
-#define NA_INTER_LOCK  0x10000  /**< Message subject to @lock/interact even if not otherwise marked */
-#define NA_INTERACTION  (NA_INTER_HEAR|NA_INTER_SEE|NA_INTER_PRESENCE|NA_INTER_LOCK)    /**< Message follows interaction rules */
+#define NA_PROMPT       0x20000  /**< Message is a prompt, add GOAHEAD */
-
-/** A notify_anything lookup function type definition */
@@ -159 +160 @@
-/** Basic 'notify player with message */
-#define notify(p,m)           notify_anything(orator, na_one, &(p), NULL, 0, m)
+/** Notify player as a prompt */
+#define notify_prompt(p,m)           notify_anything(orator, na_one, &(p), NULL, NA_PROMPT, m)
-/** Notify puppet with message, even if owner's there */
-#define notify_must_puppet(p,m)           notify_anything(orator, na_one, &(p), NULL, NA_MUST_PUPPET, m)
+/** Notify puppet with message as prompt, even if owner's there */
+#define notify_prompt_must_puppet(p,m)           notify_anything(orator, na_one, &(p), NULL, NA_MUST_PUPPET|NA_PROMPT, m)
-/** Notify player with message, as if from somethign specific */
-#define notify_by(t,p,m)           notify_anything(t, na_one, &(p), NULL, 0, m)

1.8.1/hdrs/extmail.h

@@ -76 +76 @@
-extern struct mail *find_exact_starting_point(dbref player);
-extern void check_mail(dbref player, int folder, int silent);
+extern void check_all_mail(dbref player);
-extern int dump_mail(FILE * fp);
-extern int load_mail(FILE * fp);

1.8.1/hdrs/game.h

@@ -137 +137 @@
-#define PEMIT_LIST   0x2
-#define PEMIT_SPOOF  0x4
+#define PEMIT_PROMPT 0x8
-extern void do_emit(dbref player, const char *tbuf1, int flags);
-extern void do_pemit

1.8.1/hdrs/mushtype.h

@@ -79 +79 @@
-
-/* Descriptor foo */
+/** Using Pueblo, Smial, Mushclient, Simplemu, or some other
+ *  *  pueblo-style HTML aware client */
+#define CONN_HTML 0x1
+/** Using a client that understands telnet options */
+#define CONN_TELNET 0x2
+/** Send a telnet option to test client */
+#define CONN_TELNET_QUERY 0x4
+/** Connection that should be close on load from reboot.db */
+#define CONN_CLOSE_READY 0x8
+/** Validated connection from an SSL concentrator */
+#define CONN_SSL_CONCENTRATOR 0x10
+/** Player would like to receive newlines after prompts, because
+ *  * their client mucks up output after a GOAHEAD */
+#define CONN_PROMPT_NEWLINES 0x20
+/** Default connection, nothing special */
+#define CONN_DEFAULT (CONN_PROMPT_NEWLINES)
+
-#define DOING_LEN 40
-/** Pueblo checksum length.

1.8.1/hdrs/myssl.h

@@ -8 +8 @@
-#ifdef HAS_OPENSSL
-
-void
+char *private_key_file, char *ca_file, int req_client_cert
-SSL *ssl_setup_socket(int sock);
-void ssl_close_connection(SSL * ssl);

1.8.1/hdrs/version.h

@@ -1 +1 @@
-#define VERSION "1.8.1"
-3
-09/15
-3
+4
+12/06
+4

1.8.1/src/Makefile.SH

@@ -66 +66 @@
-    funufun.c game.c help.c htab.c ident.c local.c lock.c log.c look.c \
-    malias.c match.c memcheck.c move.c mycrypt.c mymalloc.c mysocket.c \
-
+rlimit.c my
-    predicat.c privtab.c \
-    ptab.c rob.c services.c set.c shs.c sig.c speech.c sql.c \
@@ -94 +94 @@
-    funufun.o game.o help.o htab.o ident.o local.o lock.o log.o look.o \
-    malias.o match.o memcheck.o move.o mycrypt.o mymalloc.o mysocket.o \
-
+rlimit.o my
-    predicat.o privtab.o \
-    ptab.o rob.o services.o set.o shs.o sig.o speech.o sql.o \
@@ -126 +126 @@
-    $(CC) $(LDFLAGS) $(CCFLAGS) -DINFOSLAVE -o info_slave info_slave.o \
-    ident.o strdup.o sig.o mymalloc.o mysocket.c  $(LIBS)
+
+SSL_SLAVE_OBJS = strdup.o sig.o mymalloc.o mysocket.o myssl.o notify.o myrlimit.o strutil.o ident.o utils.o
+ssl_slave: ssl_slave.c $(SSL_SLAVE_OBJS)
+    @echo "Making ssl_slave."
+    $(CC) $(CCFLAGS) $(IDEFS) -c ssl_slave.c
+    $(CC) $(LDFLAGS) $(CCFLAGS) -o ssl_slave ssl_slave.o \
+    $(SSL_SLAVE_OBJS) $(LIBS)
-
-# ../hdrs/buildinf.h contains build information used by version.c:
@@ -361 +368 @@
-bsd.o: ../hdrs/extmail.h
-bsd.o: ../hdrs/game.h
+bsd.o: ../hdrs/dbio.h
-bufferq.o: ../hdrs/copyrite.h
-bufferq.o: ../config.h
@@ -571 +579 @@
-db.o: ../hdrs/mushtype.h
-db.o: ../hdrs/htab.h
+db.o: ../hdrs/dbio.h
-db.o: ../hdrs/externs.h
-db.o: ../hdrs/compile.h
@@ -587 +596 @@
-db.o: ../hdrs/strtree.h
-db.o: ../hdrs/parse.h
+db.o: ../hdrs/privtab.h
-db.o: ../hdrs/extmail.h
-destroy.o: ../config.h
@@ -640 +650 @@
-extchat.o: ../hdrs/command.h
-extchat.o: ../hdrs/switches.h
+extchat.o: ../hdrs/dbio.h
-extmail.o: ../config.h
-extmail.o: ../hdrs/copyrite.h
@@ -667 +678 @@
-extmail.o: ../hdrs/command.h
-extmail.o: ../hdrs/switches.h
+extmail.o: ../hdrs/dbio.h
-filecopy.o: ../hdrs/copyrite.h
-filecopy.o: ../config.h
@@ -724 +736 @@
-flags.o: ../hdrs/boolexp.h
-flags.o: ../hdrs/log.h
+flags.o: ../hdrs/dbio.h
-flags.o: ../hdrs/oldflags.h
-funcrypt.o: ../hdrs/copyrite.h
@@ -802 +815 @@
-funlist.o: ../hdrs/copyrite.h
-funlist.o: ../config.h
+funlist.o: ../hdrs/ansi.h
-funlist.o: ../hdrs/conf.h
-funlist.o: ../options.h
@@ -821 +835 @@
-funlist.o: ../hdrs/pcre.h
-funlist.o: ../hdrs/match.h
+funlist.o: ../hdrs/command.h
+funlist.o: ../hdrs/switches.h
-funlist.o: ../hdrs/lock.h
-funlist.o: ../hdrs/boolexp.h
@@ -973 +989 @@
-game.o: ../hdrs/function.h
-game.o: ../hdrs/help.h
+game.o: ../hdrs/dbio.h
-help.o: ../config.h
-help.o: ../hdrs/conf.h
@@ -1036 +1053 @@
-local.o: ../hdrs/mushtype.h
-local.o: ../hdrs/htab.h
+local.o: ../hdrs/dbio.h
-local.o: ../hdrs/externs.h
-local.o: ../hdrs/compile.h
@@ -1138 +1156 @@
-malias.o: ../hdrs/pueblo.h
-malias.o: ../hdrs/log.h
+malias.o: ../hdrs/dbio.h
-match.o: ../hdrs/copyrite.h
-match.o: ../config.h
@@ -1324 +1343 @@
-player.o: ../hdrs/lock.h
-player.o: ../hdrs/boolexp.h
+player.o: ../hdrs/parse.h
-player.o: ../hdrs/extmail.h
-plyrlist.o: ../config.h
@@ -1414 +1434 @@
-rob.o: ../hdrs/boolexp.h
-rob.o: ../hdrs/game.h
+rob.o: ../hdrs/case.h
-set.o: ../hdrs/copyrite.h
-set.o: ../config.h
@@ -1437 +1458 @@
-set.o: ../hdrs/boolexp.h
-set.o: ../hdrs/log.h
+set.o: ../hdrs/game.h
-shs.o: ../hdrs/copyrite.h
-shs.o: ../config.h

1.8.1/src/bsd.c

@@ -69 +69 @@
-#ifdef I_UNISTD
-#include <unistd.h>
-#endif
-#ifdef HAS_GETRLIMIT
-#include <sys/resource.h>
-#endif
-#include <limits.h>
@@ -133 +130 @@
-#endif
-#endif
+#ifdef HAS_GETRLIMIT
+void init_rlimit(void);
+#endif
-
-
@@ -173 +173 @@
-char confname[BUFFER_LEN];  /**< Name of the config file */
-char errlog[BUFFER_LEN];    /**< Name of the error log file */
-
-/** Default connection, nothing special */
-#define CONN_DEFAULT 0
-/** Using Pueblo, Smial, Mushclient, Simplemu, or some other
- *  pueblo-style HTML aware client */
-#define CONN_HTML 0x1
-/** Using a client that understands telnet options */
-#define CONN_TELNET 0x2
-/** Send a telnet option to test client */
-#define CONN_TELNET_QUERY 0x4
-/** Connection that should be close on load from reboot.db */
-#define CONN_CLOSE_READY 0x8
-/** Validated connection from an SSL concentrator */
-#define CONN_SSL_CONCENTRATOR 0x10
-
-/** Is this descriptor connected to a telnet-compatible terminal? */
@@ -324 +310 @@
-sig_atomic_t signal_dump_flag = 0;  /**< Have we caught a dump signal? */
-
-#ifdef HAS_GETRLIMIT
-static void init_rlimit(void);
-#endif
-#ifndef BOOLEXP_DEBUGGING
-#ifdef WIN32SERVICES
@@ -349 +332 @@
-static void update_quotas(struct timeval *last, struct timeval *current);
-
-static 
+
-static void shovechars(Port_t port, Port_t sslport);
-static int test_connection(int newsock);
@@ -429 +412 @@
-void reopen_logs(void);
-void load_reboot_db(void);
-#ifdef HAS_GETRLIMIT
-static void
-init_rlimit(void)
-{
-  /* Unlimit file descriptors. */
-  /* Ultrix 4.4 and others may have getrlimit but may not be able to
-   * change number of file descriptors
-   */
-#ifdef RLIMIT_NOFILE
-  struct rlimit *rlp;
-
-  rlp = (struct rlimit *) malloc(sizeof(struct rlimit));
-  if (getrlimit(RLIMIT_NOFILE, rlp)) {
-    perror("init_rlimit: getrlimit()");
-    free(rlp);
-    return;
-  }
-  /* This check seems dumb, but apparently FreeBSD may return 0 for
-   * the max # of descriptors!
-   */
-  if (rlp->rlim_max > rlp->rlim_cur) {
-    rlp->rlim_cur = rlp->rlim_max;
-    if (setrlimit(RLIMIT_NOFILE, rlp))
-      perror("init_rlimit: setrlimit()");
-  }
-  free(rlp);
-#endif
-  return;
-}
-#endif              /* HAS_GETRLIMIT */
-
-#ifdef NT_TCP
@@ -982 +935 @@
-  int newsock;
-#endif
-int
+unsigned long
-
-#ifdef NT_TCP
@@ -2431 +2384 @@
-      queue_newwrite(d, reply, 6);
-      process_output(d);
+      /* Yeah, we still will send GA, which they should treat as a NOP,
+       * but we'd better send newlines, too.
+       */
+      d->conn_flags |= CONN_PROMPT_NEWLINES;
-#ifdef DEBUG_TELNET
-      fprintf(stderr, "GOT IAC DO SGA, sending IAC WILL SGA IAG DO SGA\n");
@@ -2698 +2655 @@
-  } else if (!strncmp(command, "SCREENHEIGHT", 12)) {
-    d->height = parse_integer(command + 12);
+  } else if (!strncmp(command, "PROMPT_NEWLINES", 15)) {
+    if (parse_integer(command + 15))
+      d->conn_flags |= CONN_PROMPT_NEWLINES;
+    else
+      d->conn_flags &= ~CONN_PROMPT_NEWLINES;
-  } else if (SUPPORT_PUEBLO
-         && !strncmp(command, PUEBLO_COMMAND, strlen(PUEBLO_COMMAND))) {
@@ -2822 +2784 @@
-  announce_connect(player, isnew, num); /* broadcast connect message */
-  check_last(player, d->addr, d->ip);   /* set Last, Lastsite, give paycheck */
-folder 0, not silently (i.e. Report lack of mail, too)
+all mail folders. If empty, report lack of mail.
-  queue_eol(d);
-  if (command_check_byname(player, "@MAIL"))
-mail(player, 0, 0
+all_mail(player
-  set_player_folder(player, 0);
-  do_look_around(player);
@@ -4475 +4437 @@
-      if (match->conn_flags & CONN_TELNET)
-    safe_str(" telnet", buff, bp);
+      if (match->conn_flags & CONN_PROMPT_NEWLINES)
+    safe_str(" prompt_newlines", buff, bp);
-#ifdef HAS_OPENSSL
-      if (sslsock && match->ssl)
@@ -4813 +4777 @@
-#define fclose(x) f_close(x)
-#endif              /* SUN_OS */
-
-static int
-how_many_fds(void)
-{
-  /* Determine how many open file descriptors we're allowed
-   * In order, we'll try:
-   * 1. sysconf(_SC_OPEN_MAX) - POSIX.1
-   * 2. OPEN_MAX constant - POSIX.1 limits.h
-   * 3. getdtablesize - BSD (which Config maps to ulimit or NOFILE if need