Changeset 445

Timestamp:

08/13/06 02:00:00 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p23 Archival

Files:

• 1.7.7/CHANGES.177 (modified) (2 diffs)
• 1.7.7/MANIFEST (modified) (1 diff)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/mushcnf.dst (modified) (3 diffs)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (6 diffs)
• 1.7.7/game/txt/hlp/pennv177.hlp (modified) (3 diffs)
• 1.7.7/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.7.7/hdrs/chunk.h (modified) (1 diff)
• 1.7.7/hdrs/flags.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/bsd.c (modified) (3 diffs)
• 1.7.7/src/chunk.c (modified) (10 diffs)
• 1.7.7/src/conf.c (modified) (1 diff)
• 1.7.7/src/extchat.c (modified) (6 diffs)
• 1.7.7/src/flags.c (modified) (1 diff)
• 1.7.7/src/funcrypt.c (modified) (4 diffs)
• 1.7.7/src/function.c (modified) (4 diffs)
• 1.7.7/src/funmath.c (modified) (2 diffs)
• 1.7.7/src/game.c (modified) (6 diffs)
• 1.7.7/src/mycrypt.c (modified) (3 diffs)
• 1.7.7/src/mysocket.c (modified) (1 diff)
• 1.7.7/src/myssl.c (modified) (2 diffs)
• 1.7.7/src/pcre.c (modified) (3 diffs)
• 1.7.7/src/player.c (modified) (4 diffs)
• 1.7.7/src/shs.c (modified) (2 diffs)
• 1.7.7/src/strutil.c (modified) (9 diffs)
• 1.7.7/src/wiz.c (modified) (2 diffs)
• 1.7.7/test/testdigest.pl (added)
• 1.7.7/win32/funs.h (modified) (3 diffs)
• 1.7.7/win32/options.h (modified) (15 diffs)
• 1.7.7/win32/pennmush.dsp (modified) (8 diffs)

1.7.7/CHANGES.177

@@ -19 +19 @@
-==========================================================================
-
+Version 1.7.7 patchlevel 23                     October 10, 2003
+
+Major Changes:
+  * Forking dumps now work with the chunk memory manager. [TAP]
+Minor Changes:
+  * Chunk allocator improvements in partial read/writes and for
+    Win32. [TAP]
+  * Use the SHA0 algorithm from OpenSSL instead of our own when possible. [SW]
+Functions:
+  * New digest() function for generating checksums via a variety of 
+    algorithms. [SW]
+  * cowner() returns the dbref of a channel's owner. Suggested by
+    Sholevi@M*U*S*H. [SW]
+  * Added baseconv(), for converting numbers from one base to another.
+    Useful for tweaking things like Myrddin's bboard code. Suggested
+    by many people. [SW]
+Fixes:
+  * Remove warnings in set.c and pcre.c. Report by Nymeria@M*U*S*H
+  * @power messages now show the canonical name of the power.
+    Suggested by Cheetah@M*U*S*H.
+  * Adding DARK players to channels produced a duplicated message.
+    Reported by Mystery8@ST:AW.
+  * Players set WIZARD and ROYALTY would get double notification 
+    of some GAME: messages. Fixed now. [SW]
+  * Chatdb corruption possible when admin add players to channels.
+    Reported by several folks, diagnosed by Mordie@M*U*S*H.
+
+
-Version 1.7.7 patchlevel 22                     September 30, 2003
-
@@ -32 +60 @@
-  * Attempting to unset attribute flags actually set them.
-    Report by Ambrosia@M*U*S*H. [SW]
-  * Remove a warning in set.c. Report by Nymeria@M*U*S*H
-
-

1.7.7/MANIFEST

@@ -238 +238 @@
-test/TestHarness.pm
-test/testatree.pl
+test/testdigest.pl
-test/testhastype.pl
-test/testrand.pl

1.7.7/Patchlevel

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

1.7.7/game/mushcnf.dst

@@ -132 +132 @@
-### file, and cache often-used attribute text in memory. This 
-### can result in substantial (typically 30-50%) savings
-
-
+
-### You can control the size of memory cache (or set it so large
-### that nothing is ever swapped to disk), as well as several less
@@ -148 +147 @@
-# If you want to use an 'infinite' cache, try setting this
-# to 2000000000; you'll lose the memory benefits, but you'll still
-
-
+
-chunk_cache_memory 1000000
-
@@ -388 +386 @@
-# If I don't, the MUSH will pause while it dumps.
-# If you're low on memory, don't do this.
-# If you want to use the chunk-based memory allocator, you may not
-# be able to do forking dumps, and it will ignore this.
-# If you're on Win32, don't do this; fork() is not defined.
-no
+yes
-
-# If you're not forking, you get a bunch of messages that you

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -80 +80 @@
-  lists of toggle (Yes/No) options efficiently.
-
-nd()        bnand()       bnot()        bor()         bx
-
+seconv()    band()        bnand()       bnot()        b
+bxor()        
-
-& Boolean functions
@@ -99 +99 @@
-  Channel functions work with the channel system.
-
-
+
+
-& Communication functions
-  Communication functions are side-effect functions that send a message
@@ -197 +198 @@
-  before()      brackets()    capstr()      case()        caseall()
-  cat()         center()      comp()        chr()         decrypt()
-edit()        encrypt()     escape()      if
-else()      lcstr()       left()        lit()         ljus
-merge()       mid()         ord()         pos()         regedit
-lpos()        regmatch()    repeat()      reverse()     right
-just()       scramble()    secure()      sha0()        space
-ellnum()    squish()      strcat()      strinsert()   stripaccents
-nsi()   strlen()      strmatch()    strreplace()  switch
-
+digest()      edit()        encrypt()     escape
+()          ifelse()      lcstr()       left()        li
+ljust()       merge()       mid()         ord()         pos
+regedit()     lpos()        regmatch()    repeat()      reverse
+ight()       rjust()       scramble()    secure()      sha0
+ace()       spellnum()    squish()      strcat()      strinsert
+ccents()stripansi()   strlen()      strmatch()    strreplace
+switch()      
- 
-  See also: STRINGS
@@ -457 +458 @@
-  Does a bitwise AND of all its arguments, returning the result
-  (A number with only the bits set in every argument set in it).
+& BASECONV()
+  baseconv(<integer>, <from base>, <to base>)
+
+  Converts a number from one base to another. The bases can be between
+  2 (Binary) and 36. 
-& BEEP()
-  beep([<number>])
@@ -740 +746 @@
-
-  See HELP CTU() for more on the angle type.
+& COWNER()
+  cowner(<channel>)
+
+  Returns the dbref of the owner of a channel.
-& PCREATE()
-  pcreate(<name>,<password>)
@@ -869 +879 @@
-
-  This is a side-effect function and may not be enabled on some MUSHes.
+& DIGEST()
+  digest(<algorithm>, <string>)
+
+  Returns a checksum (Hash, digest, etc.) of <string> using the given
+  <algorithm>. If the mush is compiled with SSL support (See @config
+  compile), <algorithm> can be one of:
+
+  md2 md4 md5 sha sha1 dss1 mdc2 ripemd160
+
+  Without SSL, only the sha algorithm is enabled. In both cases, sha returns
+  the same thing as the sha0() function.
+
+  See also: sha0()
-& DIST2D()
-  dist2d(x1, y1, x2, y2)

1.7.7/game/txt/hlp/pennv177.hlp

@@ -1 @@
-2
+3
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.7.7 patchlevel 23                     October 10, 2003
+
+Major Changes:
+  * Forking dumps now work with the chunk memory manager. [TAP]
+Minor Changes:
+  * Chunk allocator improvements in partial read/writes and for
+    Win32. [TAP]
+  * Use the SHA0 algorithm from OpenSSL instead of our own when possible. [SW]
+Functions:
+  * New digest() function for generating checksums via a variety of 
+    algorithms. [SW]
+  * cowner() returns the dbref of a channel's owner. Suggested by
+    Sholevi@M*U*S*H. [SW]
+  * Added baseconv(), for converting numbers from one base to another.
+    Useful for tweaking things like Myrddin's bboard code. Suggested
+    by many people. [SW]
+Fixes:
+  * Remove warnings in set.c and pcre.c. Report by Nymeria@M*U*S*H
+  * @power messages now show the canonical name of the power.
+    Suggested by Cheetah@M*U*S*H.
+  * Adding DARK players to channels produced a duplicated message.
+    Reported by Mystery8@ST:AW.
+  * Players set WIZARD and ROYALTY would get double notification 
+    of some GAME: messages. Fixed now. [SW]
+  * Chatdb corruption possible when admin add players to channels.
+    Reported by several folks, diagnosed by Mordie@M*U*S*H.
+
+
+& 1.7.7p22
-Version 1.7.7 patchlevel 22                     September 30, 2003
-
@@ -25 +54 @@
-  * Attempting to unset attribute flags actually set them.
-    Report by Ambrosia@M*U*S*H. [SW]
-  * Remove a warning in set.c. Report by Nymeria@M*U*S*H
-
-

1.7.7/game/txt/hlp/pennvOLD.hlp

@@ -4419 +4419 @@
-
-1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-
+, 23
-1.7.6: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
-1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12

1.7.7/hdrs/chunk.h

@@ -26 +26 @@
-void chunk_new_period(void);
-
+int chunk_fork_file(void);
+void chunk_fork_parent(void);
+void chunk_fork_child(void);
+void chunk_fork_done(void);
+
-#endif              /* _CHUNK_H_ */

1.7.7/hdrs/flags.h

@@ -124 +124 @@
-extern void do_flag_add(dbref player, const char *name, char *args_right[]);
-extern void do_flag_letter(dbref player, const char *name, const char *letter);
+extern const char *power_to_string(int pwr);
-
-#define twiddle_flag_bitmask(bm,b,neg) (neg ? clear_flag_bitmask(bm,b) : \

1.7.7/hdrs/version.h

@@ -1 @@
-2 [09/3
-2
-2
+3 [10/1
+3
+3

1.7.7/src/bsd.c

@@ -3345 +3345 @@
-    do_rawlog(LT_ERR, T("ERROR! forking dump exited with signal %d"),
-          WTERMSIG(my_stat));
-
-
-
+
-               T("GAME: ERROR! Forking database save failed!"));
-      } else if (WIFEXITED(my_stat) && WEXITSTATUS(my_stat) == 0) {
@@ -3685 +3683 @@
-
-  if (Dark(player)) {
-
-
+
-  } else
-    flag_broadcast(0, "MONITOR", "%s %s", T("GAME:"), tbuf1);
@@ -3846 +3843 @@
-    flag_broadcast("WIZARD", 0, T("GAME: Suspect %s"), tbuf1);
-  if (Dark(player)) {
-
-
+
-  } else
-    flag_broadcast(0, "MONITOR", "%s %s", T("GAME:"), tbuf1);

1.7.7/src/chunk.c

@@ -538 +538 @@
-
-/** Swap File */
+#ifdef WIN32
+typedef HANDLE fd_type;
+static HANDLE swap_fd;
+static HANDLE swap_fd_child = INVALID_HANDLE_VALUE;
+#else
+typedef int fd_type;
-static int swap_fd;
+static int swap_fd_child = -1;
+#endif
+static char child_filename[300];
-
-/** Deref scale control.
@@ -1110 +1119 @@
- */
-
+/** Read a region from a file.
+ * \param fd file to read from
+ * \param rhp region buffer to use
+ * \param region region to read
+ */
+static void
+read_cache_region(fd_type fd, RegionHeader * rhp, u_int_16 region)
+{
+  off_t file_offset = region * REGION_SIZE;
+  int j;
+  char *pos;
+  size_t remaining;
+  int done;
+
+  /* Try to seek up to 3 times... */
+  for (j = 0; j < 3; j++)
+#ifdef WIN32
+    if (SetFilePointer(fd, file_offset, NULL, FILE_BEGIN) == file_offset)
+      break;
+#else
+    if (lseek(fd, file_offset, SEEK_SET) == file_offset)
+      break;
+#endif
+  if (j >= 3)
+#ifdef WIN32
+    panic(tprintf("chunk swap file seek, GetLastError %d", GetLastError()));
+#else
+    panic(tprintf("chunk swap file seek, errno %d: %s",
+          errno, strerror(errno)));
+#endif
+  pos = (char *) rhp;
+  remaining = REGION_SIZE;
+  for (j = 0; j < 10; j++) {
+#ifdef WIN32
+    if (!ReadFile(fd, pos, remaining, &done, NULL)) {
+      /* nothing */
+    }
+#else
+    done = read(fd, pos, remaining);
+#endif
+    if (done >= 0) {
+      remaining -= done;
+      pos += done;
+      if (!remaining)
+    return;
+    }
+#ifndef WIN32
+    if (done == -1 && errno == EAGAIN)
+      sleep(0);
+#endif
+  }
+#ifdef WIN32
+  panic(tprintf("chunk swap file read, %d remaining, GetLastError %d",
+        remaining, GetLastError()));
+#else
+  panic(tprintf("chunk swap file read, %d remaining, errno %d: %s",
+        remaining, errno, strerror(errno)));
+#endif
+}
+
+/** Write a region from a file.
+ * \param fd file to write to
+ * \param rhp region buffer to use
+ * \param region region to write
+ */
+static void
+write_cache_region(fd_type fd, RegionHeader * rhp, u_int_16 region)
+{
+  off_t file_offset = region * REGION_SIZE;
+  int j;
+  char *pos;
+  size_t remaining;
+  int done;
+
+  /* Try to seek up to 3 times... */
+  for (j = 0; j < 3; j++)
+#ifdef WIN32
+    if (SetFilePointer(fd, file_offset, NULL, FILE_BEGIN) == file_offset)
+      break;
+#else
+    if (lseek(fd, file_offset, SEEK_SET) == file_offset)
+      break;
+#endif
+  if (j >= 3)
+#ifdef WIN32
+    panic(tprintf("chunk swap file seek, GetLastError %d", GetLastError()));
+#else
+    panic(tprintf("chunk swap file seek, errno %d: %s",
+          errno, strerror(errno)));
+#endif
+  pos = (char *) rhp;
+  remaining = REGION_SIZE;
+  for (j = 0; j < 10; j++) {
+#ifdef WIN32
+    if (!WriteFile(fd, pos, remaining, &done, NULL)) {
+      /* nothing */
+    }
+#else
+    done = write(fd, pos, remaining);
+#endif
+    if (done >= 0) {
+      remaining -= done;
+      pos += done;
+      if (!remaining)
+    return;
+    }
+#ifndef WIN32
+    if (done == -1 && errno == EAGAIN)
+      sleep(0);
+#endif
+  }
+#ifdef WIN32
+  panic(tprintf("chunk swap file write, %d remaining, GetLastError %d",
+        remaining, GetLastError()));
+#else
+  panic(tprintf("chunk swap file write, %d remaining, errno %d: %s",
+        remaining, errno, strerror(errno)));
+#endif
+}
+
-/** Find space in the cache.
- * This is likely to require paging out something.
@@ -1117 +1246 @@
-find_available_cache_region(void)
-{
-  off_t file_offset;
-  RegionHeader *rhp;
-
@@ -1140 +1268 @@
-
-  /* page the current occupant out */
-  file_offset = cache_tail->region_id * REGION_SIZE;
-#ifdef DEBUG_CHUNK_PAGING
-  do_rawlog(LT_TRACE, "CHUNK: Paging out region %04x (offset %08x)",
-        cache_tail->region_id, (unsigned) file_offset);
-#endif
-
-
-
-
-
-
-
-
+
-  /* keep statistics */
-  stat_paging_histogram[RegionDerefs(cache_tail->region_id)]++;
@@ -1198 +1318 @@
-  Region *rp = regions + region;
-  RegionHeader *rhp, *prev, *next;
-  off_t file_offset = region * REGION_SIZE;
-  u_int_32 offset;
-  unsigned int shift;
@@ -1216 +1335 @@
-        region, (unsigned) file_offset);
-#endif
-
-
-
-
-
-
-
-
+
-  /* link the region to its cache entry */
-  rp->in_memory = rhp;
@@ -2405 +2517 @@
-  do {
-    worked = 0;
-
+
+
+
-      while (m_limit && migrate_hardpack(rhp->region_id)) {
-    worked = 1;
-      }
+    }
-  } while (worked);
-
@@ -2428 +2543 @@
-  do {
-    worked = 0;
-
+
+
+
-      while (m_limit && migrate_softpack(rhp->region_id)) {
-    worked = 1;
-      }
+    }
-  } while (worked);
-#ifdef DEBUG_CHUNK_MIGRATE_LOUD
@@ -2472 +2590 @@
-     (REGION_CAPACITY - MIN_REMNANT_LEN) / UNHAPPINESS_SPACE_DIVISOR);
-
+#ifdef WIN32
+  swap_fd = CreateFile(CHUNK_SWAP_FILE, GENERIC_READ | GENERIC_WRITE,
+               0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL);
+  if (swap_fd == INVALID_HANDLE_VALUE)
+    panic(tprintf("Cannot open swap file: %d", GetLastError()));
+#else
-  swap_fd = open(CHUNK_SWAP_FILE, O_RDWR | O_TRUNC | O_CREAT, 0600);
-  if (swap_fd < 0)
-    panic(tprintf("Cannot open swap file: %s", strerror(errno)));
+#endif
-  curr_period = 0;
-
@@ -2588 +2713 @@
-  }
-}
+
+#ifndef WIN32
+/** Clone the chunkswap file for forking dumps.
+ * \retval 0 if unable to clone the swap file
+ * \retval 1 if swap file clone succeeded
+ */
+int
+chunk_fork_file(void)
+{
+  unsigned int j;
+  RegionHeader *rhp, *prev, *next;
+
+  /* abort if already cloned */
+  if (swap_fd_child >= 0)
+    return 0;
+
+  j = 0;
+  for (;;) {
+    sprintf(child_filename, "%s.%d", CHUNK_SWAP_FILE, j);
+    swap_fd_child = open(child_filename, O_RDWR | O_EXCL | O_CREAT, 0600);
+    if (swap_fd_child >= 0)
+      break;
+    if (j >= 10)
+      return 0;
+    j++;
+  }
+
+  rhp = find_available_cache_region();
+  prev = rhp->prev;
+  next = rhp->next;
+  for (j = 0; j < region_count; j++) {
+    if (regions[j].in_memory)
+      continue;
+
+    read_cache_region(swap_fd, rhp, j);
+    write_cache_region(swap_fd_child, rhp, j);
+  }
+  rhp->region_id = INVALID_REGION_ID;
+  rhp->prev = prev;
+  rhp->next = next;
+
+  return 1;
+}
+
+/** Assert that we're the parent after fork.
+ */
+void
+chunk_fork_parent(void)
+{
+  if (swap_fd_child < 0)
+    return;
+
+  close(swap_fd_child);
+  swap_fd_child = -1;
+}
+
+/** Assert that we're the child after fork.
+ */
+void
+chunk_fork_child(void)
+{
+  if (swap_fd_child < 0)
+    return;
+
+  close(swap_fd);
+  swap_fd = swap_fd_child;
+  swap_fd_child = -1;
+}
+
+/** Assert that we're done with the cloned chunkswap file.
+ */
+void
+chunk_fork_done(void)
+{
+  if (swap_fd_child < 0)
+    close(swap_fd);
+  else
+    close(swap_fd_child);
+
+  unlink(child_filename);
+  swap_fd_child = -1;
+}
+#endif              /* !WIN32 */

1.7.7/src/conf.c

@@ -1548 +1548 @@
-#endif
-
+#ifdef HAS_OPENSSL
+  notify(player, T(" The MUSH was compiled with SSL support."));
+#endif
+
-#ifdef SINGLE_LOGFILE
-  notify(player, T(" Logging is to a single log file."));

1.7.7/src/extchat.c

@@ -251 +251 @@
-  u = (CHANUSER *) mush_malloc(sizeof(CHANUSER), "CHANUSER");
-  if (!u)
-return NULL
+panic("Couldn't allocate memory in new_user in extchat.c")
-  CUdbref(u) = who;
-  CUtype(u) = CU_DEFAULT_FLAGS;
@@ -294 +294 @@
-load_channel(FILE * fp, CHAN *ch)
-{
-  int ret = 1;
-  strcpy(ChanName(ch), getstring_noalloc(fp));
-  if (feof(fp))
@@ -311 +310 @@
-  ChanMaxUsers(ch) = ChanNumUsers(ch);
-  ChanUsers(ch) = NULL;
-
-
-
-
-
-
+
+
-  return 1;
-}
@@ -332 +327 @@
-    if (GoodObject(player) && Chan_Ok_Type(ch, player)) {
-      user = new_user(player);
-      if (!user)
-    return -1;
-      CUtype(user) = getref(fp);
-      strcpy(CUtitle(user), getstring_noalloc(fp));
@@ -990 +983 @@
-    format_channel_broadcast(chan, u, victim, CB_CHECKQUIET | CB_PRESENCE,
-                 T("<%s> %s has joined this channel."), NULL);
-    ChanNumUsers(chan)++;
-      } else {
-    notify_format(player,
-              T("%s is already on channel <%s>."), Name(victim),
-              ChanName(chan));
-      }
-
-
+
+
+
+
+
+
+
-  } else if (!strcasecmp("off", com) || !strcasecmp("leave", com)) {
-    char title[CU_TITLE_LEN];
@@ -1978 +1971 @@
-    break;
-  }
+}
+
+FUNCTION(fun_cowner)
+{
+  /* Return the dbref of the owner of a channel. */
+  CHAN *c;
+
+  if (!args[0] || !*args[0]) {
+    safe_str(T("#-1 NO CHANNEL GIVEN"), buff, bp);
+    return;
+  }
+  switch (find_channel(args[0], &c, executor)) {
+  case CMATCH_NONE:
+    safe_str(T("#-1 NO SUCH CHANNEL"), buff, bp);
+    break;
+  case CMATCH_AMBIG:
+    safe_str(T("#-1 AMBIGUOUS CHANNEL NAME"), buff, bp);
+    break;
+  default:
+    safe_dbref(ChanCreator(c), buff, bp);
+  }
+
-}
-

1.7.7/src/flags.c

@@ -2286 +2286 @@
-  }
-}
+
+/* Not commented because this should go away in power rewrite */
+const char *
+power_to_string(int pwr)
+{
+  POWER *p;
+  for (p = power_table; p->name; p++) {
+    /* Special case for immortal, which we don't show any more */
+    if (!strcasecmp(p->name, "immortal"))
+      continue;
+    if (pwr & p->flag)
+      return p->name;
+  }
+  return "";
+}

1.7.7/src/funcrypt.c

@@ -27 +27 @@
-#include "ansi.h"
-#include "match.h"
+#ifdef HAS_OPENSSL
+#include <openssl/sha.h>
+#include <openssl/evp.h>
+#else
-#include "shs.h"
+#endif
-#include "confmagic.h"
-
@@ -33 +38 @@
-static char *crunch_code _((char *code));
-static char *crypt_code _((char *code, char *text, int type));
+
+#ifdef HAS_OPENSSL
+static void safe_hexchar(unsigned char c, char *buff, char **bp);
+#endif
-
-/* Copy over only alphanumeric chars */
@@ -120 +129 @@
-FUNCTION(fun_sha0)
-{
+#ifdef HAS_OPENSSL
+  unsigned char hash[SHA_DIGEST_LENGTH];
+  int n;
+
+  SHA(args[0], arglens[0], hash);
+
+  for (n = 0; n < SHA_DIGEST_LENGTH; n++)
+    safe_hexchar(hash[n], buff, bp);
+#else
-  SHS_INFO shsInfo;
-  shsInfo.reverse_wanted = (BYTE) options.reverse_shs;
@@ -128 +146 @@
-          shsInfo.digest[1], shsInfo.digest[2], shsInfo.digest[3],
-          shsInfo.digest[4]);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

1.7.7/src/function.c

@@ -192 +192 @@
-  {"ATRLOCK", fun_atrlock, 1, 2, FN_REG},
-  {"BAND", fun_band, 1, INT_MAX, FN_REG},
+  {"BASECONV", fun_baseconv, 3, 3, FN_REG},
-  {"BEEP", fun_beep, 0, 1, FN_REG},
-  {"BEFORE", fun_before, 2, 2, FN_REG},
@@ -207 +208 @@
-#ifdef CHAT_SYSTEM
-  {"CEMIT", fun_cemit, 2, 3, FN_REG},
+  {"CFLAGS", fun_cflags, 1, 2, FN_REG},
+  {"CHANNELS", fun_channels, 0, 2, FN_REG},
+  {"CLOCK", fun_clock, 1, 2, FN_REG},
+  {"COWNER", fun_cowner, 1, 1, FN_REG},
+  {"CTITLE", fun_ctitle, 2, 2, FN_REG},
+  {"CWHO", fun_cwho, 1, 1, FN_REG},
-#endif
-  {"CENTER", fun_center, 2, 3, FN_REG},
-  {"CHILDREN", fun_lsearch, 1, 1, FN_REG},
-  {"CHR", fun_chr, 1, 1, FN_REG},
-#ifdef CHAT_SYSTEM
-  {"CFLAGS", fun_cflags, 1, 2, FN_REG},
-  {"CHANNELS", fun_channels, 0, 2, FN_REG},
-#endif
-  {"CHECKPASS", fun_checkpass, 2, 2, FN_REG | FN_WIZARD},
-#ifdef CHAT_SYSTEM
-  {"CLOCK", fun_clock, 1, 2, FN_REG},
-#endif
-  {"CLONE", fun_clone, 1, 1, FN_REG},
-  {"COMP", fun_comp, 2, 3, FN_REG},
@@ -231 +231 @@
-  {"CREATE", fun_create, 1, 2, FN_REG},
-  {"CTIME", fun_ctime, 1, 1, FN_REG},
-#ifdef CHAT_SYSTEM
-  {"CTITLE", fun_ctitle, 2, 2, FN_REG},
-  {"CWHO", fun_cwho, 1, 1, FN_REG},
-#endif
-  {"DEC", fun_dec, 1, 1, FN_REG},
-  {"DECRYPT", fun_decrypt, 2, 2, FN_REG},
@@ -241 +237 @@
-  {"DIE", fun_die, 2, 3, FN_REG},
-  {"DIG", fun_dig, 1, 3, FN_REG},
+  {"DIGEST", fun_digest, 2, -2, FN_REG},
-  {"DIST2D", fun_dist2d, 4, 4, FN_REG},
-  {"DIST3D", fun_dist3d, 6, 6, FN_REG},

1.7.7/src/funmath.c

@@ -53 +53 @@
-static double frac(double v, int *RESTRICT n, int *RESTRICT d, double error);
-void init_math_hashtab(void);
+
+extern int format_long(long n, char *buff, char **bp, int maxlen, int base);
-
-MATH_PROTO(math_add);
@@ -1577 +1579 @@
-
-  mush_free((Malloc_t) ptr, "string");
+}
+
+FUNCTION(fun_baseconv)
+{
+  long n;
+  int from, to;
+  char *end;
+
+  if (!(is_integer(args[1]) && is_integer(args[2]))) {
+    safe_str(T(e_ints), buff, bp);
+    return;
+  }
+
+  from = parse_integer(args[1]);
+  to = parse_integer(args[2]);
+
+  if (from < 2 || from > 36) {
+    safe_str(T("#-1 FROM BASE OUT OF RANGE"), buff, bp);
+    return;
+  }
+
+  if (to < 2 || to > 36) {
+    safe_str(T("#-1 TO BASE OUT OF RANGE"), buff, bp);
+    return;
+  }
+
+  n = strtol(trim_space_sep(args[0], ' '), &end, from);
+
+  if (*end != '\0') {
+    safe_str(T("#-1 MALFORMED NUMBER"), buff, bp);
+    return;
+  }
+
+  format_long(n, buff, bp, BUFFER_LEN, to);
-}
-

1.7.7/src/game.c

@@ -537 +537 @@
-fork_and_dump(int forking)
-{
-
+, split
-  epoch++;
-
@@ -549 +549 @@
-  else
-    nofork = !forking || (paranoid_dump == 2);  /* Don't fork for dump/debug */
-  if (!nofork && chunk_num_swapped()) {
-    /* Ack, can't fork, 'cause we have stuff on disk... */
-    do_log(LT_ERR, 0, 0,
-       "fork_and_dump: Data are swapped to disk, so nonforking dumps will be used.");
-    flag_broadcast("WIZARD", 0,
-           "DUMP: Data are swapped to disk, so nonforking dumps will be used.");
-    nofork = 1;
-  }
-#ifdef WIN32
-  nofork = 1;
@@ -563 +555 @@
-  nofork = 1;
-#endif
+  split = 0;
+  if (!nofork && chunk_num_swapped()) {
+#ifndef WIN32
+    /* Try to clone the chunk swapfile. */
+    if (chunk_fork_file()) {
+      split = 1;
+    } else {
+      /* Ack, can't fork, 'cause we have stuff on disk... */
+      do_log(LT_ERR, 0, 0,
+         "fork_and_dump: Data are swapped to disk, so nonforking dumps will be used.");
+      flag_broadcast("WIZARD", 0,
+             "DUMP: Data are swapped to disk, so nonforking dumps will be used.");
+      nofork = 1;
+    }
+#endif
+  }
-  if (!nofork) {
-#ifndef macintosh
@@ -575 +583 @@
-      child = 0;
-      nofork = 1;
-
+
+
+
+
+
-      forked_dump_pid = child;
-
+
+
+
-#ifdef HAS_SETPRIORITY
-    else {
-      /* Lower the priority of the child to make parent more responsive */
-#ifdef HAS_GETPRIORITY
@@ -586 +599 @@
-      setpriority(PRIO_PROCESS, child, 8);
-#endif              /* HAS_GETPRIORITY */
-    }
-#endif              /* HAS_SETPRIORITY */
+    }
-#endif              /* WIN32 */
-#endif              /* macintosh */
@@ -599 +612 @@
-    release_fd();
-    status = dump_database_internal();
+#ifndef WIN32
+    if (split)
+      chunk_fork_done();
+#endif
-    if (!nofork) {
-      _exit(status);        /* !!! */

1.7.7/src/mycrypt.c

@@ -14 +14 @@
-#include "conf.h"
-#if (CRYPT_SYSTEM > 0)
+#ifdef HAS_OPENSSL
+#include <openssl/sha.h>
+#else
-#include "shs.h"
+#endif
-#endif
-#include "confmagic.h"
@@ -30 +34 @@
-  return (char *) key;
-#else
+  static char crypt_buff[70];
+
+#ifdef HAS_OPENSSL
+  char hash[SHA_DIGEST_LENGTH];
+  unsigned int a, b;
+
+  SHA(key, strlen(key), hash);
+
+  memcpy(&a, hash, sizeof a);
+  memcpy(&b, hash + sizeof a, sizeof b);
+