Changeset 1302

Timestamp:

10/01/08 01:21:51 (2 months ago)

Author:

shawnw

Message:

#7687: @config/save

Files:

• 1.8.3/branches/devel/CHANGES.183 (modified) (1 diff)
• 1.8.3/branches/devel/config.h.in (modified) (1 diff)
• 1.8.3/branches/devel/configure (modified) (4 diffs)
• 1.8.3/branches/devel/configure.in (modified) (2 diffs)
• 1.8.3/branches/devel/game/txt/hlp/penncmd.hlp (modified) (2 diffs)
• 1.8.3/branches/devel/hdrs/switches.h (modified) (1 diff)
• 1.8.3/branches/devel/src/SWITCHES (modified) (1 diff)
• 1.8.3/branches/devel/src/cmds.c (modified) (2 diffs)
• 1.8.3/branches/devel/src/command.c (modified) (1 diff)
• 1.8.3/branches/devel/src/conf.c (modified) (22 diffs)
• 1.8.3/branches/devel/src/switchinc.c (modified) (1 diff)

1.8.3/branches/devel/CHANGES.183

@@ -17 +17 @@
-
-Version 1.8.3 patchlevel 8                      ??? ??, 200? 
+
+Minor changes:
+ * @config/save foo=bar acts like @config/set but also attempts to
+   alter the original configuration file to reflect the new value.
- 
-Version 1.8.3 patchlevel 7                      Oct 01, 2008
-
-Minor changes:
-Minor changes:
- * If compiling with a recent enough version of gcc to support the

1.8.3/branches/devel/config.h.in

@@ -351 +351 @@
-#undef SENDMAIL
-
+#undef HAVE_ED
+#undef ED_PATH
+
-#undef HAVE_SAFE_TOUPPER
-

1.8.3/branches/devel/configure

@@ -658 +658 @@
-GREP
-CPP
+ED
-SENDMAIL
-UPTIME
@@ -749 +750 @@
-PERL
-SENDMAIL
+ED
-CPP
-CXX
@@ -1405 +1407 @@
-  PERL        Absolute path to perl executable
-  SENDMAIL    Path to sendmail
+  ED          Path to ed
-  CPP         C preprocessor
-  CXX         C++ compiler command
@@ -4071 +4074 @@
-fi
-
+
+# Extract the first word of "ed", so it can be a program name with args.
+set dummy ed; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ED+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  case $ED in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ED="$ED" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ED="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ED=$ac_cv_path_ED
+if test -n "$ED"; then
+  { $as_echo "$as_me:$LINENO: result: $ED" >&5
+$as_echo "$ED" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test "${ED+set}" = "set"; then
+   cat >>confdefs.h <<\_ACEOF
+#define HAVE_ED 1
+_ACEOF
+
+   cat >>confdefs.h <<_ACEOF
+#define ED_PATH "$ED -s"
+_ACEOF
+
+fi
-
-### Headers

1.8.3/branches/devel/configure.in

@@ -86 +86 @@
-fi
-
-Path to sendmail
+[Path to sendmail]
-AC_PATH_PROG(SENDMAIL, sendmail)
-if test "${SENDMAIL+set}" = "set"; then
@@ -93 +93 @@
-fi
-
+AC_ARG_VAR(ED, [Path to ed])
+AC_PATH_PROG(ED, ed)
+if test "${ED+set}" = "set"; then
+   AC_DEFINE([HAVE_ED])
+   AC_DEFINE_UNQUOTED([ED_PATH], "$ED -s")
+fi
-
-### Headers

1.8.3/branches/devel/game/txt/hlp/penncmd.hlp

@@ -672 +672 @@
-  @config/flags
-  @config/list[/lowercase] [<option|option-type>]
-
+|save
-  
-  This command lists the MUSH configuration parameters, indicating what
@@ -686 +686 @@
-  /set        --   Wizard only, changes parameters from the mush. See
-                   help @config parameters for available ones.
+  /save       --   Like /set, but also modifies the config file so the
+                   change persists over reboots.
-& @conformat
-  @conformat <object> [=<format>]

1.8.3/branches/devel/hdrs/switches.h

@@ -119 +119 @@
-#define SWITCH_ROOMS 116
-#define SWITCH_RSARGS 117
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif                          /* SWITCHES_H */

1.8.3/branches/devel/src/SWITCHES

@@ -116 +116 @@
-ROOMS
-RSARGS
+SAVE
-SEE
-SEEFLAG

1.8.3/branches/devel/src/cmds.c

@@ -170 +170 @@
-  else if (SW_ISSET(sw, SWITCH_POWERS))
-    do_list_flags("POWER", player, arg_left, lc, T("Powers"));
-
+ || SW_ISSET(sw, SWITCH_SAVE)
-    if (!Wizard(player)) {
-      notify(player, T("You can't remake the world in your image."));
@@ -179 +179 @@
-      return;
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  } else
-    do_config_list(player, arg_left, lc);

1.8.3/branches/devel/src/command.c

@@ -112 +112 @@
-   CMD_T_ANY | CMD_T_EQSPLIT | CMD_T_NOGAGGED, 0, 0},
-  {"@CONFIG",
-
+SAVE 
-   cmd_config, CMD_T_ANY | CMD_T_EQSPLIT, 0, 0},
-  {"@CPATTR", "CONVERT NOFLAGCOPY", cmd_cpattr,

1.8.3/branches/devel/src/conf.c

@@ -24 +24 @@
-#include <stdlib.h>
-#include <ctype.h>
+#include <errno.h>
-
-#include "conf.h"
@@ -44 +45 @@
-
-static void show_compile_options(dbref player);
-
-
+
-
-OPTTAB options;         /**< The table of configuration options */
@@ -880 +880 @@
-}
-
+static char *toplevel_cfile = NULL;
+
+static void
+append_restriction(const char *r, const char *what, const char *opts)
+{
+  FILE *out;
+
+  out = fopen(toplevel_cfile, "a");
+  if (out) {
+    fprintf(out, "# Added by @config/save\n%s %s %s\n\n",
+        r, what, opts);
+    fclose(out);
+  }
+}
+
+/* Not perfect -- things defined in included config files won't
+   get changed -- but it'll catch most cases.
+*/
+static void
+save_config_option(PENNCONF *cp)
+{
+#if defined(HAVE_ED)
+  FILE *ed;
+  
+  /* ed is the standard! Why reinvent it? */
+
+  ed = popen(ED_PATH, "w");
+  if (!ed) {
+    do_rawlog(LT_ERR, "Unable to open ed: %s", strerror(errno));
+    return;
+  }
+  
+  fprintf(ed, "e %s\n", toplevel_cfile);
+  fprintf(ed, ",s/^[[:space:]]*%s[[:space:]].*$/%s/\n", cp->name,
+      trim_space_sep(config_to_string(GOD, cp, 1), ' '));
+  fputs("wq\n", ed);
+  pclose(ed);
+#endif
+
+}
+
-/** Set a configuration option.
- * This function sets a runtime configuration option. During the load
@@ -887 +928 @@
- * \param opt name of the option.
- * \param val value to set the option to.
-
+, 2 from softcode and saving
- * \param restrictions 1 if we're setting restriction options, 0 for others.
- * \retval 1 success.
@@ -924 +965 @@
-      return 0;
-    }
+    if (source == 2)
+      append_restriction("restrict_command", val, p);
-    return 1;
-  } else if (!strcasecmp(opt, "restrict_function")) {
@@ -947 +990 @@
-      return 0;
-    }
+    if (source == 2)
+      append_restriction("restrict_function", val, p);
-    return 1;
-  } else if (!strcasecmp(opt, "reserve_alias")) {
@@ -972 +1017 @@
-      return 0;
-    }
+    if (source == 2)
+      append_restriction("reserve_alias", val, p);
-    return 1;
-  } else if (!strcasecmp(opt, "attribute_alias")) {
@@ -992 +1039 @@
-      return 0;
-    }
+    if (source == 2)
+      append_restriction("attribute_alias", val, p);
-    return 1;
-  } else if (!strcasecmp(opt, "function_alias")) {
@@ -1012 +1061 @@
-      return 0;
-    }
+    if (source == 2)
+      append_restriction("function_alias", val, p);
-    return 1;
-  } else if (!strcasecmp(opt, "help_command")
@@ -1020 +1071 @@
-      return 0;
-    /* Add a new help-like command */
-== 1)
+>= 1) /* Can't do this from @config/set */
-      return 0;
-    if (!val || !*val) {
@@ -1053 +1104 @@
-        && !strcasecmp(cp->name, opt)) {
-      i = cp->handler(opt, val, cp->loc, cp->max, source);
-
+ {
-        cp->overridden = 1;
+    if (source == 2)
+      save_config_option(cp);
+      }
-      return i;
-    }
-  }
-(PENNCONF *) 
-(PENNCONF *) 
+
+
-    int i = 0;
-    if ((!source || (cp->group && strcmp(cp->group, "files") != 0
@@ -1065 +1119 @@
-        && !strcasecmp(cp->name, opt)) {
-      i = cp->handler(opt, val, cp->loc, cp->max, source);
-
+ {
-        cp->overridden = 1;
+    if (source == 2)
+      save_config_option(cp);
+      }
-      return i;
-    }
@@ -1287 +1344 @@
-  char tbuf1[BUFFER_LEN];
-  char *p, *q, *s;
-
-  static char cfile[BUFFER_LEN];        /* Remember the last one */
+
-  if (conf_recursion == 0) {
-    if (conf && *conf)
@@ -1298 +1355 @@
-    }
-    do_rawlog(LT_ERR, "Reading %s", cfile);
+    if (toplevel_cfile == NULL)
+      toplevel_cfile = mush_strdup(cfile, "config.file");
-  } else {
-    if (conf && *conf)
@@ -1452 +1511 @@
-      for (cp = conftable; cp->name; cp++) {
-        if (cp->group && string_prefix(cp->name, type)) {
-list_helper
+to_string
-          found = 1;
-        }
@@ -1461 +1520 @@
-             cp = (PENNCONF *) hash_nextentry(&local_options)) {
-          if (cp->group && !strcasecmp(cp->name, type)) {
-list_helper
+to_string
-            found = 1;
-          }
@@ -1482 +1541 @@
-        for (cp = conftable; cp->name; cp++) {
-          if (cp->group && !strcmp(cp->group, cgp->name)) {
-list_helper
+to_string
-          }
-        }
@@ -1488 +1547 @@
-             cp = (PENNCONF *) hash_nextentry(&local_options)) {
-          if (cp->group && !strcasecmp(cp->group, cgp->name)) {
-list_helper
+to_string
-          }
-        }
@@ -1509 +1568 @@
-#define MAYBE_LC(x) (lc ? strlower(x) : x)
-static char *
-list_helper
+to_string
-                   __attribute__ ((__unused__)), PENNCONF *cp, int lc)
-{
@@ -1550 +1609 @@
-/* This one doesn't return the names */
-static char *
-list_helper
+to_string
-                    __attribute__ ((__unused__)), PENNCONF *cp, int lc
-                    __attribute__ ((__unused__)))
@@ -1596 +1655 @@
-    for (cp = conftable; cp->name; cp++) {
-      if (cp->group && !strcasecmp(cp->name, args[0])) {
-list_helper
+to_string
-        return;
-      }
@@ -1603 +1662 @@
-         cp = (PENNCONF *) hash_nextentry(&local_options)) {
-      if (cp->group && !strcasecmp(cp->name, args[0])) {
-list_helper
+to_string
-        return;
-      }

1.8.3/branches/devel/src/switchinc.c

@@ -118 +118 @@
-  {"ROOMS", SWITCH_ROOMS},
-  {"RSARGS", SWITCH_RSARGS},
+  {"SAVE", SWITCH_SAVE},
-  {"SEE", SWITCH_SEE},
-  {"SEEFLAG", SWITCH_SEEFLAG},