Changeset 501
- Timestamp:
- 08/16/06 02:32:24 (2 years ago)
- Files:
-
- 1.8.0/CHANGES.180 (modified) (1 diff)
- 1.8.0/Patchlevel (modified) (1 diff)
- 1.8.0/game/txt/hlp/pennv180.hlp (modified) (2 diffs)
- 1.8.0/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
- 1.8.0/hdrs/conf.h (modified) (2 diffs)
- 1.8.0/hdrs/version.h (modified) (1 diff)
- 1.8.0/src/bsd.c (modified) (1 diff)
- 1.8.0/src/conf.c (modified) (20 diffs)
- 1.8.0/src/local.dst (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
1.8.0/CHANGES.180
r499 r501 12 12 13 13 ========================================================================== 14 15 Version 1.8.0 patchlevel 9 December 12, 2005 16 17 Fixes: 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 14 24 15 25 Version 1.8.0 patchlevel 8 September 15, 2005 1.8.0/Patchlevel
r499 r501 1 1 Do not edit this file. It is maintained by the official PennMUSH patches. 2 This is PennMUSH 1.8.0p 82 This is PennMUSH 1.8.0p9 1.8.0/game/txt/hlp/pennv180.hlp
r499 r501 1 & 1.8.0p 81 & 1.8.0p9 2 2 & changes 3 3 This is a list of changes in this patchlevel which are probably of … … 12 12 be read in 'help patchlevels'. 13 13 14 Version 1.8.0 patchlevel 9 December 12, 2005 15 16 Fixes: 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 14 25 Version 1.8.0 patchlevel 8 September 15, 2005 15 26 1.8.0/game/txt/hlp/pennvOLD.hlp
r499 r501 4418 4418 type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3' 4419 4419 4420 1.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8 4420 1.8.0: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 4421 4421 1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 4422 4422 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 92 92 int overridden; /**< Has the default been overridden? */ 93 93 const char *group; /**< The option's group name */ 94 } CONF;94 } PENNCONF; 95 95 96 96 /** Runtime configuration options. … … 273 273 extern HASHTAB local_options; 274 274 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);275 extern PENNCONF *add_config(const char *name, config_func handler, void *loc, 276 int max, const char *group); 277 extern PENNCONF *new_config(void); 278 extern PENNCONF *get_config(const char *name); 279 279 280 280 int cf_bool(const char *opt, const char *val, void *loc, int maxval, 1.8.0/hdrs/version.h
r499 r501 1 1 #define VERSION "1.8.0" 2 #define PATCHLEVEL " 8"3 #define PATCHDATE "[ 09/15/2005]"4 #define NUMVERSION 100800000 82 #define PATCHLEVEL "9" 3 #define PATCHDATE "[12/12/2005]" 4 #define NUMVERSION 1008000009 1.8.0/src/bsd.c
r485 r501 982 982 int newsock; 983 983 #endif 984 intinput_ready, output_ready;984 unsigned long input_ready, output_ready; 985 985 986 986 #ifdef NT_TCP 1.8.0/src/conf.c
r497 r501 40 40 41 41 static 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);42 static char *config_list_helper(dbref player, PENNCONF * cp, int lc); 43 static char *config_list_helper2(dbref player, PENNCONF * cp, int lc); 44 44 45 45 OPTTAB options; /**< The table of configuration options */ … … 50 50 51 51 /** Table of all runtime configuration options. */ 52 CONF conftable[] = {52 PENNCONF conftable[] = { 53 53 {"input_database", cf_str, options.input_db, sizeof options.input_db, 0, 54 54 "files"} … … 505 505 const char *desc; /**< description of group */ 506 506 int viewperms; /**< who can view this group */ 507 } CONFGROUP;507 } PENNCONFGROUP; 508 508 509 509 /** The table of all configuration groups. */ 510 CONFGROUP confgroups[] = {510 PENNCONFGROUP confgroups[] = { 511 511 {"attribs", "Options affecting attributes", 0}, 512 512 {"chat", "Chat system options", 0}, … … 528 528 }; 529 529 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. 532 532 */ 533 CONF *533 PENNCONF * 534 534 new_config(void) 535 535 { 536 return (( CONF *) mush_malloc(sizeof(CONF), "config"));536 return ((PENNCONF *) mush_malloc(sizeof(PENNCONF), "config")); 537 537 } 538 538 … … 547 547 * \return pointer to configuration structure or NULL for failure. 548 548 */ 549 CONF *549 PENNCONF * 550 550 add_config(const char *name, config_func handler, void *loc, int max, 551 551 const char *group) 552 552 { 553 CONF *cnf;553 PENNCONF *cnf; 554 554 if ((cnf = get_config(name))) 555 555 return cnf; … … 567 567 568 568 /** 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 *) 570 570 * if one exists in the local runtime options that matches the given 571 571 * name. Only local_options is searched. … … 573 573 * \return pointer to configuration structure or NULL for failure. 574 574 */ 575 CONF *575 PENNCONF * 576 576 get_config(const char *name) 577 577 { 578 return (( CONF *) hashfind(name, &local_options));578 return ((PENNCONF *) hashfind(name, &local_options)); 579 579 } 580 580 … … 821 821 config_set(const char *opt, char *val, int source, int restrictions) 822 822 { 823 CONF *cp;823 PENNCONF *cp; 824 824 char *p; 825 825 … … 985 985 } 986 986 } 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)) { 989 989 int i = 0; 990 990 if ((!source || (cp->group && strcmp(cp->group, "files") != 0 … … 1207 1207 1208 1208 FILE *fp = NULL; 1209 CONF *cp;1209 PENNCONF *cp; 1210 1210 char tbuf1[BUFFER_LEN]; 1211 1211 char *p, *q, *s; … … 1303 1303 } 1304 1304 } 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)) { 1307 1307 if (!cp->overridden) { 1308 1308 do_rawlog(LT_ERR, … … 1356 1356 do_config_list(dbref player, const char *type, int lc) 1357 1357 { 1358 CONFGROUP *cgp;1359 CONF *cp;1358 PENNCONFGROUP *cgp; 1359 PENNCONF *cp; 1360 1360 1361 1361 if (SUPPORT_PUEBLO) … … 1381 1381 if (!found) { 1382 1382 /* 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)) { 1385 1385 if (cp->group && !strcasecmp(cp->name, type)) { 1386 1386 notify(player, config_list_helper(player, cp, lc)); … … 1408 1408 } 1409 1409 } 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)) { 1412 1412 if (cp->group && !strcasecmp(cp->group, cgp->name)) { 1413 1413 notify(player, config_list_helper(player, cp, lc)); … … 1432 1432 #define MAYBE_LC(x) (lc ? strlower(x) : x) 1433 1433 static char * 1434 config_list_helper(dbref player __attribute__ ((__unused__)), CONF *cp, int lc) 1434 config_list_helper(dbref player 1435 __attribute__ ((__unused__)), PENNCONF * cp, int lc) 1435 1436 { 1436 1437 static char result[BUFFER_LEN]; … … 1472 1473 /* This one doesn't return the names */ 1473 1474 static char * 1474 config_list_helper2(dbref player __attribute__ ((__unused__)), CONF *cp, int lc 1475 config_list_helper2(dbref player 1476 __attribute__ ((__unused__)), PENNCONF * cp, int lc 1475 1477 __attribute__ ((__unused__))) 1476 1478 { … … 1512 1514 FUNCTION(fun_config) 1513 1515 { 1514 CONF *cp;1516 PENNCONF *cp; 1515 1517 1516 1518 if (args[0] && *args[0]) { … … 1521 1523 } 1522 1524 } 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)) { 1525 1527 if (cp->group && !strcasecmp(cp->name, args[0])) { 1526 1528 safe_str(config_list_helper2(executor, cp, 0), buff, bp); … … 1535 1537 safe_chr(' ', buff, bp); 1536 1538 } 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)) { 1539 1541 safe_str(cp->name, buff, bp); 1540 1542 safe_chr(' ', buff, bp); … … 1551 1553 do_enable(dbref player, const char *param, int state) 1552 1554 { 1553 CONF *cp;1555 PENNCONF *cp; 1554 1556 1555 1557 for (cp = conftable; cp->name; cp++) { 1.8.0/src/local.dst
r477 r501 46 46 * add_config()'s you plan to do. 47 47 */ 48 hashinit(&local_options, 4, sizeof( CONF));48 hashinit(&local_options, 4, sizeof(PENNCONF)); 49 49 50 50 #ifdef EXAMPLE
