diff options
author | Daniel Stenberg <daniel@haxx.se> | 2023-01-02 13:51:48 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2023-01-03 09:19:21 +0100 |
commit | 2bc1d775f510196154283374284f98d3eae03544 (patch) | |
tree | 380d04775d372867e5c222655f145aa0c113bde4 /scripts | |
parent | 3e9c2924d6058dda708aa95e1898f70b22b46461 (diff) | |
download | curl-2bc1d775f510196154283374284f98d3eae03544.tar.gz |
copyright: update all copyright lines and remove year ranges
- they are mostly pointless in all major jurisdictions
- many big corporations and projects already don't use them
- saves us from pointless churn
- git keeps history for us
- the year range is kept in COPYING
checksrc is updated to allow non-year using copyright statements
Closes #10205
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.am | 2 | ||||
-rwxr-xr-x | scripts/checksrc.pl | 79 | ||||
-rwxr-xr-x | scripts/ciconfig.pl | 2 | ||||
-rwxr-xr-x | scripts/cijobs.pl | 2 | ||||
-rwxr-xr-x | scripts/completion.pl | 2 | ||||
-rwxr-xr-x | scripts/contributors.sh | 2 | ||||
-rwxr-xr-x | scripts/contrithanks.sh | 2 | ||||
-rwxr-xr-x | scripts/copyright.pl | 2 | ||||
-rwxr-xr-x | scripts/coverage.sh | 2 | ||||
-rwxr-xr-x | scripts/delta | 2 | ||||
-rwxr-xr-x | scripts/firefox-db2pem.sh | 2 | ||||
-rw-r--r-- | scripts/installcheck.sh | 2 | ||||
-rwxr-xr-x | scripts/log2changes.pl | 2 | ||||
-rwxr-xr-x | scripts/mk-ca-bundle.pl | 2 | ||||
-rwxr-xr-x | scripts/release-notes.pl | 2 | ||||
-rwxr-xr-x | scripts/singleuse.pl | 2 | ||||
-rwxr-xr-x | scripts/updatemanpages.pl | 2 | ||||
-rwxr-xr-x | scripts/zuul/before_script.sh | 2 | ||||
-rwxr-xr-x | scripts/zuul/script.sh | 2 |
19 files changed, 63 insertions, 52 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index ed9819b87..fcb78eabf 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/checksrc.pl b/scripts/checksrc.pl index 26634774e..2aab0ad8f 100755 --- a/scripts/checksrc.pl +++ b/scripts/checksrc.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2011 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -53,47 +53,47 @@ my %warnings_extended = ( ); my %warnings = ( - 'LONGLINE' => "Line longer than $max_column", - 'TABS' => 'TAB characters not allowed', - 'TRAILINGSPACE' => 'Trailing whitespace on the line', - 'CPPCOMMENTS' => '// comment detected', - 'SPACEBEFOREPAREN' => 'space before an open parenthesis', - 'SPACEAFTERPAREN' => 'space after open parenthesis', - 'SPACEBEFORECLOSE' => 'space before a close parenthesis', - 'SPACEBEFORECOMMA' => 'space before a comma', - 'RETURNNOSPACE' => 'return without space', - 'COMMANOSPACE' => 'comma without following space', - 'BRACEELSE' => '} else on the same line', - 'PARENBRACE' => '){ without sufficient space', - 'SPACESEMICOLON' => 'space before semicolon', + 'ASSIGNWITHINCONDITION' => 'assignment within conditional expression', + 'ASTERISKNOSPACE' => 'pointer declared without space before asterisk', + 'ASTERISKSPACE' => 'pointer declared with space after asterisk', + 'BADCOMMAND' => 'bad !checksrc! instruction', 'BANNEDFUNC' => 'a banned function was used', - 'FOPENMODE' => 'fopen needs a macro for the mode string', + 'BRACEELSE' => '} else on the same line', 'BRACEPOS' => 'wrong position for an open brace', - 'INDENTATION' => 'wrong start column for code', + 'BRACEWHILE' => 'A single space between open brace and while', + 'COMMANOSPACE' => 'comma without following space', + 'COMMENTNOSPACEEND' => 'no space before */', + 'COMMENTNOSPACESTART' => 'no space following /*', 'COPYRIGHT' => 'file missing a copyright statement', - 'BADCOMMAND' => 'bad !checksrc! instruction', - 'UNUSEDIGNORE' => 'a warning ignore was not used', - 'OPENCOMMENT' => 'file ended with a /* comment still "open"', - 'ASTERISKSPACE' => 'pointer declared with space after asterisk', - 'ASTERISKNOSPACE' => 'pointer declared without space before asterisk', - 'ASSIGNWITHINCONDITION' => 'assignment within conditional expression', + 'CPPCOMMENTS' => '// comment detected', + 'DOBRACE' => 'A single space between do and open brace', + 'EMPTYLINEBRACE' => 'Empty line before the open brace', 'EQUALSNOSPACE' => 'equals sign without following space', + 'EQUALSNULL' => 'if/while comparison with == NULL', + 'EXCLAMATIONSPACE' => 'Whitespace after exclamation mark in expression', + 'FOPENMODE' => 'fopen needs a macro for the mode string', + 'INCLUDEDUP', => 'same file is included again', + 'INDENTATION' => 'wrong start column for code', + 'LONGLINE' => "Line longer than $max_column", + 'MULTISPACE' => 'multiple spaces used when not suitable', 'NOSPACEEQUALS' => 'equals sign without preceding space', + 'NOTEQUALSZERO', => 'if/while comparison with != 0', + 'ONELINECONDITION' => 'conditional block on the same line as the if()', + 'OPENCOMMENT' => 'file ended with a /* comment still "open"', + 'PARENBRACE' => '){ without sufficient space', + 'RETURNNOSPACE' => 'return without space', 'SEMINOSPACE' => 'semicolon without following space', - 'MULTISPACE' => 'multiple spaces used when not suitable', 'SIZEOFNOPAREN' => 'use of sizeof without parentheses', 'SNPRINTF' => 'use of snprintf', - 'ONELINECONDITION' => 'conditional block on the same line as the if()', + 'SPACEAFTERPAREN' => 'space after open parenthesis', + 'SPACEBEFORECLOSE' => 'space before a close parenthesis', + 'SPACEBEFORECOMMA' => 'space before a comma', + 'SPACEBEFOREPAREN' => 'space before an open parenthesis', + 'SPACESEMICOLON' => 'space before semicolon', + 'TABS' => 'TAB characters not allowed', + 'TRAILINGSPACE' => 'Trailing whitespace on the line', 'TYPEDEFSTRUCT' => 'typedefed struct', - 'DOBRACE' => 'A single space between do and open brace', - 'BRACEWHILE' => 'A single space between open brace and while', - 'EXCLAMATIONSPACE' => 'Whitespace after exclamation mark in expression', - 'EMPTYLINEBRACE' => 'Empty line before the open brace', - 'EQUALSNULL' => 'if/while comparison with == NULL', - 'NOTEQUALSZERO', => 'if/while comparison with != 0', - 'INCLUDEDUP', => 'same file is included again', - 'COMMENTNOSPACESTART' => 'no space following /*', - 'COMMENTNOSPACEEND' => 'no space before */', + 'UNUSEDIGNORE' => 'a warning ignore was not used', ); sub readskiplist { @@ -400,7 +400,8 @@ sub scanfile { } # check for a copyright statement and save the years - if($l =~ /\* +copyright .* \d\d\d\d/i) { + if($l =~ /\* +copyright .* (\d\d\d\d|)/i) { + my $count = 0; while($l =~ /([\d]{4})/g) { push @copyright, { year => $1, @@ -408,6 +409,16 @@ sub scanfile { col => index($l, $1), code => $l }; + $count++; + } + if(!$count) { + # year-less + push @copyright, { + year => -1, + line => $line, + col => index($l, $1), + code => $l + }; } } diff --git a/scripts/ciconfig.pl b/scripts/ciconfig.pl index 9d4d0bbe2..a3ac4f6c9 100755 --- a/scripts/ciconfig.pl +++ b/scripts/ciconfig.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/cijobs.pl b/scripts/cijobs.pl index 428267519..ef0c0808c 100755 --- a/scripts/cijobs.pl +++ b/scripts/cijobs.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/completion.pl b/scripts/completion.pl index c2eb774f7..00c736898 100755 --- a/scripts/completion.pl +++ b/scripts/completion.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/contributors.sh b/scripts/contributors.sh index bb0745709..7b1cda385 100755 --- a/scripts/contributors.sh +++ b/scripts/contributors.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2013 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/contrithanks.sh b/scripts/contrithanks.sh index 20b5cbf10..46853da9a 100755 --- a/scripts/contrithanks.sh +++ b/scripts/contrithanks.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2013 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/copyright.pl b/scripts/copyright.pl index c7e7f242e..7c4ce659d 100755 --- a/scripts/copyright.pl +++ b/scripts/copyright.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/coverage.sh b/scripts/coverage.sh index f3db9af17..0a7c7824a 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/delta b/scripts/delta index 858f16100..9d2fb9bb2 100755 --- a/scripts/delta +++ b/scripts/delta @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2018-2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/firefox-db2pem.sh b/scripts/firefox-db2pem.sh index 36c2de93c..f78f41523 100755 --- a/scripts/firefox-db2pem.sh +++ b/scripts/firefox-db2pem.sh @@ -6,7 +6,7 @@ # * | (__| |_| | _ <| |___ # * \___|\___/|_| \_\_____| # * -# * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # * # * This software is licensed as described in the file COPYING, which # * you should have received as part of this distribution. The terms diff --git a/scripts/installcheck.sh b/scripts/installcheck.sh index f7df595f1..433420e03 100644 --- a/scripts/installcheck.sh +++ b/scripts/installcheck.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/log2changes.pl b/scripts/log2changes.pl index ee8a753eb..355418368 100755 --- a/scripts/log2changes.pl +++ b/scripts/log2changes.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/mk-ca-bundle.pl b/scripts/mk-ca-bundle.pl index 926478f12..83027a489 100755 --- a/scripts/mk-ca-bundle.pl +++ b/scripts/mk-ca-bundle.pl @@ -6,7 +6,7 @@ # * | (__| |_| | _ <| |___ # * \___|\___/|_| \_\_____| # * -# * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# * Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # * # * This software is licensed as described in the file COPYING, which # * you should have received as part of this distribution. The terms diff --git a/scripts/release-notes.pl b/scripts/release-notes.pl index 42f9b7a4d..136b48f0a 100755 --- a/scripts/release-notes.pl +++ b/scripts/release-notes.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2020 - 2023, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/singleuse.pl b/scripts/singleuse.pl index 0b707f440..fdf485721 100755 --- a/scripts/singleuse.pl +++ b/scripts/singleuse.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2019 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/updatemanpages.pl b/scripts/updatemanpages.pl index fd461e4bd..58a8755e8 100755 --- a/scripts/updatemanpages.pl +++ b/scripts/updatemanpages.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/zuul/before_script.sh b/scripts/zuul/before_script.sh index f75846014..d1e4e438b 100755 --- a/scripts/zuul/before_script.sh +++ b/scripts/zuul/before_script.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms diff --git a/scripts/zuul/script.sh b/scripts/zuul/script.sh index 38faf16d6..4514e97f2 100755 --- a/scripts/zuul/script.sh +++ b/scripts/zuul/script.sh @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms |