From: Jason S. Ninneman <jsn@mbar.us>
Date: Sat, 1 Jul 2017 14:22:12 +0000 (-0700)
Subject: Jettison the -s option.
X-Git-Tag: takebird~148
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F180%2Fhead;p=open-adventure.git

Jettison the -s option.

It's no longer needed since libedit doesn't have the 'paste bug'.
---

diff --git a/advent.h b/advent.h
index cf049f4..e638e84 100644
--- a/advent.h
+++ b/advent.h
@@ -173,7 +173,7 @@ struct command_t {
 
 extern struct game_t game;
 extern FILE *logfp;
-extern bool oldstyle, editline, prompt;
+extern bool oldstyle, prompt;
 
 extern char* xstrdup(const char* s);
 extern void* xmalloc(size_t size);
diff --git a/cheat.c b/cheat.c
index 30fd0ce..7984604 100644
--- a/cheat.c
+++ b/cheat.c
@@ -8,7 +8,6 @@
 
 FILE  *logfp = NULL, *rfp = NULL;
 bool oldstyle = false;
-bool editline = true;
 bool prompt = true;
 
 int main(int argc, char *argv[])
diff --git a/main.c b/main.c
index ce383a0..df6f9aa 100644
--- a/main.c
+++ b/main.c
@@ -27,7 +27,6 @@
 
 FILE  *logfp = NULL, *rfp = NULL;
 bool oldstyle = false;
-bool editline = true;
 bool prompt = true;
 
 // LCOV_EXCL_START
@@ -63,11 +62,11 @@ int main(int argc, char *argv[])
     /*  Options. */
 
 #ifndef ADVENT_NOSAVE
-    const char* opts = "l:or:s";
-    const char* usage = "Usage: %s [-l logfilename] [-o] [-r restorefilename] [-s] \n";
+    const char* opts = "l:or";
+    const char* usage = "Usage: %s [-l logfilename] [-o] [-r restorefilename]\n";
 #else
-    const char* opts = "l:os";
-    const char* usage = "Usage: %s [-l logfilename] [-o] [-s] \n";
+    const char* opts = "l:o";
+    const char* usage = "Usage: %s [-l logfilename] [-o]\n";
 #endif
     while ((ch = getopt(argc, argv, opts)) != EOF) {
         switch (ch) {
@@ -81,7 +80,7 @@ int main(int argc, char *argv[])
             break;
         case 'o':
             oldstyle = true;
-            editline = prompt = false;
+            prompt = false;
             break;
 #ifndef ADVENT_NOSAVE
         case 'r':
@@ -93,9 +92,6 @@ int main(int argc, char *argv[])
             signal(SIGINT, sig_handler);
             break;
 #endif
-        case 's':
-            editline = false;
-            break;
         default:
             fprintf(stderr,
                     usage, argv[0]);
@@ -107,8 +103,6 @@ int main(int argc, char *argv[])
             fprintf(stderr,
                     "        -r restore from specified saved game file\n");
 #endif
-            fprintf(stderr,
-                    "        -s suppress command editing\n");
             exit(EXIT_FAILURE);
             break;
         }
diff --git a/tests/logopt.log b/tests/logopt.log
index 204f8a3..5074144 100644
--- a/tests/logopt.log
+++ b/tests/logopt.log
@@ -1,5 +1,5 @@
 ## Exercise logging option and seed dump
-#options: -s -l scratch.tmp
+#options: -l scratch.tmp
 n
 in