From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 16 Mar 2023 14:15:47 +0000 (-0400)
Subject: Revert "Tapify output of cheat."
X-Git-Tag: 1.15~47
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=9fdbe733156e521443268ea49e1016d909df5643;p=open-adventure.git

Revert "Tapify output of cheat."

There was a better way.
---

diff --git a/cheat.c b/cheat.c
index ef9b014..df9ab5b 100644
--- a/cheat.c
+++ b/cheat.c
@@ -21,7 +21,6 @@ int main(int argc, char *argv[])
     char *savefilename = NULL;
     int version = 0;
     FILE *fp = NULL;
-    char *tapmessage = NULL;
 
     // Initialize game variables
     initialise();
@@ -32,15 +31,14 @@ int main(int argc, char *argv[])
     game.saved = 1;
 
     /*  Options. */
-    const char* opts = "d:l:s:t:v:o:m:";
+    const char* opts = "d:l:s:t:v:o:";
     const char* usage = "Usage: %s [-d numdie] [-s numsaves] [-v version] -o savefilename \n"
                         "        -d number of deaths. Signed integer.\n"
                         "        -l lifetime of lamp in turns. Signed integer.\n"
                         "        -s number of saves. Signed integer.\n"
                         "        -t number of turns. Signed integer.\n"
                         "        -v version number of save format.\n"
-                        "        -o required. File name of save game to write.\n"
-	                "        -m specify message for YAP output\n";
+                        "        -o required. File name of save game to write.\n";
 
     while ((ch = getopt(argc, argv, opts)) != EOF) {
         switch (ch) {
@@ -67,9 +65,6 @@ int main(int argc, char *argv[])
         case 'o':
             savefilename = optarg;
             break;
-        case 'm':
-            tapmessage = optarg;
-            break;
         default:
             fprintf(stderr,
                     usage, argv[0]);
@@ -80,33 +75,26 @@ int main(int argc, char *argv[])
 
     // Save filename required; the point of cheat is to generate save file
     if (savefilename == NULL) {
-	if (tapmessage != NULL) {
-	    printf("not ok - %s: filename required\n", tapmessage);
-	} else {
-	    printf("not ok - filename required\n");
-	    exit(EXIT_FAILURE);
-	}
+        fprintf(stderr,
+                usage, argv[0]);
+        fprintf(stderr,
+                "ERROR: filename required\n");
+        exit(EXIT_FAILURE);
     }
 
     fp = fopen(savefilename, WRITE_MODE);
     if (fp == NULL) {
-	if (tapmessage != NULL) {
-	    printf("not ok - %s: can't open file %s. Exiting.\n", tapmessage, savefilename);
-	} else {
-	    printf("not ok - can't open file %s.\n", savefilename);
-	    exit(EXIT_FAILURE);
-	}
+        fprintf(stderr,
+                "Can't open file %s. Exiting.\n", savefilename);
+        exit(EXIT_FAILURE);
     }
 
     savefile(fp, version);
 
     fclose(fp);
 
-    if (tapmessage != NULL) {
-	printf("ok - %s\n", tapmessage);
-    } else {
-	printf("cheat: %s created.\n", savefilename);
-    }
+    printf("cheat: %s created.\n", savefilename);
+
     return EXIT_SUCCESS;
 }