PennMUSH Community

Changeset 449

Show
Ignore:
Timestamp:
08/16/06 00:34:23 (2 years ago)
Author:
pennmush
Message:

PennMUSH 1.7.7p25 Archival

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • 1.7.7/CHANGES.177

    r447 r449  
    1818 
    1919========================================================================== 
     20 
     21Version 1.7.7 patchlevel 25                     October 30, 2003 
     22 
     23Fixes: 
     24  * Crash bug in the interaction between parents and attr trees 
     25    fixed. Report by Walker@M*U*S*H. 
     26  * Improvements to how locks are decompiled. Built-in locks with the 
     27    no_inherit flag cleared are handled better.  If the object doing 
     28    the @decompile is referenced in a lock key, it's decompiled as 'me' 
     29    rather than by dbref, to make it easier to port between games. 
     30    Report by Cerekk@bDv. [SW] 
     31  * The error typically logged by info_slave on a mush crash is worded  
     32    better. [SW] 
     33  * panic() renamed mush_panic() as the Mach kernel now has a public 
     34    system call panic(). Report by Jeff Ferrell. 
     35 
    2036 
    2137Version 1.7.7 patchlevel 24                     October 19, 2003 

  • 1.7.7/Patchlevel

    r447 r449  
    11Do not edit this file. It is maintained by the official PennMUSH patches. 
    2 This is PennMUSH 1.7.7p24 
     2This is PennMUSH 1.7.7p25 

  • 1.7.7/game/txt/hlp/penncmd.hlp

    r447 r449  
    321321 
    322322  Sets the actions to be taken after a player gives an object some 
    323   amount of pennies.  
     323  amount of pennies. The amount paid is passed in as %0. 
    324324 
    325325See also: give, @pay, @opay, @cost, MONEY, ACTION LISTS 

  • 1.7.7/game/txt/hlp/pennv177.hlp

    r447 r449  
    1 & 1.7.7p24 
     1& 1.7.7p25 
    22& changes 
    33This is a list of changes in this patchlevel which are probably of 
    …… 
    1212be read in 'help patchlevels'. 
    1313 
     14Version 1.7.7 patchlevel 25                     October 30, 2003 
     15 
     16Fixes: 
     17  * Crash bug in the interaction between parents and attr trees 
     18    fixed. Report by Walker@M*U*S*H. 
     19  * Improvements to how locks are decompiled. Built-in locks with the 
     20    no_inherit flag cleared are handled better.  If the object doing 
     21    the @decompile is referenced in a lock key, it's decompiled as 'me' 
     22    rather than by dbref, to make it easier to port between games. 
     23    Report by Cerekk@bDv. [SW] 
     24  * The error typically logged by info_slave on a mush crash is worded  
     25    better. [SW] 
     26  * panic() renamed mush_panic() as the Mach kernel now has a public 
     27    system call panic(). Report by Jeff Ferrell. 
     28 
     29 
     30& 1.7.7p24 
    1431Version 1.7.7 patchlevel 24                     October 19, 2003 
    1532 

  • 1.7.7/game/txt/hlp/pennvOLD.hlp

    r447 r449  
    44194419 
    442044201.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 
    4421        19, 20, 21, 22, 23, 24 
     4421       19, 20, 21, 22, 23, 24, 25 
    442244221.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 
    442344231.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 

  • 1.7.7/hdrs/boolexp.h

    r433 r449  
    2525boolexp getboolexp(FILE * f, const char *ltype); 
    2626void putboolexp(FILE * f, boolexp b); 
    27 enum u_b_f { UB_ALL, UB_DBREF }; 
     27enum u_b_f { 
     28  UB_ALL, /**< Use names of objects */ 
     29  UB_DBREF, /**< Use dbrefs */ 
     30  UB_MEREF /**< Use dbrefs or "me" if the object is the player arg 
     31              from unparse_boolexp.() For @decompile. */ 
     32}; 
    2833extern char *unparse_boolexp(dbref player, boolexp b, enum u_b_f flag); 
    2934#endif              /* BOOLEXP_H */ 

  • 1.7.7/hdrs/externs.h

    r443 r449  
    6464extern void init_game_config(const char *conf); 
    6565extern void dump_database(void); 
    66 extern void NORETURN panic(const char *message); 
     66extern void NORETURN mush_panic(const char *message); 
    6767extern char *scan_list(dbref player, char *command); 
    6868 

  • 1.7.7/hdrs/version.h

    r447 r449  
    1 #define VERSION "PennMUSH version 1.7.7 patchlevel 24 [10/19/2003]" 
    2 #define SHORTVN "PennMUSH 1.7.7p24" 
    3 #define NUMVERSION 001007007024 
     1#define VERSION "PennMUSH version 1.7.7 patchlevel 25 [10/30/2003]" 
     2#define SHORTVN "PennMUSH 1.7.7p25" 
     3#define NUMVERSION 001007007025 

  • 1.7.7/src/attrib.c

    r447 r449  
    13811381    page = (ATTRPAGE *) mush_malloc(sizeof(ATTRPAGE), "ATTRPAGE"); 
    13821382    if (!page) 
    1383       panic("Couldn't allocate memory in get_atr_free_list"); 
     1383      mush_panic("Couldn't allocate memory in get_atr_free_list"); 
    13841384    for (j = 0; j < ATTRS_PER_PAGE - 1; j++) 
    13851385      AL_NEXT(page->atrs + j) = page->atrs + j + 1; 
    …… 
    14561456      while (atr) { 
    14571457    comp = strcoll(name, AL_NAME(atr)); 
    1458     if (comp < 0) 
     1458    if (comp < 0) { 
     1459      *p = '`'; 
    14591460      goto continue_target; 
     1461    } 
    14601462    if (comp == 0) 
    14611463      break; 
    14621464    atr = AL_NEXT(atr); 
    14631465      } 
    1464       if (!atr || (target != obj && (AL_FLAGS(atr) & AF_PRIVATE))) 
     1466      if (!atr || (target != obj && (AL_FLAGS(atr) & AF_PRIVATE))) { 
     1467    *p = '`'; 
    14651468    goto continue_target; 
     1469      } 
    14661470      if ((AL_FLAGS(atr) & AF_INTERNAL) || (AL_FLAGS(atr) & AF_MDARK) || 
    14671471      !((AL_FLAGS(atr) & AF_VISUAL) || control || exam || 
    …… 
    14831487 
    14841488  continue_target: 
    1485     *p = '`'; 
    14861489 
    14871490    /* Attribute wasn't on this object.  Check a parent or ancestor. */ 

  • 1.7.7/src/boolexp.c

    r433 r449  
    551551} 
    552552 
     553/** Pretty-print object references for unparse_boolexp(). 
     554 * \param player the object seeing the decompiled lock. 
     555 * \param thing the object referenced in the lock. 
     556 * \param flag How to print thing. 
     557 * \param buff The start of the output buffer. 
     558 * \param bp Pointer to the current position in buff. 
     559 * \return 0 on success, true on buffer overflow. 
     560 */ 
     561static int 
     562safe_boref(dbref player, dbref thing, enum u_b_f flag, char *buff, char **bp) 
     563{ 
     564  switch (flag) { 
     565  case UB_MEREF: 
     566    if (player == thing) 
     567      return safe_strl("me", 2, buff, bp); 
     568    else 
     569      return safe_dbref(thing, buff, bp); 
     570  case UB_DBREF: 
     571    return safe_dbref(thing, buff, bp); 
     572  case UB_ALL: 
     573  default: 
     574    return safe_str(unparse_object(player, thing), buff, bp); 
     575  } 
     576} 
     577 
    553578/** Display a boolexp. 
    554579 * This function returns the textual representation of the boolexp. 
    …… 
    629654    break; 
    630655      case OP_TCONST: 
    631     if (flag == UB_DBREF) 
    632       safe_format(boolexp_buf, &buftop, "#%d", arg); 
    633     else 
    634       safe_str(unparse_object(player, arg), boolexp_buf, &buftop); 
     656    safe_boref(player, arg, flag, boolexp_buf, &buftop); 
    635657    break; 
    636658      case OP_TATR: 
    …… 
    639661      case OP_TIND: 
    640662    safe_chr(AT_TOKEN, boolexp_buf, &buftop); 
    641     if (flag == UB_DBREF) 
    642       safe_format(boolexp_buf, &buftop, "#%d", arg); 
    643     else 
    644       safe_str(unparse_object(player, arg), boolexp_buf, &buftop); 
     663    safe_boref(player, arg, flag, boolexp_buf, &buftop); 
    645664    safe_format(boolexp_buf, &buftop, "/%s", s); 
    646665    break; 
    647666      case OP_TCARRY: 
    648667    safe_chr(IN_TOKEN, boolexp_buf, &buftop); 
    649     if (flag == UB_DBREF) 
    650       safe_format(boolexp_buf, &buftop, "#%d", arg); 
    651     else 
    652       safe_str(unparse_object(player, arg), boolexp_buf, &buftop); 
     668    safe_boref(player, arg, flag, boolexp_buf, &buftop); 
    653669    break; 
    654670      case OP_TIS: 
    655671    safe_chr(IS_TOKEN, boolexp_buf, &buftop); 
    656     if (flag == UB_DBREF) 
    657       safe_format(boolexp_buf, &buftop, "#%d", arg); 
    658     else 
    659       safe_str(unparse_object(player, arg), boolexp_buf, &buftop); 
     672    safe_boref(player, arg, flag, boolexp_buf, &buftop); 
    660673    break; 
    661674      case OP_TOWNER: 
    662675    safe_chr(OWNER_TOKEN, boolexp_buf, &buftop); 
    663     if (flag == UB_DBREF) 
    664       safe_format(boolexp_buf, &buftop, "#%d", arg); 
    665     else 
    666       safe_str(unparse_object(player, arg), boolexp_buf, &buftop); 
     676    safe_boref(player, arg, flag, boolexp_buf, &buftop); 
    667677    break; 
    668678      case OP_TEVAL: 
    …… 
    11901200      newstr = mush_malloc(sizeof *newstr, "bvm.strnode"); 
    11911201      if (!s) 
    1192     panic(T("Unable to allocate memory for boolexp string node!")); 
     1202    mush_panic(T("Unable to allocate memory for boolexp string node!")); 
    11931203      newstr->s = mush_strdup(s, "bvm.string"); 
    11941204      if (!newstr->s) 
    1195     panic(T("Unable to allocate memory for boolexp string!")); 
     1205    mush_panic(T("Unable to allocate memory for boolexp string!")); 
    11961206      newstr->len = strlen(s) + 1; 
    11971207      newstr->next = NULL; 
    …… 
    12091219  newop = mush_malloc(sizeof *newop, "bvm.asmnode"); 
    12101220  if (!newop) 
    1211     panic(T("Unable to allocate memory for boolexp asm node!")); 
     1221    mush_panic(T("Unable to allocate memory for boolexp asm node!")); 
    12121222  newop->op = op; 
    12131223  newop->arg = arg; 
    …… 
    14401450      newlbl = mush_malloc(sizeof *newlbl, "bvm.asmnode"); 
    14411451      if (!newlbl) 
    1442         panic(T("Unable to allocate memory for boolexp asm node!")); 
     1452        mush_panic(T("Unable to allocate memory for boolexp asm node!")); 
    14431453      newlbl->op = OP_LABEL; 
    14441454      n->arg = newlbl->arg = gen_label_id(a); 

  • 1.7.7/src/bsd.c

    r445 r449  
    16761676  d = (DESC *) mush_malloc(sizeof(DESC), "descriptor"); 
    16771677  if (!d) 
    1678     panic("Out of memory."); 
     1678    mush_panic("Out of memory."); 
    16791679  d->descriptor = s; 
    16801680  d->connected = 0; 
    …… 
    24962496                    "descriptor_raw_input"); 
    24972497    if (!d->raw_input) 
    2498       panic("Out of memory"); 
     2498      mush_panic("Out of memory"); 
    24992499    d->raw_input_at = d->raw_input; 
    25002500  } 
    …… 
    33113311  char tbuf1[BUFFER_LEN]; 
    33123312  sprintf(tbuf1, T("BAILOUT: caught signal %d"), sig); 
    3313   panic(tbuf1); 
     3313  mush_panic(tbuf1); 
    33143314  _exit(7); 
    33153315} 

  • 1.7.7/src/chunk.c

    r445 r449  
    678678    if (pos == offset) { 
    679679      if ((ChunkPointer(region, pos)[0] & CHUNK_FREE_MASK) == CHUNK_FREE) 
    680     panic("Invalid reference to used chunk"); 
     680    mush_panic("Invalid reference to used chunk"); 
    681681      return; 
    682682    } 
    …… 
    11441144  if (j >= 3) 
    11451145#ifdef WIN32 
    1146     panic(tprintf("chunk swap file seek, GetLastError %d", GetLastError())); 
     1146    mush_panic(tprintf 
     1147           ("chunk swap file seek, GetLastError %d", GetLastError())); 
    11471148#else 
    1148     panic(tprintf("chunk swap file seek, errno %d: %s", 
    1149           errno, strerror(errno))); 
     1149    mush_panic(tprintf("chunk swap file seek, errno %d: %s", 
     1150               errno, strerror(errno))); 
    11501151#endif 
    11511152  pos = (char *) rhp; 
    …… 
    11711172  } 
    11721173#ifdef WIN32 
    1173   panic(tprintf("chunk swap file read, %d remaining, GetLastError %d", 
    1174         remaining, GetLastError())); 
     1174  mush_panic(tprintf("chunk swap file read, %d remaining, GetLastError %d", 
     1175             remaining, GetLastError())); 
    11751176#else 
    1176   panic(tprintf("chunk swap file read, %d remaining, errno %d: %s", 
    1177         remaining, errno, strerror(errno))); 
     1177  mush_panic(tprintf("chunk swap file read, %d remaining, errno %d: %s", 
     1178             remaining, errno, strerror(errno))); 
    11781179#endif 
    11791180} 
    …… 
    12041205  if (j >= 3) 
    12051206#ifdef WIN32 
    1206     panic(tprintf("chunk swap file seek, GetLastError %d", GetLastError())); 
     1207    mush_panic(tprintf 
     1208           ("chunk swap file seek, GetLastError %d", GetLastError())); 
    12071209#else 
    1208     panic(tprintf("chunk swap file seek, errno %d: %s", 
    1209           errno, strerror(errno))); 
     1210    mush_panic(tprintf("chunk swap file seek, errno %d: %s", 
     1211               errno, strerror(errno))); 
    12101212#endif 
    12111213  pos = (char *) rhp; 
    …… 
    12311233  } 
    12321234#ifdef WIN32 
    1233   panic(tprintf("chunk swap file write, %d remaining, GetLastError %d", 
    1234         remaining, GetLastError())); 
     1235  mush_panic(tprintf("chunk swap file write, %d remaining, GetLastError %d", 
     1236             remaining, GetLastError())); 
    12351237#else 
    1236   panic(tprintf("chunk swap file write, %d remaining, errno %d: %s", 
    1237         remaining, errno, strerror(errno))); 
     1238  mush_panic(tprintf("chunk swap file write, %d remaining, errno %d: %s", 
     1239             remaining, errno, strerror(errno))); 
    12381240#endif 
    12391241} 
    …… 
    12561258    rhp = mush_malloc(REGION_SIZE, "chunk region cache buffer"); 
    12571259    if (!rhp) { 
    1258       panic("chunk region cache buffer allocation failure"); 
     1260      mush_panic("chunk region cache buffer allocation failure"); 
    12591261    } 
    12601262    cached_region_count++; 
    …… 
    13951397      regions = (Region *) realloc(regions, region_array_len * sizeof(Region)); 
    13961398      if (!regions) 
    1397     panic("chunk: region array realloc failure"); 
     1399    mush_panic("chunk: region array realloc failure"); 
    13981400    } 
    13991401    region = region_count; 
    …… 
    16411643#ifdef CHUNK_PARANOID 
    16421644  if (!region_is_valid(region)) 
    1643     panic("Invalid region in migrate_scan_region!"); 
     1645    mush_panic("Invalid region in migrate_scan_region!"); 
    16441646#endif 
    16451647 
    …… 
    16661668      if (pos != offset || 
    16671669      (ChunkPointer(region, pos)[0] & CHUNK_FREE_MASK) == CHUNK_FREE) 
    1668     panic("Invalid reference to used chunk in migrate"); 
     1670    mush_panic("Invalid reference to used chunk in migrate"); 
    16691671      k++; 
    16701672    } 
    …… 
    17511753    m_derefs = mush_malloc(count * sizeof(*m_derefs), "migrate derefs"); 
    17521754    if (!m_length || !m_unhappiness || !m_derefs) 
    1753       panic("Cannot allocate working space for migration"); 
     1755      mush_panic("Cannot allocate working space for migration"); 
    17541756    m_alloc = count; 
    17551757  } 
    …… 
    23642366 
    23652367  if (len < MIN_CHUNK_LEN || len > MAX_CHUNK_LEN) 
    2366     panic(tprintf("Illegal chunk length requested: %d bytes", len)); 
     2368    mush_panic(tprintf("Illegal chunk length requested: %d bytes", len)); 
    23672369 
    23682370  full_len = LenToFullLen(len); 
    …… 
    23832385#ifdef CHUNK_PARANOID 
    23842386  if (!region_is_valid(region)) 
    2385     panic("Invalid region after chunk_create!"); 
     2387    mush_panic("Invalid region after chunk_create!"); 
    23862388#endif 
    23872389  stat_create++; 
    …… 
    24072409#ifdef CHUNK_PARANOID 
    24082410  if (!region_is_valid(region)) 
    2409     panic("Invalid region after chunk_delete!"); 
     2411    mush_panic("Invalid region after chunk_delete!"); 
    24102412#endif 
    24112413  stat_delete++; 
    …… 
    25942596               0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); 
    25952597  if (swap_fd == INVALID_HANDLE_VALUE) 
    2596     panic(tprintf("Cannot open swap file: %d", GetLastError())); 
     2598    mush_panic(tprintf("Cannot open swap file: %d", GetLastError())); 
    25972599#else 
    25982600  swap_fd = open(CHUNK_SWAP_FILE, O_RDWR | O_TRUNC | O_CREAT, 0600); 
    25992601  if (swap_fd < 0) 
    2600     panic(tprintf("Cannot open swap file: %s", strerror(errno))); 
     2602    mush_panic(tprintf("Cannot open swap file: %s", strerror(errno))); 
    26012603#endif 
    26022604  curr_period = 0; 
    …… 
    26132615  regions = mush_malloc(region_array_len * sizeof(Region), "chunk region list"); 
    26142616  if (!regions) 
    2615     panic("cannot malloc space for chunk region list"); 
     2617    mush_panic("cannot malloc space for chunk region list"); 
    26162618 
    26172619/* 

  • 1.7.7/src/command.c

    r447 r449  
    836836  switches = (char *) mush_malloc(BUFFER_LEN, "string"); 
    837837  if (!command || !swtch || !ls || !rs || !switches) 
    838     panic("Couldn't allocate memory in command_parse"); 
     838    mush_panic("Couldn't allocate memory in command_parse"); 
    839839  p = string; 
    840840  replacer = NULL; 

  • 1.7.7/src/comp_w.c

    r427 r449  
    211211 
    212212  if (!words[i]) 
    213     panic("Out of memory in string compression routine"); 
     213    mush_panic("Out of memory in string compression routine"); 
    214214 
    215215#ifdef COMP_STATS 
    …… 
    317317      panicking = 1;    /* don't panic from within panic */ 
    318318      do_rawlog(LT_ERR, "Error in string decompression, i = %i", i); 
    319       panic("Fatal error in decompression"); 
     319      mush_panic("Fatal error in decompression"); 
    320320    } 
    321321      } 

  • 1.7.7/src/comp_w8.c

    r427 r449  
    214214 
    215215  if (!words[i]) 
    216     panic("Out of memory in string compression routine"); 
     216    mush_panic("Out of memory in string compression routine"); 
    217217 
    218218#ifdef COMP_STATS 
    …… 
    323323      panicking = 1;    /* don't panic from within panic */ 
    324324      fprintf(stderr, "Error in string decompression, i = %i\n", i); 
    325       panic("Fatal error in decompression"); 
     325      mush_panic("Fatal error in decompression"); 
    326326    } 
    327327      } 

  • 1.7.7/src/extchat.c

    r445 r449  
    251251  u = (CHANUSER *) mush_malloc(sizeof(CHANUSER), "CHANUSER"); 
    252252  if (!u) 
    253     panic("Couldn't allocate memory in new_user in extchat.c"); 
     253    mush_panic("Couldn't allocate memory in new_user in extchat.c"); 
    254254  CUdbref(u) = who; 
    255255  CUtype(u) = CU_DEFAULT_FLAGS; 
    …… 
    22762276      if (ChanModLock(c) != TRUE_BOOLEXP) 
    22772277    notify_format(player, "@clock/mod %s = %s", ChanName(c), 
    2278               unparse_boolexp(player, ChanModLock(c), UB_DBREF)); 
     2278              unparse_boolexp(player, ChanModLock(c), UB_MEREF)); 
    22792279      if (ChanHideLock(c) != TRUE_BOOLEXP) 
    22802280    notify_format(player, "@clock/hide %s = %s", ChanName(c), 
    2281               unparse_boolexp(player, ChanHideLock(c), UB_DBREF)); 
     2281              unparse_boolexp(player, ChanHideLock(c), UB_MEREF)); 
    22822282      if (ChanJoinLock(c) != TRUE_BOOLEXP) 
    22832283    notify_format(player, "@clock/join %s = %s", ChanName(c), 
    2284               unparse_boolexp(player, ChanJoinLock(c), UB_DBREF)); 
     2284              unparse_boolexp(player, ChanJoinLock(c), UB_MEREF)); 
    22852285      if (ChanSpeakLock(c) != TRUE_BOOLEXP) 
    22862286    notify_format(player, "@clock/speak %s = %s", ChanName(c), 
    2287               unparse_boolexp(player, ChanSpeakLock(c), UB_DBREF)); 
     2287              unparse_boolexp(player, ChanSpeakLock(c), UB_MEREF)); 
    22882288      if (ChanSeeLock(c) != TRUE_BOOLEXP) 
    22892289    notify_format(player, "@clock/see %s = %s", ChanName(c), 
    2290               unparse_boolexp(player, ChanSeeLock(c), UB_DBREF)); 
     2290              unparse_boolexp(player, ChanSeeLock(c), UB_MEREF)); 
    22912291      if (ChanTitle(c)) 
    22922292    notify_format(player, "@channel/desc %s = %s", ChanName(c), 

  • 1.7.7/src/extmail.c

    r433 r449  
    10261026    newmsg = (char *) mush_malloc(BUFFER_LEN, "string"); 
    10271027    if (!newmsg) 
    1028       panic(T("Failed to allocate string in send_mail")); 
     1028      mush_panic(T("Failed to allocate string in send_mail")); 
    10291029    nm = newmsg; 
    10301030    safe_str(message, newmsg, &nm); 
    …… 
    10331033      buff = (char *) mush_malloc(BUFFER_LEN, "string"); 
    10341034      if (!buff) 
    1035     panic(T("Failed to allocate string in send_mail")); 
     1035    mush_panic(T("Failed to allocate string in send_mail")); 
    10361036      ms = mailsig = safe_atr_value(a); 
    10371037      bp = buff; 
    …… 
    21982198  tbuf = (char *) mush_malloc(BUFFER_LEN, "string"); 
    21992199  if (!new || !pat || !str || !tbuf) 
    2200     panic(T("Failed to allocate strings in add_folder_name")); 
     2200    mush_panic(T("Failed to allocate strings in add_folder_name")); 
    22012201 
    22022202  if (name && *name) 

  • 1.7.7/src/flags.c

    r447 r449  
    6969extern PTAB ptab_command;   /* Uses flag bitmasks */ 
    7070 
    71 #define Flagspace_Lookup(n,ns)  if (!(n = (FLAGSPACE *)hashfind(ns,&htab_flagspaces))) panic("Unable to locate flagspace"); 
     71#define Flagspace_Lookup(n,ns)  if (!(n = (FLAGSPACE *)hashfind(ns,&htab_flagspaces))) mush_panic("Unable to locate flagspace"); 
    7272 
    7373/** This is the old default flag table. We still use it when we have to 
    …… 
    343343  FLAG *f = (FLAG *) mush_malloc(sizeof(FLAG), "flag"); 
    344344  if (!f) 
    345     panic("Unable to allocate memory for a new flag!\n"); 
     345    mush_panic("Unable to allocate memory for a new flag!\n"); 
    346346  return f; 
    347347} 
    …… 
    411411      (FLAG **) realloc(n->flags, (f->bitpos + 1) * sizeof(FLAG *)); 
    412412    if (!n->flags) 
    413       panic("Unable to reallocate flags array!\n"); 
     413      mush_panic("Unable to reallocate flags array!\n"); 
    414414      } 
    415415      /* Make sure the new space is full of NULLs */ 
    …… 
    797797  bitmask = (object_flag_type) mush_malloc(FlagBytes(n), "flag_bitmask"); 
    798798  if (!bitmask) 
    799     panic("Unable to allocate memory for flag bitmask"); 
     799    mush_panic("Unable to allocate memory for flag bitmask"); 
    800800  memset(bitmask, 0, FlagBytes(n)); 
    801801  return bitmask; 
    …… 
    817817  bitmask = (object_flag_type) mush_malloc(FlagBytes(n), "flag_bitmask"); 
    818818  if (!bitmask) 
    819     panic("Unable to allocate memory for flag bitmask"); 
     819    mush_panic("Unable to allocate memory for flag bitmask"); 
    820820  memcpy(bitmask, given, FlagBytes(n)); 
    821821  return bitmask; 

  • 1.7.7/src/funlist.c

    r441 r449  
    173173  ptrs2 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray"); 
    174174  if (!ptrs1 || !ptrs2) 
    175     panic("Unable to allocate memory in fun_munge"); 
     175    mush_panic("Unable to allocate memory in fun_munge"); 
    176176  nptrs1 = list2arr(ptrs1, MAX_SORTSIZE, args[1], sep); 
    177177  nptrs2 = list2arr(ptrs2, MAX_SORTSIZE, args[2], sep); 
    …… 
    200200  results = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray"); 
    201201  if (!results) 
    202     panic("Unable to allocate memory in fun_munge"); 
     202    mush_panic("Unable to allocate memory in fun_munge"); 
    203203  nresults = list2arr(results, MAX_SORTSIZE, rlist, sep); 
    204204 
    …… 
    249249  wordlist = (char *) mush_malloc(BUFFER_LEN, "string"); 
    250250  if (!ptrs || !wordlist) 
    251     panic("Unable to allocate memory in fun_elements"); 
     251    mush_panic("Unable to allocate memory in fun_elements"); 
    252252 
    253253  /* Turn the first list into an array. */ 
    …… 
    382382  rsave = (char *) mush_malloc(BUFFER_LEN, "string"); 
    383383  if (!result || !rsave) 
    384     panic("Unable to allocate memory in fun_fold"); 
     384    mush_panic("Unable to allocate memory in fun_fold"); 
    385385 
    386386  abuf = safe_atr_value(attrib); 
    …… 
    10911091  a2 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray"); 
    10921092  if (!tempbuff || !a1 || !a2) 
    1093     panic("Unable to allocate memory in fun_setunion"); 
     1093    mush_panic("Unable to allocate memory in fun_setunion"); 
    10941094  /* Concat both lists, make array, sort */ 
    10951095  if (!*args[0]) 
    …… 
    11561156  a2 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray"); 
    11571157  if (!a1 || !a2) 
    1158     panic("Unable to allocate memory in fun_setunion"); 
     1158    mush_panic("Unable to allocate memory in fun_setunion"); 
    11591159 
    11601160  /* make arrays out of the lists */ 
    …… 
    12711271  a2 = (char **) mush_malloc(MAX_SORTSIZE * sizeof(char *), "ptrarray"); 
    12721272  if (!a1 || !a2) 
    1273     panic("Unable to allocate memory in fun_setunion"); 
     1273    mush_panic("Unable to allocate memory in fun_setunion"); 
    12741274 
    12751275  /* make arrays out of the lists */ 
    …… 
    21492149  list = (char *) mush_malloc(BUFFER_LEN, "string"); 
    21502150  if (!outsep || !list) 
    2151     panic("Unable to allocate memory in fun_iter"); 
     2151    mush_panic("Unable to allocate memory in fun_iter"); 
    21522152  if (nargs < 4) 
    21532153    strcpy(outsep, " "); 

  • 1.7.7/src/game.c

    r445 r449  
    311311 
    312312    if (flag == SHUT_PANIC) { 
    313       panic("@shutdown/panic"); 
     313      mush_panic("@shutdown/panic"); 
    314314    } else { 
    315315      if (flag == SHUT_PARANOID) { 
    …… 
    457457 */ 
    458458void 
    459 panic(const char *message) 
     459mush_panic(const char *message) 
    460460{ 
    461461  const char *panicfile = options.crash_db; 

  • 1.7.7/src/help.c

    r441 r449  
    319319    topics = (help_indx *) malloc(top_topics * sizeof(help_indx)); 
    320320      if (!topics) { 
    321     panic(T("Out of memory")); 
     321    mush_panic(T("Out of memory")); 
    322322      } 
    323323    } 

  • 1.7.7/src/info_slave.c

    r433 r449  
    149149    len = read(mush, &rlen, sizeof rlen); 
    150150    if (len < (int) sizeof rlen) { 
    151       perror("info_slave reading remote size"); 
     151      perror("info_slave reading remote size (Did the mush crash?)"); 
    152152      return EXIT_FAILURE; 
    153153    } 

  • 1.7.7/src/lock.c

    r441 r449  
    223223 
    224224    if (!ll) 
    225       panic("Unable to allocate memory for locks!"); 
     225      mush_panic("Unable to allocate memory for locks!"); 
    226226 
    227227    for (n = 0; n < LOCKS_PER_PAGE - 1; n++) { 
    …… 
    360360 
    361361  for (ll = lock_types; ll->type; ll++) 
    362     if (strcmp(type, ll->type) == 0) 
     362    if (strcasecmp(type, ll->type) == 0) 
    363363      return ll; 
    364364 

  • 1.7.7/src/look.c

    r443 r449  
    7575  nbuf = (char *) mush_malloc(BUFFER_LEN, "string"); 
    7676  if (!tbuf1 || !tbuf2 || !nbuf) 
    77     panic("Unable to allocate memory in look_exits"); 
     77    mush_panic("Unable to allocate memory in look_exits"); 
    7878  s1 = tbuf1; 
    7979  s2 = tbuf2; 
    …… 
    9191    buff = (char *) mush_malloc(BUFFER_LEN, "string"); 
    9292    if (!arg || !buff) 
    93       panic("Unable to allocate memory in look_exits"); 
     93      mush_panic("Unable to allocate memory in look_exits"); 
    9494    save_global_regs("look_exits", rsave); 
    9595    for (j = 0; j < 10; j++) { 
    …… 
    242242    buff = (char *) mush_malloc(BUFFER_LEN, "string"); 
    243243    if (!arg || !buff) 
    244       panic("Unable to allocate memory in look_contents"); 
     244      mush_panic("Unable to allocate memory in look_contents"); 
    245245    save_global_regs("look_contents", rsave); 
    246246    for (j = 0; j < 10; j++) { 
    …… 
    13471347  lock_list *ll; 
    13481348  for (ll = Locks(thing); ll; ll = ll->next) { 
    1349     if (match_lock(ll->type) != NULL) { 
     1349    const lock_list *p = get_lockproto(L_TYPE(ll)); 
     1350    if (p) { 
    13501351      notify_format(player, "@lock/%s %s=%s", 
    13511352            L_TYPE(ll), name, unparse_boolexp(player, L_KEY(ll), 
    1352                               UB_DBREF)); 
    1353       if (L_FLAGS(ll)) { 
    1354     if (skipdef) { 
    1355       const lock_list *p = get_lockproto(L_TYPE(ll)); 
    1356       if (p && L_FLAGS(ll) == L_FLAGS(p)) 
    1357         continue; 
    1358     } 
    1359     notify_format(player, 
    1360               "@lset %s/%s=%s", name, L_TYPE(ll), lock_flags_long(ll)); 
    1361       } 
    1362     } else { 
    1363       notify_format(player, "@lock/user:%s %s=%s", 
    1364             ll->type, name, unparse_boolexp(player, ll->key, UB_DBREF)); 
     1353                              UB_MEREF)); 
     1354      if (skipdef) { 
     1355    if (p && L_FLAGS(ll) == L_FLAGS(p)) 
     1356      continue; 
     1357      } 
    13651358      if (L_FLAGS(ll)) 
    13661359    notify_format(player, 
    13671360              "@lset %s/%s=%s", name, L_TYPE(ll), lock_flags_long(ll)); 
    1368  
     1361      if ((L_FLAGS(p) & LF_PRIVATE) && !(L_FLAGS(ll) & LF_PRIVATE)) 
     1362    notify_format(player, "@lset %s/%s=!no_inherit", name, L_TYPE(ll)); 
     1363    } else { 
     1364      notify_format(player, "@lock/user:%s %s=%s", 
     1365            ll->type, name, unparse_boolexp(player, ll->key, UB_MEREF)); 
     1366      if (L_FLAGS(ll)) 
     1367    notify_format(player, 
     1368              "@lset %s/%s=%s", name, L_TYPE(ll), lock_flags_long(ll)); 
    13691369    } 
    13701370  } 

  • 1.7.7/src/mysocket.c

    r445 r449  
    344344    perror("make_nonblocking: fcntl"); 
    345345#ifndef INFOSLAVE 
    346     panic("F_GETFL fcntl failed"); 
     346    mush_panic("F_GETFL fcntl failed"); 
    347347#else 
    348348    exit(1); 
    …… 
    354354    perror("make_nonblocking: fcntl"); 
    355355#ifndef INFOSLAVE 
    356     panic("O_NDELAY fcntl failed"); 
     356    mush_panic("O_NDELAY fcntl failed"); 
    357357#else 
    358358    exit(1); 

  • 1.7.7/src/notify.c

    r447 r449  
    11861186    (struct text_block *) mush_malloc(sizeof(struct text_block), "text_block"); 
    11871187  if (!p) 
    1188     panic("Out of memory"); 
     1188    mush_panic("Out of memory"); 
    11891189  p->buf = 
    11901190    (unsigned char *) mush_malloc(sizeof(unsigned char) * n, "text_block_buff"); 
    11911191  if (!p->buf) 
    1192     panic("Out of memory"); 
     1192    mush_panic("Out of memory"); 
    11931193 
    11941194  memcpy(p->buf, s, n); 

  • 1.7.7/src/services.c

    r399 r449  
    362362    threadHandle = NULL; 
    363363 
    364     panic(T("System shutdown by system operator")); 
     364    mush_panic(T("System shutdown by system operator")); 
    365365 
    366366    _exit(99); 

  • 1.7.7/src/speech.c

    r439 r449  
    361361  tp = tbuf = (char *) mush_malloc(BUFFER_LEN, "string"); 
    362362  if (!tbuf) 
    363     panic("Unable to allocate memory in do_whisper_list"); 
     363    mush_panic("Unable to allocate memory in do_whisper_list"); 
    364364 
    365365  overheard = 0; 
    …… 
    722722  tp2 = tbuf2 = (char *) mush_malloc(BUFFER_LEN, "string"); 
    723723  if (!tbuf2) 
    724     panic("Unable to allocate memory in do_page"); 
     724    mush_panic("Unable to allocate memory in do_page"); 
    725725 
    726726  if (arg2 && *arg2 && *arg1) { 
    …… 
    758758  tp = tbuf = (char *) mush_malloc(BUFFER_LEN, "string"); 
    759759  if (!tbuf) 
    760     panic("Unable to allocate memory in do_page"); 
     760    mush_panic("Unable to allocate memory in do_page"); 
    761761 
    762762  if (override && !Pemit_All(player)) { 
    …… 
    864864    mb = msgbuf = (char *) mush_malloc(BUFFER_LEN, "string"); 
    865865    if (!msgbuf) 
    866       panic("Unable to allocate memory in do_page"); 
     866      mush_panic("Unable to allocate memory in do_page"); 
    867867 
    868868    process_expression(msgbuf, &mb, &message, player, cause, cause, 

  • 1.7.7/src/strutil.c

    r445 r449  
    868868  r = result = mush_malloc(BUFFER_LEN, "replace_string.buff"); 
    869869  if (!result) 
    870     panic(T("Couldn't allocate memory in replace_string!")); 
     870    mush_panic(T("Couldn't allocate memory in replace_string!")); 
    871871 
    872872  len = strlen(old); 
    …… 
    915915  rp = result = mush_malloc(BUFFER_LEN, "replace_string.buff"); 
    916916  if (!result) 
    917     panic(T("Couldn't allocate memory in replace_string2!")); 
     917    mush_panic(T("Couldn't allocate memory in replace_string2!")); 
    918918 
    919919  firsts[0] = old[0][0]; 

  • 1.7.7/src/timer.c

    r439 r449  
    161161    refs_size = actual; 
    162162    if (!refs) 
    163       panic("Could not allocate migration reference array"); 
     163      mush_panic("Could not allocate migration reference array"); 
    164164  } 
    165165#ifdef DEBUG_MIGRATE 

  • 1.7.7/src/unparse.c

    r427 r449  
    200200    arg = (char *) mush_malloc(BUFFER_LEN, "string"); 
    201201    if (!arg) 
    202       panic("Unable to allocate memory in nameformat"); 
     202      mush_panic("Unable to allocate memory in nameformat"); 
    203203    save_global_regs("nameformat", rsave); 
    204204    for (j = 0; j < 10; j++) { 

  • 1.7.7/src/wiz.c

    r447 r449  
    14941494    (dbref *) mush_malloc(sizeof(dbref) * result_size, "search_results"); 
    14951495  if (!*result) 
    1496     panic(T("Couldn't allocate memory in search!")); 
     1496    mush_panic(T("Couldn't allocate memory in search!")); 
    14971497 
    14981498  switch (sclass) { 
    …… 
    15081508                     sizeof(dbref) * result_size); 
    15091509      if (!newresults) 
    1510         panic(T("Couldn't reallocate memory in search!")); 
     1510        mush_panic(T("Couldn't reallocate memory in search!")); 
    15111511      *result = newresults; 
    15121512    } 
    …… 
    15251525        (dbref *) realloc((Malloc_t) *result, sizeof(dbref) * result_size); 
    15261526      if (!newresults) 
    1527         panic(T("Couldn't reallocate memory in search!")); 
     1527        mush_panic(T("Couldn't reallocate memory in search!")); 
    15281528      *result = newresults; 
    15291529    } 
    …… 
    15431543        (dbref *) realloc((Malloc_t) *result, sizeof(dbref) * result_size); 
    15441544      if (!newresults) 
    1545         panic(T("Couldn't reallocate memory in search!")); 
     1545        mush_panic(T("Couldn't reallocate memory in search!")); 
    15461546      *result = newresults; 
    15471547    } 
    …… 
    15621562        (dbref *) realloc((Malloc_t) *result, sizeof(dbref) * result_size); 
    1563