REUSE: move copyright headers to `.checksrc`

To make it simpler to move them around, create and delete them without
syncing with `REUSE.toml`.

Also:
- checksrc: allow empty lines in `.checksrc`.
- comment on why curl printfs are disallowed in examples.

Closes #19024

diff --git a/REUSE.toml b/REUSE.toml
index d3b98edb4879c9cada4addf0043fedbc6285617a..40531913af3b515c5503a7f8f905d6763059f681 100644 (file)
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -39,11 +39,6 @@ path = [
   "tests/certs/**",
   "tests/data/test**",
   "tests/valgrind.supp",
-  # checksrc control files
-  "docs/examples/.checksrc",
-  "scripts/.checksrc",
-  "src/.checksrc",
-  "tests/server/.checksrc",
 ]
 SPDX-FileCopyrightText = "Daniel Stenberg, <daniel@haxx.se>, et al."
 SPDX-License-Identifier = "curl"

diff --git a/docs/examples/.checksrc b/docs/examples/.checksrc
index c81d1597681dfc982be823267d92ca77bf977e65..e35dccc7261d77982ea99400f9316147293edb06 100644 (file)
--- a/docs/examples/.checksrc
+++ b/docs/examples/.checksrc
@@ -1,3 +1,7 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
 allowfunc fclose
 allowfunc fdopen
 allowfunc fopen
@@ -11,6 +15,8 @@ allowfunc socket
 allowfunc sscanf
 allowfunc strerror
 allowfunc vsnprintf
+
+# Use of curl printf functions is discouraged
 banfunc curl_maprintf
 banfunc curl_mfprintf
 banfunc curl_mprintf

diff --git a/scripts/.checksrc b/scripts/.checksrc
index 84d62d2b750c73d89de3e34e3742bbbc0d951b37..03e98fee8925b27ea878eb4b9cb339664dddf637 100644 (file)
--- a/scripts/.checksrc
+++ b/scripts/.checksrc
@@ -1 +1,5 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
 allowfunc printf

diff --git a/scripts/checksrc.pl b/scripts/checksrc.pl
index 5a8c80ebfe5bb8647e9528fdcdce40fef3c32b39..c424924e45724f1a75344a265b58a3b935674877 100755 (executable)
--- a/scripts/checksrc.pl
+++ b/scripts/checksrc.pl
@@ -202,6 +202,10 @@ sub readlocalfile {
         if(/^\s*(#.*)/) {
             next;
         }
+        # Skip empty lines
+        elsif($_ eq '') {
+            next;
+        }
         elsif(/^enable ([A-Z]+)$/) {
             if(!defined($warnings_extended{$1})) {
                 print STDERR "invalid warning specified in .checksrc: \"$1\"\n";

diff --git a/src/.checksrc b/src/.checksrc
index 946367c4999f6f2961afc23db1d2bfb4211b2443..bc97c06028daafa121e195906c609a422f3102bf 100644 (file)
--- a/src/.checksrc
+++ b/src/.checksrc
@@ -1 +1,5 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
 enable STDERR

diff --git a/tests/server/.checksrc b/tests/server/.checksrc
index d4be12473ac49e0ae10affa05452071ba570dae7..a4e094e1c9136429c1638d6cdd3ea68e36c6676d 100644 (file)
--- a/tests/server/.checksrc
+++ b/tests/server/.checksrc
@@ -1,3 +1,7 @@
+# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# SPDX-License-Identifier: curl
+
 allowfunc accept
 allowfunc fclose
 allowfunc fopen