Convert a couple files to UTF-8; more Copyright years.

diff --git a/backup.c b/backup.c
index 326ecac2330ccc3c39eca953db3f94ae49dd7404..a173aada39c0c38739e352f750f301a5ce32131d 100644 (file)
--- 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 52f0fa07c3664114e73a73c6cd68d9d3d20dd8ed..17133dd2bc85668b4356ea7b4c400459cc53e312 100644 (file)
--- 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 29927166ab0a333ea0440df0022c6a838f3fa15f..91f043f4672653c5a92c7f6fa3bbe10640beece4 100644 (file)
--- 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 <mbp@samba.org>
- * 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 6bd6f13031b0d427da7649f0722ad71978934adf..a8792816215ce6643b1d9f63b51bcc29c532dec1 100755 (executable)
--- 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 e28dd541f5e974d1e5e47c3783ab59996eaed968..87db33e5b6da4d4d1fbe50ecfd3685ded5d18a3a 100644 (file)
--- a/testsuite/backup.test
+++ b/testsuite/backup.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2004 by Wayne Davison <wayned@samba.org>
+# 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 b9a294ac7595b9069fc4d32180756aac4a9c2d53..d31a1bdfac7cfd3e31aa79db62053cee6bb90273 100644 (file)
--- a/testsuite/chmod-temp-dir.test
+++ b/testsuite/chmod-temp-dir.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2004 by Wayne Davison <wayned@samba.org>
+# 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 ad4aeff03de79f849d6391b0b86562fa4237926d..f2dd4399208026920667b61a337febc35a6d1054 100644 (file)
--- a/testsuite/chmod.test
+++ b/testsuite/chmod.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2004 by Wayne Davison <wayned@samba.org>
+# 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 d9eea8e96f793d1ea23fc7b6684beeeba0460b5f..7f193c58c3b6067a5d415189290a53336d91c519 100644 (file)
--- a/testsuite/compare-dest.test
+++ b/testsuite/compare-dest.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2004 by Wayne Davison <wayned@samba.org>
+# 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 8fa6035ac1f9d7359348afd5654c9c90ddd69670..8c19827b7dc75075e1f28a907e606b03e20d1024 100644 (file)
--- a/testsuite/delete.test
+++ b/testsuite/delete.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2005 by Wayne Davison <wayned@samba.org>
+# 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 f71816139a609d170be6f80e2fe53c26467cd841..207eab5f2d41686e54ab13fa41b887565188f454 100644 (file)
--- a/testsuite/files-from.test
+++ b/testsuite/files-from.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2008 by Wayne Davison <wayned@samba.org>
+# 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 1abfab52eb08cf5cf76cfe98e48f55376ec90749..39726a030e53dfbad6f90e68d9d48a8c3bc550b3 100644 (file)
--- a/testsuite/fuzzy.test
+++ b/testsuite/fuzzy.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2005 by Wayne Davison <wayned@samba.org>
+# 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 3a5af1c336efc93d88cb77cd9032ff8d45af4f07..553d0cefb9f9fda824b9b94adcfa53e9591449d4 100644 (file)
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2005 by Wayne Davison <wayned@samba.org>
+# 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 4e76102df588b111ae7a0d14ce7d5856144c9987..9b20f73ddafeffd7b7761bccd341b18ab9beefeb 100644 (file)
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2004 by Wayne Davison <wayned@samba.org>
+# 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 686399e46c0418aa14bbe636de8fb21b78e97598..89e4ce17f6dfb9fce62a55fdba042fc94db810da 100644 (file)
--- a/testsuite/relative.test
+++ b/testsuite/relative.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2005 by Wayne Davison <wayned@samba.org>
+# 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 69b338f6251a0b04854fef4376fbfa79fc5e5517..55df086523744137004b7eee8a14bf815a601f63 100644 (file)
--- 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 058269ef4241d7aa285be6abe9476438ae8a8995..479d606c832a97c9791193d01c63a9313c1e0814 100644 (file)
--- a/testsuite/unsafe-links.test
+++ b/testsuite/unsafe-links.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Originally by Vladimír Michl <Vladimir.Michl@hlubocky.del.cz>
+# Originally by Vladimír Michl <Vladimir.Michl@hlubocky.del.cz>
 
 . "$suitedir/rsync.fns"
 

diff --git a/testsuite/wildmatch.test b/testsuite/wildmatch.test
index 9d50189788b0ba7012ed81bba0df50c4a7fb0bf8..12b872c8b0f3fc36f42598837289fefa5242d1de 100644 (file)
--- a/testsuite/wildmatch.test
+++ b/testsuite/wildmatch.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2003 by Wayne Davison <wayned@samba.org>
+# Copyright (C) 2003-2020 Wayne Davison
 
 # This program is distributable under the terms of the GNU GPL (see
 # COPYING).