Changeset 423

Timestamp:

08/12/06 17:18:05 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p12 Archival

Files:

• 1.7.7/CHANGES (modified) (1 diff)
• 1.7.7/CHANGES.176 (added)
• 1.7.7/MANIFEST (modified) (3 diffs)
• 1.7.7/Makefile.SH (modified) (1 diff)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennchat.hlp (modified) (5 diffs)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (3 diffs)
• 1.7.7/game/txt/hlp/penncode.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennflag.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (4 diffs)
• 1.7.7/game/txt/hlp/penntop.hlp (modified) (1 diff)
• 1.7.7/hdrs/command.h (modified) (1 diff)
• 1.7.7/hdrs/dbdefs.h (modified) (1 diff)
• 1.7.7/hdrs/extchat.h (modified) (5 diffs)
• 1.7.7/hdrs/flags.h (modified) (2 diffs)
• 1.7.7/hdrs/htab.h (modified) (1 diff)
• 1.7.7/hdrs/lock.h (modified) (1 diff)
• 1.7.7/hdrs/switches.h (modified) (2 diffs)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/Makefile (modified) (8 diffs)
• 1.7.7/src/SWITCHES (modified) (2 diffs)
• 1.7.7/src/bsd.c (modified) (14 diffs)
• 1.7.7/src/cmds.c (modified) (4 diffs)
• 1.7.7/src/command.c (modified) (6 diffs)
• 1.7.7/src/conf.c (modified) (1 diff)
• 1.7.7/src/create.c (modified) (3 diffs)
• 1.7.7/src/destroy.c (modified) (3 diffs)
• 1.7.7/src/extchat.c (modified) (11 diffs)
• 1.7.7/src/flags.c (modified) (30 diffs)
• 1.7.7/src/funcrypt.c (modified) (1 diff)
• 1.7.7/src/function.c (modified) (29 diffs)
• 1.7.7/src/fundb.c (modified) (6 diffs)
• 1.7.7/src/funlist.c (modified) (9 diffs)
• 1.7.7/src/funmath.c (modified) (9 diffs)
• 1.7.7/src/funmisc.c (modified) (3 diffs)
• 1.7.7/src/funstr.c (modified) (4 diffs)
• 1.7.7/src/funtime.c (modified) (5 diffs)
• 1.7.7/src/funufun.c (modified) (2 diffs)
• 1.7.7/src/game.c (modified) (53 diffs)
• 1.7.7/src/help.c (modified) (9 diffs)
• 1.7.7/src/htab.c (modified) (19 diffs)
• 1.7.7/src/ident.c (modified) (5 diffs)
• 1.7.7/src/info_slave.c (modified) (1 diff)
• 1.7.7/src/lock.c (modified) (24 diffs)
• 1.7.7/src/log.c (modified) (10 diffs)
• 1.7.7/src/look.c (modified) (18 diffs)
• 1.7.7/src/malias.c (modified) (26 diffs)
• 1.7.7/src/match.c (modified) (5 diffs)
• 1.7.7/src/memcheck.c (modified) (6 diffs)
• 1.7.7/src/move.c (modified) (34 diffs)
• 1.7.7/src/mycrypt.c (modified) (2 diffs)
• 1.7.7/src/mymalloc.c (modified) (1 diff)
• 1.7.7/src/notify.c (added)
• 1.7.7/src/parse.c (modified) (1 diff)
• 1.7.7/src/player.c (modified) (1 diff)
• 1.7.7/src/set.c (modified) (1 diff)
• 1.7.7/src/speech.c (modified) (1 diff)
• 1.7.7/src/switchinc.c (modified) (4 diffs)
• 1.7.7/src/wiz.c (modified) (1 diff)
• 1.7.7/utils/mkvershlp.pl (modified) (4 diffs)
• 1.7.7/win32/funs.h (modified) (2 diffs)

1.7.7/CHANGES

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 12                     March 21, 2003
+
+Commands:
+  * @channel/buffer creates a buffer for a channel to store the most
+    recent messages broadcast on the channel. @channel/recall can be 
+    used to recall them. These are not stored across reboots and should
+    be set up by #1's @startup.
+Functions/Substitutions:
+  * accname() gives the accented name of an object (applying @nameaccent).
+  * %~ gives the accented name of the enactor.
+Minor Changes:
+  * The chat-related commands and functions have been moved out
+    of bsd.c and funmisc.c and into extchat.c. Patch by Vadiv@M*U*S*H.
+  * The notification stuff has been moved out of bsd.c and into a new
+    notify.c file.
+  * @name no longer requires a password for changing player names,
+    and ignores one if given. Suggested by Ambrosia@M*U*S*H (and others).
+  * @hook can not be used on the @password or @newpassword commands.
+  * The dump_complete message is also shown after a forking dump,
+    if one is defined. Suggested by Nathan Schuette.
+  * @lock/leave on a room now prevents people within it from leaving
+    via exits or via @tel. Suggested by Peter Bengtson, patch by
+    BlaZe@M*U*S*H.
+Fixes:
+  * Fixes from 1.7.6p8
+  * Cleanup of a few new db[x] mentions in the source to use dbdefs.h
+    macros. Inspired by Vadiv@M*U*S*H.
+  * @command/restrict didn't work properly for most flags, especially
+    new ones. Reported by Caesar and Sholevi@M*U*S*H.
+  * @pemit/list didn't honor NOSPOOF. Patch by Cheetah@M*U*S*H.
+
-
-Version 1.7.7 patchlevel 11                     February 22, 2003

1.7.7/MANIFEST

@@ -1 +1 @@
-Patchlevel
-
+
+
-MANIFEST
-options.h.dist
@@ -93 +94 @@
-src/mymalloc.c
-src/mysocket.c
+src/notify.c
-src/parse.c
-src/pcre.c
@@ -193 +195 @@
-game/txt/hlp/pennpueb.hlp
-game/txt/hlp/penntop.hlp
-
+
+
+
+
+
-game/txt/nws/index.nws
-game/txt/nws/pennmush.nws

1.7.7/Makefile.SH

@@ -122 +122 @@
-versions: CHANGES*
-    -rm -rf CHANGES*~ CHANGES*bak
-/pennvers.hlp
+
-
-safety:

1.7.7/Patchlevel

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

1.7.7/game/txt/hlp/pennchat.hlp

@@ -59 +59 @@
-  a player name as a second argument.
-
-
-
-
-
-
+
+
+
+
+
+
-  @channel/what will show you the channel's name, access information,
-  and a description of the channel's purpose.
-
-detail
+command
-& @channel2
-  @channel/who <channel>
@@ -89 +90 @@
-  @channel/mute <channel> = <yes|no>
-  @channel/gag <channel> = <yes|no>
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-  If you want to remain on a channel but not receive any messages
-  on the channel, use @channel/gag <channel>=yes. To resume hearing,
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-  See "help @channel4" for more.
@@ -135 +139 @@
-  @channel/quiet <channel> = <yes | no>
-  @channel/wipe <channel>
+  @channel/buffer <channel> = <lines>
-  @channel/decompile[/brief] <channel>
-  @channel/chown <channel> = <new owner>
@@ -141 +146 @@
-  The "quiet" switch turns the quiet status of a channel on and off.
-  The "wipe" switch clears a channel of players without deleting it.
+  The "buffer" switch sets the maximum number of full-length lines that
+  the channel will buffer for @chan/recall. Many more shorter lines may
+  actually be buffered. Setting it to 0 turns off buffering.
-
-  The "decompile" and "chown" switches can only be used by Wizards.
@@ -150 +158 @@
-Here's the legend for reading the @channel/list output:
-
-Status
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  Status  Buf
+   4
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+    |
+
-& @clock
-  @clock/join <channel> [= <key>]

1.7.7/game/txt/hlp/penncmd.hlp

@@ -1937 +1937 @@
-  @lock/listen          Who can trigger my @ahear/^-pattern actions
-  @lock/command         Who can trigger my $-pattern commands
-
+ (or room, via exits/@tel)
-  @lock/drop            Who can drop this object or in this room
-  @lock/give            Who can give this object
@@ -2044 +2044 @@
-See also: go, @omove, @oxmove, @amove
-& @name
- [<password>]
+
-
-  Changes the name of <object>, which can be a thing, player, exit,
-  or room. You can refer to object by name, DBREF number, or as "me"
-
+
+
+
+
+
-
-& @newpassword
@@ -2542 +2546 @@
-
-  Sends the message to all contents of <object>, which can be a room,
-
+
+
-
-  The /silent switch stops the remitter from getting feedback if they're

1.7.7/game/txt/hlp/penncode.hlp

@@ -1 @@
-
+
+
-The latest version of this MUSH code is available via anonymous
-FTP, at ftp.pennmush.org, directory /pub/PennMUSH/Source.  It will

1.7.7/game/txt/hlp/pennflag.hlp

@@ -48 +48 @@
-  Z - Shared, Z_Tel
-  
-, Cloudy
+
-  d - Destroy_Ok        e - Enter_Ok            g - Gagged
-  h - Halt              j - Jury_Ok             l - Light             
@@ -54 +54 @@
-  p - Puppet, Paranoid  r - Royalty             s - Suspect
-  t - Transparent       u - Uninspected         v - Verbose
-        
+, Cloudy
-  ^ - Listen_Parent     ~ - Noaccents
----------------------------------------------------------------------

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -1264 +1264 @@
-    You say, "1 1 1 1 0 "
- 
+& ACCNAME()
+  accname(<object>)
+
+  accname() returns the name of object <object>, applying the object's
+  @nameaccent, if any.
+
+  Related functions: NAME(), ACCNAME(), INAME()
-& FULLNAME()
-  fullname(<object>)
@@ -1274 +1281 @@
-  You say, "South;sout;sou;so;s"
-
-
+ACCNAME(), 
-& FUNCTIONS()
-  functions()
@@ -2343 +2350 @@
-  that it will continue to do this for the time being. Don't rely on it.
-
-
+ACCNAME(), 
-& NAND()
-  nand(<boolean>, <boolean>,...)
@@ -3536 +3543 @@
-  'me' refers to the object that supplied the attribute.
- 
- through r(9)
-(%q0 - %q9) are preserved in their initial state. This means that function
-"below" the level of the u() can reset global registers for temporary
-calculations, without needing to worry about "clobbering" the original
-
-
+-r(9) and
+r(A)-r(Z) (%q0-%q9, %qa-%qz) are preserved in their initial state. Thi
+means that functions "below" the level of the u() can reset global
+registers for temporary calculations, without needing to worry about
+"clobbering" the original 
+
-  This makes ulocal() particularly useful for global or shared code which
-  calls arbitrary u() functions, where global register values need to be

1.7.7/game/txt/hlp/penntop.hlp

@@ -1700 +1700 @@
-  master, it is a zone master room (ZMR). ZMRs are like local "master"
-  rooms. Exits in the ZMR are global to that zone, and $commands on
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-  See also: ZONES, MASTER ROOM, EVALUATION

1.7.7/hdrs/command.h

@@ -152 +152 @@
-  const char *switches; /**< Space-separated list of switch names */
-  command_func func;    /**< Function to call when command is run */
-
+<
-  const char *flagstr;  /**< Space-separated list of flags that can use */
-  unsigned int powers;  /**< Powers to which the command is restricted */

1.7.7/hdrs/dbdefs.h

@@ -73 +73 @@
-
-/* Generic type check */
-
+
+
-
-/* Check for a specific one */

1.7.7/hdrs/extchat.h

@@ -34 +34 @@
- * @channel/quiet channel = yes/no
- * @channel/wipe channel
+ * @channel/buffer channel = <maxlines>
+ * @channel/recall channel [= <lines>]
- *
- *------------------------------------------------------------------*/
@@ -92 +94 @@
-  struct boolexp *hidelock; /**< Who may hide from view */
-  struct channel *next;     /**< Next channel in linked list */
+  char *buffer;         /**< Pointer to channel recall buffer start */
+  char *buffer_end;     /**< Pointer to channel recall buffer end */
+  int buffersize;       /**< Size of channel recall buffer */
+  int num_buffered;     /**< Number of lines in the buffer */
-};
-
@@ -140 +146 @@
-#define ChanSeeLock(c) ((c)->seelock)
-#define ChanHideLock(c) ((c)->hidelock)
+#define ChanBuffer(c) ((c)->buffer)
+#define ChanBufferSize(c) ((c)->buffersize)
+#define ChanBufferEnd(c) ((c)->buffer_end)
+#define ChanNumBuffered(c) ((c)->num_buffered)
-#define Channel_Quiet(c)        (ChanType(c) & CHANNEL_QUIET)
-#define Channel_Open(c) (ChanType(c) & CHANNEL_OPEN)
@@ -204 +214 @@
-extern void do_chan_desc(dbref player, const char *name, const char *title);
-extern void do_chan_title(dbref player, const char *name, const char *title);
-
-
+
+
-extern void init_chat(void);
-extern void do_channel
@@ -219 +229 @@
-extern void do_chan_decompile(dbref player, const char *name, int brief);
-extern void do_chan_chown(dbref player, const char *name, const char *newowner);
+extern const char *channel_description(dbref player);
-
-

1.7.7/hdrs/flags.h

@@ -55 +55 @@
-/* From flags.c */
-extern FLAG *flag_hash_lookup(const char *name, int type);
-extern int has_flag(dbref thing, FLAG *f);
-extern int has_flag_by_name(dbref thing, const char *flag, int type);
-extern const char *unparse_flags(dbref thing, dbref player);
@@ -79 +78 @@
-extern int has_bit(object_flag_type bitmask, int bitpos);
-extern int has_all_bits(object_flag_type source, object_flag_type bitmask);
+extern int null_flagmask(object_flag_type source);
-extern int has_any_bits(object_flag_type source, object_flag_type bitmask);
-extern object_flag_type string_to_bits(const char *str);

1.7.7/hdrs/htab.h

@@ -50 +50 @@
-extern char *hash_key(HASHENT *entry);
-extern void hash_resize(HASHTAB *htab, int size);
-extern HASHENT *hash_new(HASHTAB *htab, const char *key);
-extern int hash_add
-  (HASHTAB *htab, const char *key, void *hashdata, int extra_size);

1.7.7/hdrs/lock.h

@@ -54 +54 @@
-struct boolexp *getlock(dbref thing, lock_type type);
-struct boolexp *getlock_noparent(dbref thing, lock_type type);
-lock_list *getlockstruct(dbref thing, lock_type type);
-lock_list *getlockstruct_noparent(dbref thing, lock_type type);
-lock_type match_lock(lock_type type);
-const lock_list *get_lockproto(lock_type type);

1.7.7/hdrs/switches.h

@@ -11 +11 @@
-#define SWITCH_BLIND 10
-#define SWITCH_BRIEF 11
-CHECK
-OWN
-LEAR
-MD
-OMMANDS
-NN
-ECT
-ED
-TENTS
-S
-UNT
-REATE
-DATABAS
-B
-EBUG
-COMPILE
-FAULTS
-LETE
-IMIT
-SCRIBE
-TROY
-ISABLE
-OWN
-STATS
-EMIT
-NABLE
-RR
-XITS
-FILE
-RST
-LAGS
-OLDER
-RWARD
-STATS
-ULL
-NCTIONS
-WD
-GAG
-LOBALS
-HEADER
-RE
-ID
-ILIST
-NVENTORY
-PRINT
-JOIN
-LIST
-OWERCASE
-M
-MBERS
-OD
-RTAL
-TD
-UTE
-NAM
-O
-EVAL
-FLAGCOPY
-IS
-SIG
-PACE
-TIFY
-UKE
-OFF
-N
-UTSIDE
-VERR
-PANIC
-RANOID
-LAYERS
-ORT
-SE
+BUFFER
+ECK
+HOWN
+LEAR
+MD
+MMANDS
+
+
+NECTED
+NTEN
+STS
+OUNT
+CREAT
+ATABASE
+B
+BUG
+COMPILE
+FAULTS
+ETE
+LIMIT
+CRIBE
+ESTROY
+ISABLE
+OWN
+DSTATS
+MIT
+NABLE
+RR
+EXITS
+LE
+IRST
+LAG
+LDERS
+ORWARD
+STATS
+LL
+UNCTIONS
+FWD
+AG
+GLOBALS
+ADER
+ER
+HIDE
+LIST
+NVENTORY
+IPRINT
+JOIN
+IST
+LOWERCAS
+
+EMBERS
+D
+RTAL
+OTD
+MUT
+AME
+
+EVAL
+FLAGCOP
+ISY
+IG
+SPACE
+OTIFY
+NUKE
+FF
+N
+UTS
+OVERRIDE
+NIC
+ARANOID
+LAYERS
+RT
-#define SWITCH_PRESERVE 84
-#define SWITCH_PRINT 85
@@ -91 +91 @@
-#define SWITCH_READ 90
-#define SWITCH_REBOOT 91
-GISTER
-MOVE
-NAM
-STOR
-RICT
-TROACTIVE
-OOM
-S
-YALTY
+CALL
+GISTER
+MOV
+NAM
+ORE
+STRICT
+ETROACTIVE
+
+OMS
-#define SWITCH_SEE 101
-#define SWITCH_SEEFLAG 102

1.7.7/hdrs/version.h

@@ -1 @@
-1 [02/22
-1
-1
+2 [03/21
+2
+2

1.7.7/src/Makefile

@@ -32 +32 @@
-    funlocal.c funmath.c funmisc.c funstr.c funtime.c funufun.c game.c \
-    help.c htab.c ident.c local.c lock.c log.c look.c mycrypt.c mymalloc.c \
-
+notify.c 
-    player.c plyrlist.c predicat.c privtab.c ptab.c rob.c services.c \
-    set.c shs.c sig.c speech.c strdup.c strtree.c strutil.c \
@@ -96 +96 @@
-move.o \
-mysocket.o \
+notify.o \
-parse.o \
-pcre.o \
@@ -360 +361 @@
-bsd.o: ../hdrs/memcheck.h
-bsd.o: ../hdrs/mymalloc.h
-bsd.o: ../hdrs/extchat.h
-bsd.o: ../hdrs/extmail.h
-bsd.o: ../hdrs/attrib.h
@@ -391 +391 @@
-cmds.o: ../hdrs/extmail.h
-cmds.o: ../hdrs/malias.h
-cmds.o: ../hdrs/extchat.h
-cmds.o: ../hdrs/getpgsiz.h
-cmds.o: ../hdrs/parse.h
@@ -417 +416 @@
-command.o: ../hdrs/attrib.h
-command.o: ../hdrs/extmail.h
-command.o: ../hdrs/extchat.h
-command.o: ../hdrs/getpgsiz.h
-command.o: ../hdrs/parse.h
@@ -566 +564 @@
-extchat.o: ../hdrs/dbdefs.h
-extchat.o: ../hdrs/htab.h
+extchat.o: ../hdrs/function.h
+extchat.o: ../hdrs/command.h
+extchat.o: ../hdrs/switches.h
-extmail.o: ../config.h
-extmail.o: ../hdrs/copyrite.h
@@ -684 +685 @@
-fundb.o: ../hdrs/attrib.h
-fundb.o: ../hdrs/function.h
-fundb.o: ../hdrs/extchat.h
-funlist.o: ../hdrs/copyrite.h
-funlist.o: ../config.h
@@ -733 +733 @@
-funmisc.o: ../confmagic.h
-funmisc.o: ../hdrs/version.h
-funmisc.o: ../hdrs/extchat.h
-funmisc.o: ../hdrs/htab.h
-funmisc.o: ../hdrs/flags.h
+funmisc.o: ../hdrs/match.h
+funmisc.o: ../hdrs/mushdb.h
-funmisc.o: ../hdrs/dbdefs.h
-funmisc.o: ../hdrs/parse.h

1.7.7/src/SWITCHES

@@ -10 +10 @@
-BLIND
-BRIEF
+BUFFER
-CHECK
-CHOWN
@@ -89 +90 @@
-READ
-REBOOT
+RECALL
-REMOVE
-RENAME

1.7.7/src/bsd.c

@@ -107 +107 @@
-#include "mymalloc.h"
-
-#ifdef CHAT_SYSTEM
-#include "extchat.h"
-extern CHAN *channels;
-struct na_cpass {
-  CHANUSER *u;
-  int checkquiet;
-};
-
-#endif
-#include "extmail.h"
-#include "attrib.h"
@@ -158 +149 @@
-int shutdown_flag = 0;
-extern int paranoid_dump;   /* from game.c */
+extern void chat_player_announce(dbref player, char *msg);
-
-static int login_number = 0;
@@ -246 +238 @@
-static const char *register_success =
-  "Registration successful! You will receive your password by email.";
-static const char *flushed_message = "\r\n<Output Flushed>\x1B[0m\r\n";
-static const char *shutdown_message = "Going down - Bye";
-static const char *asterisk_line =
@@ -319 +310 @@
-struct timeval *update_quotas(struct timeval *last, struct timeval *current);
-
+static int how_many_fds(void);
-static void shovechars(Port_t port, Port_t sslport);
-static int test_connection(int newsock);
@@ -348 +340 @@
-void shutdownsock(DESC *d);
-DESC *initializesock(int s, char *addr, char *ip);
+int process_output(DESC *d);
+/* Notify.c */
-struct text_block *make_text_block(const unsigned char *s, int n);
-void free_text_block(struct text_block *t);
-void add_to_queue(struct text_queue *q, const unsigned char *b, int n);
-int flush_queue(struct text_queue *q, int n);
-static 
-static int queue_newwrite(DESC *d, const unsigned char *b, int n
-static int queue_string(DESC *d, const char *s
-static int queue_string_eol
-process_output(DESC *d
+
+int queue_eol(DESC *d
+int queue_newwrite(DESC *d, const unsigned char *b, int n
+int queue_string
+queue_string_eol(DESC *d, const char *s
-void freeqs(DESC *d);
-void welcome_user(DESC *d);
@@ -827 +821 @@
-}
-
-enum na_type {
-  NA_ASCII = 0,
-  NA_ANSI,          /* ANSI flag */
-  NA_COLOR,         /* ANSI and COLOR flags */
-  NA_PUEBLO,            /* html */
-  NA_PASCII,            /* Player without any of the above */
-  NA_TANSI,         /* Like above with telnet-aware client */
-  NA_TCOLOR,            /* Like above with telnet-aware client */
-  NA_TPASCII,           /* Like above with telnet-aware client */
-  NA_NANSI,         /* ANSI and NOACCENTS */
-  NA_NCOLOR,            /* ANSI, COLOR, NOACCENTS */
-  NA_NPUEBLO,           /* html & NOACCENTS */
-  NA_NPASCII            /* 11. NOACCENTS */
-};
-#define TA_BGC 0
-#define TA_FGC 1
-#define TA_BOLD 2
-#define TA_REV 3
-#define TA_BLINK 4
-#define TA_ULINE 5
-
-static int na_depth = 0;
-
-#define MESSAGE_TYPES 12
-
-struct notify_strings {
-  unsigned char *message;
-  size_t len;
-  int made;
-};
-
-static int how_many_fds(void);
-static void fillstate(int state[], const unsigned char **f);
-static void ansi_change_state(char *t, char **o, int color, int *state,
-                  int *newstate);
-static enum na_type notify_type(DESC *d);
-static void free_strings(struct notify_strings messages[]);
-static void zero_strings(struct notify_strings messages[]);
-static unsigned char *notify_makestring(const char *message,
-                    struct notify_strings messages[],
-                    enum na_type type);
-
-
-static void
-fillstate(int state[6], const unsigned char **f)
-{
-  const unsigned char *p;
-  int i;
-  int n;
-  p = *f;
-  p++;
-  if (*p != '[') {
-    while (*p && *p != 'm')
-      p++;
-  } else {
-    p++;
-    while (*p && *p != 'm') {
-      if ((*p > '9') || (*p < '0')) {
-    /* Nada */
-      } else if (!(*(p + 1)) || (*(p + 1) == 'm') || (*(p + 1) == ';')) {
-    /* ShortCode */ ;
-    switch (*p) {
-    case '0':
-      for (i = 0; i < 6; i++)
-        state[i] = 0;
-      break;
-    case '1':
-      state[TA_BOLD] = 1;
-      break;
-    case '7':
-      state[TA_REV] = 1;
-      break;
-    case '5':
-      state[TA_BLINK] = 1;
-      break;
-    case '4':
-      state[TA_ULINE] = 1;
-      break;
-    }
-      } else {
-    n = (*p - '0') * 10;
-    p++;
-    n += (*p - '0');
-    if ((n >= 30) && (n <= 37))
-      state[TA_FGC] = n - 29;
-    else if ((n >= 40) && (n <= 47))
-      state[TA_BGC] = n - 39;
-      }
-      p++;
-    }
-  }
-  if ((p != *f) && (*p != 'm'))
-    p--;
-  *f = p;
-}
-
-#define add_ansi_if(x,c) \
-  do { \
-    if (newstate[(x)] && (newstate[(x)]!=state[(x)])) { \
-      if (i) safe_chr(';',t,o); \
-      safe_str((c),t,o); \
-      i=1; \
-    } \
-  } while (0)
-
-static void
-ansi_change_state(char *t, char **o, int color, int *state, int *newstate)
-{
-  int i, n;
-  if ((state[TA_BOLD] && !newstate[TA_BOLD]) ||
-      (state[TA_REV] && !newstate[TA_REV]) ||
-      (state[TA_BLINK] && !newstate[TA_BLINK]) ||
-      (state[TA_ULINE] && !newstate[TA_ULINE]) ||
-      (color && state[TA_FGC] && !newstate[TA_FGC]) ||
-      (color && state[TA_BGC] && !newstate[TA_BGC])) {
-    for (n = 0; n < 6; n++)
-      state[n] = 0;
-    safe_str(ANSI_NORMAL, t, o);
-  }
-  if ((newstate[TA_BOLD] && (newstate[TA_BOLD] != state[TA_BOLD])) ||
-      (newstate[TA_REV] && (newstate[TA_REV] != state[TA_REV])) ||
-      (newstate[TA_BLINK] && (newstate[TA_BLINK] != state[TA_BLINK])) ||
-      (newstate[TA_ULINE] && (newstate[TA_ULINE] != state[TA_ULINE])) ||
-      (color && newstate[TA_FGC] && (newstate[TA_FGC] != state[TA_FGC])) ||
-      (color && newstate[TA_BGC] && (newstate[TA_BGC] != state[TA_BGC]))) {
-    safe_chr(ESC_CHAR, t, o);
-    safe_chr('[', t, o);
-    i = 0;
-    add_ansi_if(TA_BOLD, "1");
-    add_ansi_if(TA_REV, "7");
-    add_ansi_if(TA_BLINK, "5");
-    add_ansi_if(TA_ULINE, "4");
-    if (color) {
-      add_ansi_if(TA_FGC, unparse_integer(newstate[TA_FGC] + 29));
-      add_ansi_if(TA_BGC, unparse_integer(newstate[TA_BGC] + 39));
-    }
-    safe_chr('m', t, o);
-  }
-  for (n = 0; n < 6; n++)
-    state[n] = newstate[n];
-}
-
-#undef add_ansi_if
-
-int html_cols[] = {
-  0xC0C0C0,         /* Default */
-  0x000000,
-  0xC00000,
-  0x00C000,
-  0xC0C000,
-&nbs