From: Wayne Davison Date: Sat, 13 Jun 2020 09:31:00 +0000 (-0700) Subject: Convert a couple files to UTF-8; more Copyright years. X-Git-Tag: v3.2.0pre1~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7dec4029ee4580e5990c062f0b3093e39f800fbf;p=thirdparty%2Frsync.git Convert a couple files to UTF-8; more Copyright years. --- diff --git a/backup.c b/backup.c index 326ecac2..a173aada 100644 --- a/backup.c +++ b/backup.c @@ -2,7 +2,7 @@ * Backup handling code. * * Copyright (C) 1999 Andrew Tridgell - * Copyright (C) 2003-2019 Wayne Davison + * Copyright (C) 2003-2020 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/hashtable.c b/hashtable.c index 52f0fa07..17133dd2 100644 --- a/hashtable.c +++ b/hashtable.c @@ -1,7 +1,7 @@ /* * Routines to provide a memory-efficient hashtable. * - * Copyright (C) 2007-2019 Wayne Davison + * Copyright (C) 2007-2020 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/hlink.c b/hlink.c index 29927166..91f043f4 100644 --- a/hlink.c +++ b/hlink.c @@ -4,7 +4,7 @@ * Copyright (C) 1996 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2002 Martin Pool - * Copyright (C) 2004-2019 Wayne Davison + * Copyright (C) 2004-2020 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/packaging/year-tweak b/packaging/year-tweak index 6bd6f130..a8792816 100755 --- a/packaging/year-tweak +++ b/packaging/year-tweak @@ -22,9 +22,10 @@ def main(): m = argparse.Namespace(**m.groupdict()) if m.year > latest_year: latest_year = m.year - if not re.search(r'\.(c|h|sh)$', m.fn) or m.fn.startswith('zlib/'): + if m.fn.startswith('zlib/') or m.fn.startswith('popt/'): continue - maybe_edit_copyright_year(m.fn, m.year) + if re.search(r'\.(c|h|sh|test)$', m.fn): + maybe_edit_copyright_year(m.fn, m.year) proc.communicate() fn = 'latest-year.h' @@ -71,7 +72,7 @@ def maybe_edit_copyright_year(fn, year): return opening_lines[copyright_line.lineno - 1] = txt else: - if fn.startswith('lib/'): + if fn.startswith('lib/') or fn.startswith('testsuite/'): return txt = copyright_line.pre + year + MAINTAINER_SUF opening_lines[copyright_line.lineno - 1] += txt diff --git a/testsuite/backup.test b/testsuite/backup.test index e28dd541..87db33e5 100644 --- a/testsuite/backup.test +++ b/testsuite/backup.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2004 by Wayne Davison +# Copyright (C) 2004-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). diff --git a/testsuite/chmod-temp-dir.test b/testsuite/chmod-temp-dir.test index b9a294ac..d31a1bdf 100644 --- a/testsuite/chmod-temp-dir.test +++ b/testsuite/chmod-temp-dir.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2004 by Wayne Davison +# Copyright (C) 2004-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). diff --git a/testsuite/chmod.test b/testsuite/chmod.test index ad4aeff0..f2dd4399 100644 --- a/testsuite/chmod.test +++ b/testsuite/chmod.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2004 by Wayne Davison +# Copyright (C) 2004-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). diff --git a/testsuite/compare-dest.test b/testsuite/compare-dest.test index d9eea8e9..7f193c58 100644 --- a/testsuite/compare-dest.test +++ b/testsuite/compare-dest.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2004 by Wayne Davison +# Copyright (C) 2004-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). diff --git a/testsuite/delete.test b/testsuite/delete.test index 8fa6035a..8c19827b 100644 --- a/testsuite/delete.test +++ b/testsuite/delete.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2005 by Wayne Davison +# Copyright (C) 2005-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). diff --git a/testsuite/files-from.test b/testsuite/files-from.test index f7181613..207eab5f 100644 --- a/testsuite/files-from.test +++ b/testsuite/files-from.test @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2008 by Wayne Davison +# Copyright (C) 2008-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). diff --git a/testsuite/fuzzy.test b/testsuite/fuzzy.test index 1abfab52..39726a03 100644 --- a/testsuite/fuzzy.test +++ b/testsuite/fuzzy.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2005 by Wayne Davison +# Copyright (C) 2005-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). diff --git a/testsuite/itemize.test b/testsuite/itemize.test index 3a5af1c3..553d0cef 100644 --- a/testsuite/itemize.test +++ b/testsuite/itemize.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2005 by Wayne Davison +# Copyright (C) 2005-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). diff --git a/testsuite/merge.test b/testsuite/merge.test index 4e76102d..9b20f73d 100644 --- a/testsuite/merge.test +++ b/testsuite/merge.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2004 by Wayne Davison +# Copyright (C) 2004-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). diff --git a/testsuite/relative.test b/testsuite/relative.test index 686399e4..89e4ce17 100644 --- a/testsuite/relative.test +++ b/testsuite/relative.test @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2005 by Wayne Davison +# Copyright (C) 2005-2020 Wayne Davison # # This program is distributable under the terms of the GNU GPL (see COPYING) diff --git a/testsuite/unsafe-byname.test b/testsuite/unsafe-byname.test index 69b338f6..55df0865 100644 --- a/testsuite/unsafe-byname.test +++ b/testsuite/unsafe-byname.test @@ -47,7 +47,7 @@ test_unsafe dir/..//.. from unsafe test_unsafe '' from unsafe -# Based on tests from unsafe-links by Vladimír Michl +# Based on tests from unsafe-links by Vladimír Michl test_unsafe ../../unsafe/unsafefile from/safe unsafe test_unsafe ..//../unsafe/unsafefile from/safe unsafe test_unsafe ../files/file1 from/safe safe diff --git a/testsuite/unsafe-links.test b/testsuite/unsafe-links.test index 058269ef..479d606c 100644 --- a/testsuite/unsafe-links.test +++ b/testsuite/unsafe-links.test @@ -1,6 +1,6 @@ #! /bin/sh -# Originally by Vladimír Michl +# Originally by Vladimír Michl . "$suitedir/rsync.fns" diff --git a/testsuite/wildmatch.test b/testsuite/wildmatch.test index 9d501897..12b872c8 100644 --- a/testsuite/wildmatch.test +++ b/testsuite/wildmatch.test @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2003 by Wayne Davison +# Copyright (C) 2003-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING).