Partial REUSE cmpliance.

.gitignore

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 advent
 *.gcda
 *.gcno

.gitlab-ci.yml

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 stages:
   - ci-build
   - build

.shipper

@@ -1,3 +1,7 @@
+<--
+SPDX-FileCopyrightText: Eric S. Raymond
+SPDX-License-Identifier: BSD-2-Clause
+-->
 extralines="""
 <p>There is a <a href="http://esr.gitlab.io/open-adventure/coverage/">code coverage analysis</a> and a <a href="http://esr.gitlab.io/open-adventure/coverage/adventure.yaml.html">symbol coverage analysis</p>
 """

COPYING

@@ -1,7 +1,4 @@
-			BSD LICENSE
+		BSD 2-Clause LICENSE
-
-Copyright (c) 1977, 2005 by Will Crowther and Don Woods
-Copyright (c) 2017 by Eric S. Raymond
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

Dockerfile.ci

@@ -1,5 +1,7 @@
 # This image is built by the Gitlab CI pipeline to be used in subsequent
 # pipeline steps.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 
 FROM ubuntu
 

Makefile

@@ -1,5 +1,8 @@
 # Makefile for the open-source release of adventure 2.5
 
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
+
 # To build with save/resume disabled, pass CFLAGS="-DADVENT_NOSAVE"
 # To build with auto-save/resume enabled, pass CFLAGS="-DADVENT_AUTOSAVE"
 

actions.c

@@ -1,9 +1,9 @@
 /*
  * Actions for the dungeon-running code.
  *
- * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdlib.h>

advent.desktop

@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 [Desktop Entry]
 Type=Application
 Name=Open Adventure

advent.h

@@ -1,3 +1,10 @@
+/*
+ * Dungeon types and macros.
+ *
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>

advent.svg

@@ -2,30 +2,8 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-Copyright © 2017 Dr. Tobias Quathamer <toddy@debian.org>
+SPDX-FileCopyrightText: 2017 Dr. Tobias Quathamer <toddy@debian.org>
-
+SPDX-License-Identifier: BSD-2-Clause
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <svg width="128" height="128" version="1.1"
   xmlns="http://www.w3.org/2000/svg">

adventure.yaml

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
+#
 # This YAML file gets processed into a collection of data structures and
 # variable initializers describing Colossal Cave.  It replaces an ad-hoc
 # text database shipped with Adventure versions up to 2.5.  The format
@@ -115,8 +118,6 @@
 #	%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
 
 # Motion names of the form MOT_* are not explicitly referenced in the
 # locations YAML, but usually get compiled into generated C.

cheat.c

@@ -4,9 +4,9 @@
  * savefile(), so we know we're always outputting save files that advent
  * can import.
  *
- * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 #include <getopt.h>
 #include <stdlib.h>

init.c

@@ -1,9 +1,9 @@
 /*
  * Initialisation
  *
- * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <unistd.h>

main.c

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdlib.h>

make_dungeon.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 """
 This is the open-adventure dungeon generator. It consumes a YAML description of
 the dungeon and outputs a dungeon.h and dungeon.c pair of C code files.
@@ -6,9 +8,6 @@ the dungeon and outputs a dungeon.h and dungeon.c pair of C code files.
 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
 """
 
 # pylint: disable=consider-using-f-string,line-too-long,invalid-name,missing-function-docstring,too-many-branches,global-statement,multiple-imports,too-many-locals,too-many-statements,too-many-nested-blocks,no-else-return,raise-missing-from,redefined-outer-name
@@ -21,7 +20,7 @@ C_NAME = "dungeon.c"
 H_TEMPLATE_PATH = "templates/dungeon.h.tpl"
 C_TEMPLATE_PATH = "templates/dungeon.c.tpl"
 
-DONOTEDIT_COMMENT = "/* Generated from adventure.yaml - do not hand-hack! */\n/* SPDX-License-Identifier: BSD-2-clause */\n\n"
+DONOTEDIT_COMMENT = "/* Generated from adventure.yaml - do not hand-hack! */\n\n"
 
 statedefines = ""
 

make_graph.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 """\
 usage: make-graph.py [-a] -d] [-m] [-s]
 
@@ -11,8 +13,6 @@ Make a DOT graph of Colossal Cave.
 -s = emit graph of non-forest surface locations
 -v = include internal symbols in room labels
 """
-# Copyright (c) 2017 by Eric S. Raymond
-# SPDX-License-Identifier: BSD-2-clause
 
 # pylint: disable=consider-using-f-string,line-too-long,invalid-name,missing-function-docstring,multiple-imports,redefined-outer-name
 

misc.c

@@ -1,9 +1,9 @@
 /*
  * I/O and support routines.
  *
- * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <unistd.h>

saveresume.c

@@ -4,9 +4,9 @@
  * (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
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 
 #include <stdlib.h>

score.c

@@ -1,9 +1,9 @@
 /*
  * Scoring and wrap-up.
  *
- * Copyright (c) 1977, 2005 by Will Crowther and Don Woods
+ * SPDX-FileCopyrightText: 1977, 2005 by Will Crowther and Don Woods
- * Copyright (c) 2017 by Eric S. Raymond
+ * SPDX-FileCopyrightText: 2017 by Eric S. Raymond
- * SPDX-License-Identifier: BSD-2-clause
+ * SPDX-License-Identifier: BSD-2-Clause
  */
 #include <stdlib.h>
 #include "advent.h"

templates/coverage_dungeon.html.tpl

@@ -1,3 +1,7 @@
+<--
+SPDX-FileCopyrightText: Eric S. Raymond
+SPDX-License-Identifier: BSD-2-Clause
+-->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html lang="en">
 <head>

templates/dungeon.c.tpl

@@ -1,3 +1,8 @@
+/*
+SPDX-FileCopyrightText: Eric S. Raymond
+SPDX-License-Identifier: BSD-2-Clause
+*/
+
 #include "{h_file}"
 
 const char* arbitrary_messages[] = {{
@@ -48,4 +53,4 @@ const travelop_t travel[] = {{
 
 const char *ignore = "{ignore}";
 
-/* end */
+/* end */

templates/dungeon.h.tpl

@@ -1,3 +1,7 @@
+/*
+SPDX-FileCopyrightText: Eric S. Raymond
+SPDX-License-Identifier: BSD-2-Clause
+*/
 #ifndef DUNGEON_H
 #define DUNGEON_H
 

tests/Makefile

@@ -1,5 +1,8 @@
 # Test-suite makefile for open-adventure
 
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
+
 # Use absolute path so tests that change working directory still use
 # scripts from parent directory.  Note that using $PWD seems to fail
 # here under Gitlab's CI environment.

tests/axebear.log

@@ -1,4 +1,6 @@
 ## Observe axe after throwing at bear
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/axeorama.log

@@ -1,4 +1,6 @@
 ## Test throwing axe at non-dwarves.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Added coverage of LOC_DEADCRAWL and CROSS_BRIDGE
 n
 seed 1838473132

tests/barehands.log

@@ -1,4 +1,6 @@
 ## Get to dragon, refuse to use bare hands
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE Fails due uninteresting difference in whitespace process. 
 # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
 n

tests/bigfail.log

@@ -1,4 +1,6 @@
 ## Test many nonlethal failure conditions
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # See comments in this log
 n
 seed 1838473132

tests/birdsnakewake.log

@@ -1,4 +1,6 @@
 ## Attempt to kill snake with bird in the endgame
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/birdweight.log

@@ -1,4 +1,6 @@
 ## Verify that the bird is weightless in inventory
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Checks fix for GitLab issue #40
 #NOCOMPARE Bird was not weightless in cage in advent430 so this test is invalid.
 n

tests/boulder2.log

@@ -1,4 +1,6 @@
 ## Coverage of LOC_BOULDERS2.short
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/breakmirror.log

@@ -1,4 +1,6 @@
 ## Break the mirror in endgame and die
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/carrybird.log

@@ -1,4 +1,6 @@
 ## Try to carry bird without cage, then kill bird
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1071883378
 in

tests/carryfreebird.log

@@ -1,4 +1,6 @@
 ## Try to carry the bird after freeing it instead of listening
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1495951709
 attack

tests/cheatresume.log

@@ -1,4 +1,6 @@
 ## Resume from absurd save file with numdie = -900
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE Can't compare to advent430 due to version skew
 n
 resume

tests/cheatresume2.log

@@ -1,4 +1,6 @@
 ## Resume from absurd save file with numdie = -1000
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # generating "off my scale" score threshold message
 #NOCOMPARE Can't compare to advent430 due to version skew
 n

tests/coverage_dungeon.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 """
 This is the open-adventure dungeon text coverage report generator. It
 consumes a YAML description of the dungeon and determines whether the

tests/death-jump.log

@@ -1,4 +1,6 @@
 ## Jump into a pit and die, refuse reincarnation
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1495774850
 in

tests/defeat.log

@@ -1,4 +1,6 @@
 ## Last-minute defeat, with lava. Also tests vase drop before pillow.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
 n
 seed 1838473132

tests/domefail.log

@@ -1,4 +1,6 @@
 ## Take nugget and fail to climb to the dome
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/dragon_secret5.log

@@ -1,4 +1,6 @@
 ## Check that dead dragon actually moves its location (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 18084731
 in

tests/dropcagedbird.log

@@ -1,4 +1,6 @@
 ## Try to carry the bird after freeing it instead of listening
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1495951709
 in

tests/drown.log

@@ -1,4 +1,6 @@
 ## Speak a magic word at an inopportune time and drown.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
 n
 seed 1838473132

tests/dwarf.log

@@ -1,4 +1,6 @@
 ## In which the dwarf kills you
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1494912171
 in

tests/dwarf_alternative.log

@@ -1,4 +1,6 @@
 ## Check that dwarf spawns in alternative location (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 383847
 in

tests/eggs_done.log

@@ -1,4 +1,6 @@
 ## Be done with Giant Room and eggs (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/eggs_vanish.log

@@ -1,4 +1,6 @@
 ## Vanishing eggs in Giant Room (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/endgame428.log

@@ -1,4 +1,6 @@
 ## 428-point walkthrough
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
 n
 seed 1838473132

tests/endobjects.log

@@ -1,4 +1,6 @@
 ### Check that water is unavailable in endgame
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Addresses GitLab issue #55: in endgame, some object starting states are incorrect
 #NOCOMPARE Bird was not weightless in cage in advent430, this test depends on that.
 no

tests/fail_hint_maze.log

@@ -1,4 +1,6 @@
 ## Fail to get maze hint by being empty-handed (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 25508795
 in

tests/fail_hint_ogre.log

@@ -1,4 +1,6 @@
 ## Qualify for ogre hint but fail due to dwarves dead (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE Fails due uninteresting difference in whitespace process. 
 n
 seed 1838473132

tests/fail_hint_ogre2.log

@@ -1,4 +1,6 @@
 ## Qualify for ogre hint but fail due to nearby dwarf (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 25508795
 in

tests/fail_hint_woods.log

@@ -1,4 +1,6 @@
 ## Fail getting wood hint by finding appendage (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 n
 z

tests/fillfail.log

@@ -1,4 +1,6 @@
 ## Attempt to fill lamp, attempt to fill bottle with no source
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 in
 carry lamp

tests/fillvase.log

@@ -1,4 +1,6 @@
 ## Fill the vase
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Arthur O'Dwyer <arthur.j.odwyer@gmail.com> writes:
 #
 # (4) Lastly, here's a test case for you! Go get the VASE; then get the

tests/flyback.log

@@ -1,4 +1,6 @@
 ## Test fix for issue 51: rug flying is broken
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE Behavior differs due to a bug fix.
 n
 seed 1838473132

tests/footslip.log

@@ -1,4 +1,6 @@
 ## Coverage of LOC_FOOTSLIP
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/gemstates.log

@@ -1,4 +1,6 @@
 ## Observe amber, ruby, sapphire after state change
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1635997320
 in

tests/goback.log

@@ -1,4 +1,6 @@
 ## Test many nonlethal failure conditions
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # This variant elicits the prompt to go back for batteries
 # See comments in this log
 #NOCOMPARE Relies on "waste"

tests/hint_dark.log

@@ -1,4 +1,6 @@
 ## Elicit hint for dealing with plugh room and darkness (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1495951709
 in

tests/hint_grate.log

@@ -1,4 +1,6 @@
 ## Elicit hint for dealing with grate
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1495774850
 in

tests/hint_jade.log

@@ -1,4 +1,6 @@
 ## Elicit hint for getting the jade (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/hint_snake.log

@@ -1,4 +1,6 @@
 ## Elicit hint for dealing with snake
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1951269982
 in

tests/hint_urn.log

@@ -1,4 +1,6 @@
 ## Elicit hint for dealing with urn (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE Policy decision - no point in emulating advent430's extra \n here
 n
 seed 1495951709

tests/hint_witt.log

@@ -1,4 +1,6 @@
 ## Hint for Witt's End
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE Policy decision - no point in emulating advent430's extra \n here
 n
 seed 1635997320

tests/illformed.log

@@ -1,4 +1,6 @@
 ## Test for various cases not found in walkthroughs.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE This is busted under advent430 -- see comments within.
 foo
 

tests/illformed2.log

@@ -1,4 +1,6 @@
 ## Test for various cases not found in walkthroughs (advent430-compatible).
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Commented-out lines cause troble in advent430
 n
 seed 1635997320

tests/intransitivecarry.log

@@ -1,4 +1,6 @@
 ## Carry when only one object is present
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 in
 carry lamp

tests/issue36.log

@@ -1,4 +1,6 @@
 ## Test handling of object after transitive verb.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 826186526
 in

tests/issue37.log

@@ -1,4 +1,6 @@
 ## Test handling of transitive verb after noun
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 in
 food

tests/lampdim.log

@@ -1,4 +1,6 @@
 ## Test the case where your lamp goes dim
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/lampdim2.log

@@ -1,4 +1,6 @@
 ## Try (and fail) to carry message at vending machine
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/lampdim3.log

@@ -1,4 +1,6 @@
 ## Die while closing
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/listen.log

@@ -1,4 +1,6 @@
 ## Check that listen command hears all objects as well as location sound
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 no
 seed 1181530211
 e

tests/listenloud.log

@@ -1,4 +1,6 @@
 ## Attempt to listen at a loud location
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
 n
 seed 1495951709
@@ -139,4 +141,4 @@ u
 reservoir
 Q'IBJ
 n
-listen
+listen

tests/lockchain.log

@@ -1,4 +1,6 @@
 ## Test multiple re-locking and unlocking of bear's chain
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
 n
 seed 1635997320

tests/logopt.log

@@ -1,4 +1,6 @@
 ## Exercise logging option and seed dump
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #options: -l scratch.tmp
 n
 in

tests/magicwords.log

@@ -1,4 +1,6 @@
 ## Test processing of variuus fee fie foe foo fum cases.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #
 # How thry're supposed to work:
 #

tests/mazealldiff.log

@@ -1,4 +1,6 @@
 ## Coverage of all LOC_DIFFERENT*
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/mazehint.log

@@ -1,4 +1,6 @@
 ## Elicit the maze hint.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1071883378
 in

tests/multifile.chk

@@ -2,6 +2,8 @@
 Welcome to Adventure!!  Would you like instructions?
 
 > ## Test handling of object after transitive verb.
+> # SPDX-FileCopyrightText: Eric S. Raymond
+> # SPDX-License-Identifier: BSD-2-Clause
 > n
 > n
 

tests/notrident.log

@@ -1,4 +1,6 @@
 ## Try to open clam without trident and fail
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1635997320
 in

tests/ogre_no_dwarves.log

@@ -1,4 +1,6 @@
 ## Try to attack ogre with no dwarves present (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 25508795
 in

tests/ogrehint.log

@@ -1,4 +1,6 @@
 ## Elicit the ogre hint.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 437547289
 seed 1071883378

tests/oilplant.log

@@ -1,4 +1,6 @@
 ## Attempt to oil the beanstalk after watering it
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/oldstyle.log

@@ -1,4 +1,6 @@
 ## Simple quit
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #options: -o
 #NOCOMPARE Comment not interpreted by advent430
 n

tests/outcheck.sh

@@ -1,4 +1,6 @@
 #! /bin/sh
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 case $? in
     0) echo "ok - $1 succeeded";;
     *) echo "not ok - $1 failed";;

tests/oysterbug.log

@@ -1,4 +1,6 @@
 # Demonstrate fix of buggy response to unlocking oyster while carrying it.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE This fails due to a known bug in advent430
 n
 seed 1838473132

tests/panic.log

@@ -1,4 +1,6 @@
 ## Panic test - attempt to unlock grate after game closed.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/panic2.log

@@ -1,4 +1,6 @@
 ## Panic test - attempt to xyzzy out after game is closed.
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/pirate_carry.log

@@ -1,4 +1,6 @@
 ## Check that pirate steals loose treasure from ground (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1837473132
 in

tests/pirate_pyramid.log

@@ -1,4 +1,6 @@
 ## Pirate mustn't take pyramid from plover/dark rooms (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1830473132
 in

tests/pirate_spotted.log

@@ -1,4 +1,6 @@
 ## Spot pirate to manifest chest before last treasure (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/pitfall.log

@@ -1,4 +1,6 @@
 ## Death by pitfall
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Die 3 times so we can cover all the obituary messages
 n
 seed 780351908

tests/plover.log

@@ -1,4 +1,6 @@
 ## Test access to emerald room and plover teleport
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
 n
 seed 1495951709

tests/reach_ledge_short.log

@@ -1,4 +1,6 @@
 ## LOC_NOCLIMB.short (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/reach_noclimb.log

@@ -1,4 +1,6 @@
 ## LOC_NOCLIMB (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/reach_planttop.log

@@ -1,4 +1,6 @@
 ## LOC_PLANTTOP (fuzzed)
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1838473132
 in

tests/reincarnate.log

@@ -1,4 +1,6 @@
 ## Jump into a pit and die, then be reincarnated
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 n
 seed 1495774850
 in

tests/resumefail.log

@@ -1,4 +1,6 @@
 ## Resume from invalid filename
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE advent430 crashes on resume from invalid filename and we don't care.
 n
 seed 1240742801

tests/resumefail2.log

@@ -1,4 +1,6 @@
 ## Resume from from generated save with version mismatch error
+# SPDX-FileCopyrightText: Eric S. Raymond
+# SPDX-License-Identifier: BSD-2-Clause
 #NOCOMPARE Reveals a bug in advent430 handling of saves with invalid versions.
 n
 resume