cleaned up #option code and added '#option list'

7 files changed, 159 insertions, 108 deletions

diff --git a/ChangeLog.old b/ChangeLog.old
index 95af66e..d228e5d 100644
--- a/ChangeLog.old
+++ b/ChangeLog.old
@@ -1,5 +1,7 @@
 2008-12-31        dain
 
+	* cmd.c: Added '#option list' to print all options and explanatory
+	  text.
 	* powwow.6: Supprt automatically converting man page to different
 	  encodings by setting MAN_PAGE_ENCODING when running
 	  configure. Defaults to UTF-8 on all hosts except OS X (darwin),
diff --git a/cmd.c b/cmd.c
index 628d213..f15bf5c 100644
--- a/cmd.c
+++ b/cmd.c
@@ -2424,91 +2424,150 @@ static void cmd_quit __P1 (char *,arg)
 	exit_powwow();
 }
 
-char *full_options_string = "#option %cexit %chistory %cwords %ccompact %cdebug %cecho %cinfo %ckeyecho %cspeedwalk\n#option %cwrap %cautoprint %creprint %csendsize %cautoclear%s";
+static const struct {
+    const char *name;
+    char *option;
+    const char *doc;
+} options[] = {
+    { "autoclear", &opt_autoclear,
+      "clear input line before executing commands" },
+    { "autoprint", &opt_autoprint,
+      "#print lines matched by actions" },
+    { "compact",   &opt_compact,
+      "remove prompt when receiving new messages from mud" },
+    { "debug",     &opt_debug,
+      "print commands before executing" },
+    { "echo",      &opt_echo,
+      "print command action commands when executed" },
+    { "exit",      &opt_exit,
+      "automatically exit powwow when mud connection closes" },
+    { "history",   &opt_history,
+      "also save command history" },
+    { "info",      &opt_info,
+      "print information about command effects" },
+    { "keyecho",   &opt_keyecho,
+      "print command bound to key when executed" },
+    { "reprint",   &opt_reprint,
+      "reprint sent commands when getting new prompt" },
+    { "sendsize",  &opt_sendsize,
+      "send terminal size when opening connection" },
+    { "speedwalk", &opt_speedwalk,
+      "enable speed walking (ness3ew...)" },
+    { "words",     &opt_words,
+      "also save word history" },
+    { "wrap",      &opt_wrap,
+      "enable word wrapping" },
+    { NULL }
+};
+
+/* print all options to 'file', or tty if file is NULL; return -1 on
+ * error, 1 on success */
+int print_all_options __P1 (FILE *,file)
+{
+    const char *prefix = "#option";
+    int width = (file ? 80 : cols) - 16;
+    int len = 0, i;
+    for (i = 0; options[i].name; ++i) {
+        int res;
+        if (file)
+            res = fprintf(file, "%s %c%s", prefix,
+                          *options[i].option ? '+' : '-',
+                          options[i].name);
+        else
+            res = tty_printf("%s %c%s", prefix,
+                             *options[i].option ? '+' : '-',
+                             options[i].name);
+        if (res < 0)
+            return -1;
+        /* don't rely on printf() return value */
+        len += strlen(prefix) + strlen(options[i].name) + 2;
+        if (len >= width) {
+            prefix = "\n#option";
+            len = -1;
+        } else {
+            prefix = "";
+        }
+    }
+    if (file) {
+        fputc('\n', file);
+    } else {
+        tty_putc('\n');
+        status(1);
+    }
+    return 1;
+}
 
 static void cmd_option __P1 (char *,arg)
 {
-    if (*(arg = skipspace(arg))) {
-	int len, i, count = 0;
-	static char *str[] = { "exit", "history", "words",
-		"compact", "debug", "echo", "info", "keyecho",
-		"speedwalk", "wrap", "autoprint", "reprint",
-		"sendsize", "autoclear", 0 };
-	static char *varptr[] = { &opt_exit, &opt_history, &opt_words,
-		&opt_compact, &opt_debug, &opt_echo, &opt_info, &opt_keyecho,
-		&opt_speedwalk, &opt_wrap, &opt_autoprint, &opt_reprint,
-		&opt_sendsize, &opt_autoclear, 0 };
-	enum { MODE_ON, MODE_OFF, MODE_TOGGLE, MODE_REP } mode;
-	char buf[BUFSIZE], *p, *varp, c;
-	while ((arg = skipspace(split_first_word(buf, BUFSIZE, arg))), *buf) {
-	    c = *(p = buf);
-	    switch (c) {
-	     case '=': mode = MODE_REP; p++; break;
-	     case '+': mode = MODE_ON;  p++; break;
-	     case '-': mode = MODE_OFF; p++; break;
-	     default:  mode = MODE_TOGGLE;     break;
-	    }
-	    len = strlen(p);
-	    varp = 0;
-	    count++;
-	    for (i=0; str[i]; i++) {
-		if (strncmp(str[i], p, len) == 0) {
-		    varp = varptr[i];
-		    break;
-		}
-	    }
-	    if (!str[i]) {
-		if (strncmp("none", p, len) == 0)
-		    continue;
-		else {
-		    PRINTF("#syntax: #option [[+|-|=]<name>]\t\twhere <name> is one of:\n\
-exit history words compact debug echo info\n\
-keyecho speedwalk wrap autoprint reprint sendsize autoclear\n");
-		    return;
-		}
-	    }
-	    if (varp) {		
-		switch (mode) {
-		 case MODE_REP:
-		    sprintf(inserted_next, "#option  %c", *varp ? '+' : '-');
-		    strcat(inserted_next, p);
-		    break;
-		 case MODE_ON:  *varp  = 1; break;
-		 case MODE_OFF: *varp  = 0; break;
-		 default:       *varp ^= 1; break;
-		}
-		/*
-		 * reset the reprint buffer if changing its status
-		 */
-		if (varp == &opt_reprint)
-		    reprint_clear();
-
-		/* as above, but always print status if
-		 * "#option info" alone was typed */
-		if (mode != MODE_REP && !*arg && count==1 &&
-		    (opt_info || (mode == MODE_TOGGLE && varp==&opt_info))) {
-		    PRINTF("#option %s is now o%s.\n", str[i],
-			      *varp ? "n" : "ff");
-		}
-	    }
-	}
-    } else {
-	PRINTF(full_options_string,
-		opt_exit  ? '+' : '-',
-		opt_history ? '+' : '-',
-		opt_words ? '+' : '-',
-		opt_compact ? '+' : '-',
-		opt_debug ? '+' : '-',
-		opt_echo  ? '+' : '-',
-		opt_info  ? '+' : '-',
-		opt_keyecho  ? '+' : '-',
-		opt_speedwalk ? '+' : '-',
-		opt_wrap  ? '+' : '-',
-		opt_autoprint ? '+' : '-',
-		opt_reprint ? '+' : '-',
-		opt_sendsize ? '+' : '-',
-		opt_autoclear ? '+' : '-',
-		"\n");
+    char buf[BUFSIZE];
+    int count = 0;
+
+    arg = skipspace(arg);
+    if (!*arg) {
+        print_all_options(NULL);
+        return;
+    }
+
+    while ((arg = skipspace(split_first_word(buf, BUFSIZE, arg))), *buf) {
+        enum { MODE_ON, MODE_OFF, MODE_TOGGLE, MODE_REP } mode;
+        char *varp = NULL;
+        char *p = buf;
+        char c = *p;
+        int len = strlen(p);
+        int i;
+
+        switch (c) {
+        case '=': mode = MODE_REP; p++; break;
+        case '+': mode = MODE_ON;  p++; break;
+        case '-': mode = MODE_OFF; p++; break;
+        default:  mode = MODE_TOGGLE;     break;
+        }
+        count++;
+        for (i = 0; options[i].name; i++) {
+            if (strncmp(options[i].name, p, len) == 0) {
+                varp = options[i].option;
+                break;
+            }
+        }
+        if (varp == NULL) {
+            if (strncmp("list", p, len) == 0) {
+                tty_puts("#list of options:\n");
+                for (i = 0; options[i].name; ++i) {
+                    tty_printf("#option %c%-12s    %s\n",
+                               *options[i].option ? '+' : '-',
+                               options[i].name,
+                               options[i].doc);
+                }
+            } else {
+                tty_puts("#syntax: #option [[+|-|=]<name>] | list\n");
+            }
+            status(1);
+            return;
+        }
+
+        switch (mode) {
+        case MODE_REP:
+            sprintf(inserted_next, "#option %c%s", *varp ? '+' : '-',
+                    p);
+            break;
+        case MODE_ON:     *varp  = 1; break;
+        case MODE_OFF:    *varp  = 0; break;
+        case MODE_TOGGLE: *varp ^= 1; break;
+        }
+        /*
+         * reset the reprint buffer if changing its status
+         */
+        if (varp == &opt_reprint)
+            reprint_clear();
+
+        /* as above, but always print status if
+         * "#option info" alone was typed */
+        if (mode != MODE_REP && !*arg && count==1 &&
+            (opt_info || (mode == MODE_TOGGLE && varp==&opt_info))) {
+            PRINTF("#option %s is now o%s.\n",
+                   options[i].name,
+                   *varp ? "n" : "ff");
+        }
     }
 }
 
diff --git a/cmd.h b/cmd.h
index 372139b..1c655fb 100644
--- a/cmd.h
+++ b/cmd.h
@@ -20,5 +20,7 @@ void cmd_add_command( cmdstruct *cmd );
 
 void initialize_cmd(void);
 
+int print_all_options __P1 (FILE *,file);
+
 #endif /* _CMD_H_ */
 
diff --git a/powwow.help b/powwow.help
index 7be6f70..5381235 100644
--- a/powwow.help
+++ b/powwow.help
@@ -298,14 +298,17 @@ expression) to the word completion list. Example:
 #action >reply ^$1 tells you={#print;#add $1}
 			(from now on, you can use TAB to complete that name)
 @option
-#option [none|[history][words][exit]]
+#option [+-=]<option> | list
 
-This command sets a number of options for powwow.
+This command lets you list or change various options of powwow.
+
+     #option 	      	lists all current option settings
+     #option list	long list of current options
+     #option =<option>	edit current setting of <option>
+     #option +<option>	enable <option>
+     #option -<option>	disable <option>
+     #option <option>   toggle <option>
 
-	history		write history lines to the savefiles
-	words		write words in completion buffer to the savefile
-	exit		close powwow when the last connection is closes
-	none		go figure (DEFAULT)
 @put
 #put {text|(expression)}
 
diff --git a/tty.c b/tty.c
index 048af68..b0883b9 100644
--- a/tty.c
+++ b/tty.c
@@ -844,7 +844,7 @@ again:
     tty_write_state.used += r;
 }
 
-void tty_printf __P ((const char *format, ...))
+int tty_printf __P ((const char *format, ...))
 {
     char buf[1024], *bufp = buf;
     va_list va;
@@ -870,6 +870,8 @@ void tty_printf __P ((const char *format, ...))
     free(old_locale);
 
     tty_puts(bufp);
+
+    return res;
 }
 
 static char tty_in_buf[MB_LEN_MAX + 1];
diff --git a/tty.h b/tty.h
index d29cb08..24a3162 100644
--- a/tty.h
+++ b/tty.h
@@ -49,7 +49,7 @@ void input_moveto			__P ((int new_pos));
 
 void tty_puts           __P ((const char *s));
 void tty_putc           __P ((char c));
-void tty_printf         __P ((const char *format, ...)) PRINTF_FUNCTION(1, 2);
+int  tty_printf         __P ((const char *format, ...)) PRINTF_FUNCTION(1, 2);
 int  tty_read           __P ((char *buf, size_t count));
 void tty_gets           __P ((char *s, int size));
 void tty_flush          __P ((void));
diff --git a/utils.c b/utils.c
index 76391a9..b904c1f 100644
--- a/utils.c
+++ b/utils.c
@@ -1053,7 +1053,6 @@ int save_settings __P0 (void)
     keynode *kp;
     varnode *vp;
     ptr pp = (ptr)0;
-    extern char *full_options_string;
     int i, flag, failed = 1;
 
     if (REAL_ERROR) {
@@ -1243,23 +1242,7 @@ int save_settings __P0 (void)
     }
     
     if (failed > 0)
-	failed =
-	fprintf(f, full_options_string,
-		opt_exit    ? '+' : '-',
-		opt_history ? '+' : '-',
-		opt_words   ? '+' : '-',
-		opt_compact ? '+' : '-',
-		opt_debug   ? '+' : '-',
-		opt_echo    ? '+' : '-',
-		opt_info    ? '+' : '-',
-		opt_keyecho    ? '+' : '-',
-		opt_speedwalk ? '+' : '-',
-		opt_wrap      ? '+' : '-',
-		opt_autoprint ? '+' : '-',
-		opt_reprint   ? '+' : '-',
-		opt_sendsize  ? '+' : '-',
-		opt_autoclear ? '+' : '-',
-		"\n");
+        failed = print_all_options(f);
 
     fclose(f);