PennMUSH Community

Changeset 501

Show
Ignore:
Timestamp:
08/16/06 02:32:24 (2 years ago)
Author:
pennmush
Message:

PennMUSH 1.8.0p9 Archival

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • 1.8.0/CHANGES.180

    r499 r501  
    1212 
    1313========================================================================== 
     14 
     15Version 1.8.0 patchlevel 9                      December 12, 2005 
     16 
     17Fixes: 
     18  * On amd64 systems running FreeBSD (and possibly others), connections 
     19    could break after about 32 connections. Report by nails@M*U*S*H. 
     20  * The CONF and CONFGROUP structures are renamed PENNCONF and 
     21    PENNCONFGROUP to work around brokenness in Debian's openssl0.9.8 
     22    package. 
     23 
    1424 
    1525Version 1.8.0 patchlevel 8                      September 15, 2005 
  • 1.8.0/Patchlevel

    r499 r501  
    11Do not edit this file. It is maintained by the official PennMUSH patches. 
    2 This is PennMUSH 1.8.0p8 
     2This is PennMUSH 1.8.0p9 
  • 1.8.0/game/txt/hlp/pennv180.hlp

    r499 r501  
    1 & 1.8.0p8 
     1& 1.8.0p9 
    22& changes 
    33This is a list of changes in this patchlevel which are probably of 
     
    1212be read in 'help patchlevels'. 
    1313 
     14Version 1.8.0 patchlevel 9                      December 12, 2005 
     15 
     16Fixes: 
     17  * On amd64 systems running FreeBSD (and possibly others), connections 
     18    could break after about 32 connections. Report by nails@M*U*S*H. 
     19  * The CONF and CONFGROUP structures are renamed PENNCONF and 
     20    PENNCONFGROUP to work around brokenness in Debian's openssl0.9.8 
     21    package. 
     22 
     23 
     24& 1.8.0p8 
    1425Version 1.8.0 patchlevel 8                      September 15, 2005 
    1526 
  • 1.8.0/game/txt/hlp/pennvOLD.hlp

    r499 r501  
    44184418type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3' 
    44194419 
    4420 1.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8 
     44201.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 
    442144211.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 
    44224422       19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 
  • 1.8.0/hdrs/conf.h

    r471 r501  
    9292  int overridden;       /**< Has the default been overridden? */ 
    9393  const char *group;        /**< The option's group name */ 
    94 } CONF; 
     94} PENNCONF; 
    9595 
    9696/** Runtime configuration options. 
     
    273273extern HASHTAB local_options; 
    274274 
    275 extern CONF *add_config(const char *name, config_func handler, void *loc, 
    276             int max, const char *group); 
    277 extern CONF *new_config(void); 
    278 extern CONF *get_config(const char *name); 
     275extern PENNCONF *add_config(const char *name, config_func handler, void *loc, 
     276                int max, const char *group); 
     277extern PENNCONF *new_config(void); 
     278extern PENNCONF *get_config(const char *name); 
    279279 
    280280int cf_bool(const char *opt, const char *val, void *loc, int maxval, 
  • 1.8.0/hdrs/version.h

    r499 r501  
    11#define VERSION "1.8.0" 
    2 #define PATCHLEVEL "8
    3 #define PATCHDATE "[09/15/2005]" 
    4 #define NUMVERSION 1008000008 
     2#define PATCHLEVEL "9
     3#define PATCHDATE "[12/12/2005]" 
     4#define NUMVERSION 1008000009 
  • 1.8.0/src/bsd.c

    r485 r501  
    982982  int newsock; 
    983983#endif 
    984   int input_ready, output_ready; 
     984  unsigned long input_ready, output_ready; 
    985985 
    986986#ifdef NT_TCP 
  • 1.8.0/src/conf.c

    r497 r501  
    4040 
    4141static void show_compile_options(dbref player); 
    42 static char *config_list_helper(dbref player, CONF *cp, int lc); 
    43 static char *config_list_helper2(dbref player, CONF *cp, int lc); 
     42static char *config_list_helper(dbref player, PENNCONF * cp, int lc); 
     43static char *config_list_helper2(dbref player, PENNCONF * cp, int lc); 
    4444 
    4545OPTTAB options;     /**< The table of configuration options */ 
     
    5050 
    5151/** Table of all runtime configuration options. */ 
    52 CONF conftable[] = { 
     52PENNCONF conftable[] = { 
    5353  {"input_database", cf_str, options.input_db, sizeof options.input_db, 0, 
    5454   "files"} 
     
    505505  const char *desc;     /**< description of group */ 
    506506  int viewperms;        /**< who can view this group */ 
    507 } CONFGROUP; 
     507} PENNCONFGROUP; 
    508508 
    509509/** The table of all configuration groups. */ 
    510 CONFGROUP confgroups[] = { 
     510PENNCONFGROUP confgroups[] = { 
    511511  {"attribs", "Options affecting attributes", 0}, 
    512512  {"chat", "Chat system options", 0}, 
     
    528528}; 
    529529 
    530 /** Returns a pointer to a newly allocated CONF object. 
    531  * \return pointer to newly allocated CONF object. 
     530/** Returns a pointer to a newly allocated PENNCONF object. 
     531 * \return pointer to newly allocated PENNCONF object. 
    532532 */ 
    533 CONF * 
     533PENNCONF * 
    534534new_config(void) 
    535535{ 
    536   return ((CONF *) mush_malloc(sizeof(CONF), "config")); 
     536  return ((PENNCONF *) mush_malloc(sizeof(PENNCONF), "config")); 
    537537} 
    538538 
     
    547547 * \return pointer to configuration structure or NULL for failure. 
    548548 */ 
    549 CONF * 
     549PENNCONF * 
    550550add_config(const char *name, config_func handler, void *loc, int max, 
    551551       const char *group) 
    552552{ 
    553   CONF *cnf; 
     553  PENNCONF *cnf; 
    554554  if ((cnf = get_config(name))) 
    555555    return cnf; 
     
    567567 
    568568/** Return a local runtime configuration parameter by name. 
    569  * This function returns a point to a configuration structure (CONF *) 
     569 * This function returns a point to a configuration structure (PENNCONF *) 
    570570 * if one exists in the local runtime options that matches the given 
    571571 * name. Only local_options is searched. 
     
    573573 * \return pointer to configuration structure or NULL for failure. 
    574574 */ 
    575 CONF * 
     575PENNCONF * 
    576576get_config(const char *name) 
    577577{ 
    578   return ((CONF *) hashfind(name, &local_options)); 
     578  return ((PENNCONF *) hashfind(name, &local_options)); 
    579579} 
    580580 
     
    821821config_set(const char *opt, char *val, int source, int restrictions) 
    822822{ 
    823   CONF *cp; 
     823  PENNCONF *cp; 
    824824  char *p; 
    825825 
     
    985985    } 
    986986  } 
    987   for (cp = (CONF *) hash_firstentry(&local_options); cp; 
    988        cp = (CONF *) hash_nextentry(&local_options)) { 
     987  for (cp = (PENNCONF *) hash_firstentry(&local_options); cp; 
     988       cp = (PENNCONF *) hash_nextentry(&local_options)) { 
    989989    int i = 0; 
    990990    if ((!source || (cp->group && strcmp(cp->group, "files") != 0 
     
    12071207 
    12081208  FILE *fp = NULL; 
    1209   CONF *cp; 
     1209  PENNCONF *cp; 
    12101210  char tbuf1[BUFFER_LEN]; 
    12111211  char *p, *q, *s; 
     
    13031303      } 
    13041304    } 
    1305     for (cp = (CONF *) hash_firstentry(&local_options); cp; 
    1306      cp = (CONF *) hash_nextentry(&local_options)) { 
     1305    for (cp = (PENNCONF *) hash_firstentry(&local_options); cp; 
     1306     cp = (PENNCONF *) hash_nextentry(&local_options)) { 
    13071307      if (!cp->overridden) { 
    13081308    do_rawlog(LT_ERR, 
     
    13561356do_config_list(dbref player, const char *type, int lc) 
    13571357{ 
    1358   CONFGROUP *cgp; 
    1359   CONF *cp; 
     1358  PENNCONFGROUP *cgp; 
     1359  PENNCONF *cp; 
    13601360 
    13611361  if (SUPPORT_PUEBLO) 
     
    13811381      if (!found) { 
    13821382    /* Ok, maybe a local option? */ 
    1383     for (cp = (CONF *) hash_firstentry(&local_options); cp; 
    1384          cp = (CONF *) hash_nextentry(&local_options)) { 
     1383    for (cp = (PENNCONF *) hash_firstentry(&local_options); cp; 
     1384         cp = (PENNCONF *) hash_nextentry(&local_options)) { 
    13851385      if (cp->group && !strcasecmp(cp->name, type)) { 
    13861386        notify(player, config_list_helper(player, cp, lc)); 
     
    14081408      } 
    14091409    } 
    1410     for (cp = (CONF *) hash_firstentry(&local_options); cp; 
    1411          cp = (CONF *) hash_nextentry(&local_options)) { 
     1410    for (cp = (PENNCONF *) hash_firstentry(&local_options); cp; 
     1411         cp = (PENNCONF *) hash_nextentry(&local_options)) { 
    14121412      if (cp->group && !strcasecmp(cp->group, cgp->name)) { 
    14131413        notify(player, config_list_helper(player, cp, lc)); 
     
    14321432#define MAYBE_LC(x) (lc ? strlower(x) : x) 
    14331433static char * 
    1434 config_list_helper(dbref player __attribute__ ((__unused__)), CONF *cp, int lc) 
     1434config_list_helper(dbref player 
     1435           __attribute__ ((__unused__)), PENNCONF * cp, int lc) 
    14351436{ 
    14361437  static char result[BUFFER_LEN]; 
     
    14721473/* This one doesn't return the names */ 
    14731474static char * 
    1474 config_list_helper2(dbref player __attribute__ ((__unused__)), CONF *cp, int lc 
     1475config_list_helper2(dbref player 
     1476            __attribute__ ((__unused__)), PENNCONF * cp, int lc 
    14751477            __attribute__ ((__unused__))) 
    14761478{ 
     
    15121514FUNCTION(fun_config) 
    15131515{ 
    1514   CONF *cp; 
     1516  PENNCONF *cp; 
    15151517 
    15161518  if (args[0] && *args[0]) { 
     
    15211523      } 
    15221524    } 
    1523     for (cp = (CONF *) hash_firstentry(&local_options); cp; 
    1524      cp = (CONF *) hash_nextentry(&local_options)) { 
     1525    for (cp = (PENNCONF *) hash_firstentry(&local_options); cp; 
     1526     cp = (PENNCONF *) hash_nextentry(&local_options)) { 
    15251527      if (cp->group && !strcasecmp(cp->name, args[0])) { 
    15261528    safe_str(config_list_helper2(executor, cp, 0), buff, bp); 
     
    15351537      safe_chr(' ', buff, bp); 
    15361538    } 
    1537     for (cp = (CONF *) hash_firstentry(&local_options); cp; 
    1538      cp = (CONF *) hash_nextentry(&local_options)) { 
     1539    for (cp = (PENNCONF *) hash_firstentry(&local_options); cp; 
     1540     cp = (PENNCONF *) hash_nextentry(&local_options)) { 
    15391541      safe_str(cp->name, buff, bp); 
    15401542      safe_chr(' ', buff, bp); 
     
    15511553do_enable(dbref player, const char *param, int state) 
    15521554{ 
    1553   CONF *cp; 
     1555  PENNCONF *cp; 
    15541556 
    15551557  for (cp = conftable; cp->name; cp++) { 
  • 1.8.0/src/local.dst

    r477 r501  
    4646   * add_config()'s you plan to do. 
    4747   */ 
    48   hashinit(&local_options, 4, sizeof(CONF)); 
     48  hashinit(&local_options, 4, sizeof(PENNCONF)); 
    4949 
    5050#ifdef EXAMPLE