Simplify SPDX copyright lines to the shortest canonical form...

[open-adventure.git] / cheat.c

diff --git a/cheat.c b/cheat.c
index ef9b014087c1f1ca275e35e9a0ca84c047d35538..279bcd9e6fc8dddabc8cb6eea798251026dd55e9 100644 (file)
--- a/cheat.c
+++ b/cheat.c
@@ -4,9 +4,8 @@
  * savefile(), so we know we're always outputting save files that advent
  * can import.
  *
- * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * SPDX-FileCopyrightText: (C) 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 #include <getopt.h>
 #include <stdlib.h>
@@ -19,9 +18,7 @@ int main(int argc, char *argv[])
 {
     int ch;
     char *savefilename = NULL;
-    int version = 0;
     FILE *fp = NULL;
-    char *tapmessage = NULL;
 
     // Initialize game variables
     initialise();
@@ -32,15 +29,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) {
@@ -61,15 +57,12 @@ int main(int argc, char *argv[])
             printf("cheat: game.turns = %d\n", game.turns);
             break;
         case 'v':
-            version = atoi(optarg);
-            printf("cheat: version = %d\n", version);
+            save.version = atoi(optarg);
+            printf("cheat: version = %d\n", save.version);
             break;
         case 'o':
             savefilename = optarg;
             break;
-        case 'm':
-            tapmessage = optarg;
-            break;
         default:
             fprintf(stderr,
                     usage, argv[0]);
@@ -80,33 +73,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);
+    savefile(fp);
 
     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;
 }