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 cf049f48c9e9ede5f3920317b43a8eaac3e86071..e638e8424eb8d743f08dc6e45c6d971cad59436a 100644 (file)
--- 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 30fd0ced522891cf206f786d2c10c0ee648dd318..798460464d3b75d0b760155f8322fb7015b66816 100644 (file)
--- 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 ce383a0fbd2366cf2c86ffc09ced36c8cdc1795f..df6f9aa7dfa2ba5054b40cf3c5cd6a483971c575 100644 (file)
--- 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 204f8a3e06e5a141524aba295708874428e42281..5074144fad345960cc55098e4f816bcd856bbbc1 100644 (file)
--- 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