Changeset 415

Timestamp:

08/12/06 17:02:10 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p8 Archival

Files:

• 1.7.7/CHANGES (modified) (1 diff)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennvers.hlp (modified) (3 diffs)
• 1.7.7/hdrs/command.h (modified) (1 diff)
• 1.7.7/hdrs/externs.h (modified) (1 diff)
• 1.7.7/hdrs/game.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/bsd.c (modified) (1 diff)
• 1.7.7/src/cmdlocal.dst (modified) (2 diffs)
• 1.7.7/src/cmds.c (modified) (2 diffs)
• 1.7.7/src/command.c (modified) (1 diff)
• 1.7.7/src/conf.c (modified) (11 diffs)
• 1.7.7/src/flags.c (modified) (7 diffs)
• 1.7.7/src/game.c (modified) (2 diffs)
• 1.7.7/src/help.c (modified) (1 diff)
• 1.7.7/src/timer.c (modified) (1 diff)

1.7.7/CHANGES

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 8                      January 27, 2003
+
+Minor Changes:
+  * command_add now expects to receive the flag list and the 
+    switch list as strings. Folks who hack into cmdlocal.c should
+    take note and read example in the new cmdlocal.dst
+Fixes:
+  * Players were not created with all the player_flags. In a related
+    bug, checking of command flag restrictions wouldn't work with
+    all flags. Reported by Cory Descoteau.
+  * Flagmasks on commands weren't grown properly when flags were added.
+
-
-Version 1.7.7 patchlevel 7                      January 25, 2003

1.7.7/Patchlevel

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

1.7.7/game/txt/hlp/pennvers.hlp

@@ -1 +1 @@
-& changes
-7
+8
-This is a list of changes in this patchlevel which are probably of
-interest to players. More information about new commands and functions
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Fixes:
@@ -6031 +6045 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
+, 8
-1.7.6: 0, 1, 2, 3, 4, 5, 6
-1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12

1.7.7/hdrs/command.h

@@ -165 +165 @@
-extern COMMAND_INFO *command_find_exact(const char *name);
-extern COMMAND_INFO *command_add
-object_flag_type flagmask
-switch_mask *sw
+const char *flagstr
+const char *switchstr
-extern COMMAND_INFO *make_command
-  (const char *name, int type, object_flag_type flagmask, int powers,

1.7.7/hdrs/externs.h

@@ -51 +51 @@
-                dbref cause, int from_port);
-extern int init_game_dbs(void);
+extern void init_game_postdb(const char *conf);
-extern void init_game_config(const char *conf);
-extern void dump_database(void);

1.7.7/hdrs/game.h

@@ -43 +43 @@
-
-/* From conf.c */
-
+, int restrictions
-
-/* From db.c */

1.7.7/hdrs/version.h

@@ -1 @@
-7 [01/25
-7
-7
+8 [01/27
+8
+8

1.7.7/src/bsd.c

@@ -622 +622 @@
-    exit(2);
-  }
+
+  init_game_postdb(confname);
+
-  set_signals();
-

1.7.7/src/cmdlocal.dst

@@ -59 +59 @@
- * command into the command hash table. Any command you add here
- * will be auto-aliased for you.
+ * The way to call command_add is illustrated below. The arguments are:
+ *   Name of the command, a string ("@SILLY")
+ *   Command parsing modifiers, a bitmask (see hdrs/command.h)
+ *   Flags to restrict command to, a string ("WIZARD ROYALTY") or NULL
+ *     (Someone with *any* one of these flags can use the command)
+ *   Powers to restrict command to, a bitmask (see hdrs/flags.h) or 0
+ *     (Someone with this power can use the command)
+ *   Switches the command can take, a string or NULL ("NOISY NOEVAL")
+ *   Hardcoded function the command should call (cmd_local_silly)
- */
-void
@@ -64 +73 @@
-{
-#ifdef EXAMPLE
-0, 0, switchmask("NOISY NOEVAL")
+"WIZARD ROYALTY", SEE_ALL, "NOISY NOEVAL"
-          cmd_local_silly);
-#endif

1.7.7/src/cmds.c

@@ -47 +47 @@
-void do_scan(dbref player, char *command, int flag);
-void do_uptime(dbref player, int mortal);
-
+, int restrictions
-
-/* From command.c */
@@ -207 +207 @@
-      return;
-    }
-
+
+
-      notify(player, T("Couldn't set that option"));
-    else

1.7.7/src/command.c

@@ -415 +415 @@
-
-COMMAND_INFO *
-
-
-
-
+
+
+
+
+
+
+
+
-  ptab_start_inserts(&ptab_command);
-  ptab_insert(&ptab_command, name,

1.7.7/src/conf.c

@@ -66 +66 @@
-int cf_flag(const char *opt, const char *val, void *loc, int maxval,
-        int source);
-
+, int restrictions
-void conf_default_set(void);
-
@@ -594 +594 @@
-
-int
-
+, int restrictions
-    /* source: 0 from mush.cnf, 1 from @config or config() */
-{
@@ -602 +602 @@
-  /* Was this "restrict_command <command> <restriction>"? If so, do it */
-  if (!strcasecmp(opt, "restrict_command")) {
+    if (!restrictions)
+      return 1;
-    for (p = val; *p && !isspace((unsigned char) *p); p++) ;
-    if (*p) {
@@ -622 +624 @@
-    }
-    return 1;
-  } else if (!strcasecmp(opt, "command_alias")) {
-    for (p = val; *p && !isspace((unsigned char) *p); p++) ;
-    if (*p) {
-      *p++ = '\0';
-      if (!alias_command(val, p)) {
-    if (source == 0) {
-      do_rawlog(LT_ERR, T("CONFIG: Couldn't alias %s to %s.\n"), p, val);
-    }
-    return 0;
-      }
-    } else {
-      if (source == 0) {
-    do_rawlog(LT_ERR,
-          T("CONFIG: command_alias %s requires an alias.\n"), val);
-      }
-      return 0;
-    }
-    return 1;
-  } else if (!strcasecmp(opt, "attribute_alias")) {
-    for (p = val; *p && !isspace((unsigned char) *p); p++) ;
-    if (*p) {
-      *p++ = '\0';
-      if (!alias_attribute(val, p)) {
-    if (source == 0) {
-      do_rawlog(LT_ERR, T("CONFIG: Couldn't alias %s to %s.\n"), p, val);
-    }
-    return 0;
-      }
-    } else {
-      if (source == 0) {
-    do_rawlog(LT_ERR,
-          T("CONFIG: attribute_alias %s requires an alias.\n"), val);
-      }
-      return 0;
-    }
-    return 1;
-  } else if (!strcasecmp(opt, "function_alias")) {
-    for (p = val; *p && !isspace((unsigned char) *p); p++) ;
-    if (*p) {
-      *p++ = '\0';
-      if (!alias_function(val, p)) {
-    if (source == 0) {
-      do_rawlog(LT_ERR, T("CONFIG: Couldn't alias %s to %s.\n"), p, val);
-    }
-    return 0;
-      }
-    } else {
-      if (source == 0) {
-    do_rawlog(LT_ERR,
-          T("CONFIG: function_alias %s requires an alias.\n"), val);
-      }
-      return 0;
-    }
-    return 1;
-  } else if (!strcasecmp(opt, "restrict_function")) {
+    if (!restrictions)
+      return 1;
-    for (p = val; *p && !isspace((unsigned char) *p); p++) ;
-    if (*p) {
@@ -699 +649 @@
-    return 1;
-  } else if (!strcasecmp(opt, "reserve_alias")) {
+    if (!restrictions)
+      return 1;
-    reserve_alias(val);
+    return 1;
+  } else if (!strcasecmp(opt, "command_alias")) {
+    if (!restrictions)
+      return 1;
+    for (p = val; *p && !isspace((unsigned char) *p); p++) ;
+    if (*p) {
+      *p++ = '\0';
+      if (!alias_command(val, p)) {
+    if (source == 0) {
+      do_rawlog(LT_ERR, T("CONFIG: Couldn't alias %s to %s.\n"), p, val);
+    }
+    return 0;
+      }
+    } else {
+      if (source == 0) {
+    do_rawlog(LT_ERR,
+          T("CONFIG: command_alias %s requires an alias.\n"), val);
+      }
+      return 0;
+    }
+    return 1;
+  } else if (!strcasecmp(opt, "attribute_alias")) {
+    if (!restrictions)
+      return 1;
+    for (p = val; *p && !isspace((unsigned char) *p); p++) ;
+    if (*p) {
+      *p++ = '\0';
+      if (!alias_attribute(val, p)) {
+    if (source == 0) {
+      do_rawlog(LT_ERR, T("CONFIG: Couldn't alias %s to %s.\n"), p, val);
+    }
+    return 0;
+      }
+    } else {
+      if (source == 0) {
+    do_rawlog(LT_ERR,
+          T("CONFIG: attribute_alias %s requires an alias.\n"), val);
+      }
+      return 0;
+    }
+    return 1;
+  } else if (!strcasecmp(opt, "function_alias")) {
+    if (!restrictions)
+      return 1;
+    for (p = val; *p && !isspace((unsigned char) *p); p++) ;
+    if (*p) {
+      *p++ = '\0';
+      if (!alias_function(val, p)) {
+    if (source == 0) {
+      do_rawlog(LT_ERR, T("CONFIG: Couldn't alias %s to %s.\n"), p, val);
+    }
+    return 0;
+      }
+    } else {
+      if (source == 0) {
+    do_rawlog(LT_ERR,
+          T("CONFIG: function_alias %s requires an alias.\n"), val);
+      }
+      return 0;
+    }
-    return 1;
-  } else if (!strcasecmp(opt, "help_command")
@@ -705 +717 @@
-    char *comm, *file;
-    int admin = !strcasecmp(opt, "ahelp_command");
+    if (!restrictions)
+      return 1;
-    /* Add a new help-like command */
-    if (source == 1)
@@ -726 +740 @@
-      return 0;
-    }
+  } else if (restrictions) {
+    return 1;
-  }
-  /* search conf table for the option; if found, add it, if not found,
@@ -906 +922 @@
-
-int
-
+, int restrictions
-{
-  /* read a configuration file. Return 0 on failure, 1 on success */
+  /* If 'restrictions' is 0, ignore restrict*. If it's 1, only
+   * look at restrict*
+   */
-
-  FILE *fp = NULL;
@@ -929 +948 @@
-    }
-    do_rawlog(LT_ERR, "Reading %s", cfile);
-    conf_default_set();     /* initialize defaults the first time */
-  } else {
-    if (conf && *conf)
@@ -995 +1013 @@
-            conf);
-    } else {
-
+, restrictions
-    }
-    conf_recursion--;
-      } else
-
+, restrictions
-    }
-    fgets(tbuf1, BUFFER_LEN, fp);
@@ -1213 +1231 @@
-      return;
-    }
-
+
+
-      safe_str(T("#-1 UNABLE TO SET OPTION"), buff, bp);
-      return;

1.7.7/src/flags.c

@@ -25 +25 @@
-
-#include "conf.h"
+#include "command.h"
-#include "attrib.h"
-#include "mushdb.h"
@@ -58 +59 @@
-                 * position. Aliases not inclued. */
-static int flagbits = 0;    /* The current length of the flags array */
+
+extern PTAB ptab_command;   /* Uses flag bitmasks */
+
-
-/* This is the old default flag table. We still use it when we have to
@@ -382 +386 @@
-  dbref it;
-  object_flag_type p;
+  COMMAND_INFO *command;
-
-  for (it = 0; it < db_top; it++) {
@@ -388 +393 @@
-    p = Flags(it) + numbytes - 1;
-    memset(p, 0, 1);
+  }
+  /* We also need to make sure that all the command flagmasks are
+   * reallocated!
+   */
+  command = (COMMAND_INFO *) ptab_firstentry(&ptab_command);
+  while (command) {
+    if (command->flagmask) {
+      command->flagmask =
+    (object_flag_type) realloc(command->flagmask, numbytes);
+      /* Zero them out */
+      p = command->flagmask + numbytes - 1;
+      memset(p, 0, 1);
+    }
+    command = (COMMAND_INFO *) ptab_nextentry(&ptab_command);
-  }
-}
@@ -655 +674 @@
-copy_flag_bitmask(object_flag_type dest, object_flag_type given)
-{
-
+
+
-}
-
@@ -709 +729 @@
-  unsigned int i;
-  int ok = 1;
-
+
+
-    ok &= ((*(bitmask + i) & *(source + i)) == *(bitmask + i));
-  return ok;
@@ -720 +741 @@
-  unsigned int i;
-  int ok = 0;
-
+
+
-    ok |= (*(bitmask + i) & *(source + i));
-  return ok;

1.7.7/src/game.c

@@ -102 +102 @@
-int paranoid_checkpt = 0;   /* write out an okay message every x objs */
-extern long indb_flags;
+extern void conf_default_set(void);
-static void dump_database_internal(void);
-static FILE *db_open(const char *filename);
@@ -626 +627 @@
-  memset(&current_state, 0, sizeof current_state);
-
+  /* Load all the config file stuff except restrict_* */
+  conf_default_set();
+  config_file_startup(conf, 0);
+}
+
+/* Code that should be run after dbs are loaded (usually because we 
+ * need to have the flag table loaded
+ */
+void
+init_game_postdb(const char *conf)
+{
+  /* Commands and functions require the flag table for restrictions */
-  command_init_preconfig();
-  config_file_startup(conf);
-  command_init_postconfig();
-  function_init_postconfig();
-
+
+
+
+
-
-int

1.7.7/src/help.c

@@ -109 +109 @@
-    return;
-  }
-0
+NULL
-             cmd_helpcmd);
-  hashadd(h->command, h, &help_files);

1.7.7/src/timer.c

@@ -97 +97 @@
-  if (hup_triggered) {
-    do_rawlog(LT_ERR, T("SIGHUP received: reloading .txt and .cnf files"));
-
+
+
-    fcache_load(NOTHING);
-    help_reindex(NOTHING);