SPDXify the code.

diff --git a/actions.c b/actions.c
index 059d92b5e02a19aa979db446ee2d6d33e15ddf15..0d8bf7f3578b9055329dd941ce3c6860a739d4ed 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1,3 +1,11 @@
+/*
+ * Actions for the duneon-running code.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+

 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>

diff --git a/adventure.yaml b/adventure.yaml
index 175635a6b3f8613b0d8efa865bf1d024056990ad..ff32163d06723e01da8cb7fa532b2f646dda9fc6 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -112,6 +112,9 @@
 #       %s = an ASCII string
 #      %S = The letter 's' or nothing (if a previous %d value is exactly 1)
 #      %V = substitute program version string
 #       %s = an ASCII string
 #      %S = The letter 's' or nothing (if a previous %d value is exactly 1)
 #      %V = substitute program version string

+#
+# Copyright (c) 2017 by Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-clause

 
 motions: !!omap
 - MOT_0:
 
 motions: !!omap
 - MOT_0:

diff --git a/cheat.c b/cheat.c
index b75fccf9c47951f217e7d4696357b97817ff8d21..008fb9c4def8978ec3e88e1a680d86a53c211bd9 100644 (file)
--- a/cheat.c
+++ b/cheat.c
@@ -3,6 +3,10 @@
  * not happen. It leverages chunks of advent, mostly initialize() and
  * savefile(), so we know we're always outputing save files that advent
  * can import.
  * not happen. It leverages chunks of advent, mostly initialize() and
  * savefile(), so we know we're always outputing 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

  */
 #include <getopt.h>
 #include <stdlib.h>
  */
 #include <getopt.h>
 #include <stdlib.h>

diff --git a/init.c b/init.c
index fbe44106e30b3b3148b7bc548ce27d5cc5ca6255..4ff52a83d9f8b8a64242ddea7ef565acaf5f23bd 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1,3 +1,11 @@
+/*
+ * Initialisation
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+

 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>


@@ -6,10 +14,6 @@
 
 #include "advent.h"
 
 
 #include "advent.h"
 

-/*
- * Initialisation
- */
-

 struct settings_t settings = {
     .logfp = NULL,
     .oldstyle = false,
 struct settings_t settings = {
     .logfp = NULL,
     .oldstyle = false,

diff --git a/main.c b/main.c
index f0dbb3a988fe7461a6ecccddfa7463f27467f3d8..5cdbcc48e488047da5f7feea1e62b0f7f34e5c4e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -11,6 +11,10 @@
  * ESR apologizes for the remaing gotos (now confined to one function
  * in this file - there used to be over 350 of them, *everywhere*).
  * Applying the Structured Program Theorem can be hard.
  * ESR apologizes for the remaing gotos (now confined to one function
  * in this file - there used to be over 350 of them, *everywhere*).
  * Applying the Structured Program Theorem can be hard.

+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause

  */
 
 #include <stdlib.h>
  */
 
 #include <stdlib.h>

diff --git a/make_dungeon.py b/make_dungeon.py
index b3e08fde39ac7fc2f6aa63205c987f759647ee2e..106714a9267bd519d20a8b44cb1a5e8952c591f5 100755 (executable)
--- a/make_dungeon.py
+++ b/make_dungeon.py
@@ -6,6 +6,9 @@
 # The nontrivial part of this is the compilation of the YAML for
 # movement rules to the travel array that's actually used by
 # playermove().
 # The nontrivial part of this is the compilation of the YAML for
 # movement rules to the travel array that's actually used by
 # playermove().

+#
+# Copyright (c) 2017 by Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-clause

 
 import sys, yaml
 
 
 import sys, yaml
 

diff --git a/misc.c b/misc.c
index 80e4352b74b7b2ea8feee8a2d91798e50d61c9f7..aa164728d54366942e282de3e1fdcee704b81877 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,3 +1,11 @@
+/*
+ * I/O and support riutines.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+     

 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/saveresume.c b/saveresume.c
index d4940159216ee17e37087233260647c896e9c175..b03a6215c5c6d11b862add5700eb91a39e5d551e 100644 (file)
--- a/saveresume.c
+++ b/saveresume.c
@@ -1,3 +1,14 @@
+/*
+ * Saving and resuming.
+ *
+ * (ESR) This replaces  a bunch of particularly nasty FORTRAN-derived code;
+ * see the history.adoc file in the source distribution for discussion.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */
+

 #include <stdlib.h>
 #include <string.h>
 #include <editline/readline.h>
 #include <stdlib.h>
 #include <string.h>
 #include <editline/readline.h>


@@ -7,11 +18,6 @@
 #include "advent.h"
 #include "dungeon.h"
 
 #include "advent.h"
 #include "dungeon.h"
 

-/*
- * (ESR) This replaces  a bunch of particularly nasty FORTRAN-derived code;
- * see the history.adoc file in the source distribution for discussion.
- */
-

 #define VRSION 28      /* bump on save format change */
 
 /*
 #define VRSION 28      /* bump on save format change */
 
 /*

diff --git a/score.c b/score.c
index 9b3f8f3ea17ee71a1ecd05daf93d28896463fef0..368b1df439dfcc6f4e9eca5585d7443f8f9c0b3a 100644 (file)
--- a/score.c
+++ b/score.c
@@ -1,11 +1,14 @@
+/*
+ * Scoring and wrap-up.
+ *
+ * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-clause
+ */

 #include <stdlib.h>
 #include "advent.h"
 #include "dungeon.h"
 
 #include <stdlib.h>
 #include "advent.h"
 #include "dungeon.h"
 

-/*
- * scoring and wrap-up
- */
-

 static int mxscor;     /* ugh..the price for having score() not exit. */
 
 long score(enum termination mode)
 static int mxscor;     /* ugh..the price for having score() not exit. */
 
 long score(enum termination mode)