Bound htsback backing-info and fast-cache copies

Continue the htssafe.h pointer-destination migration in htsback.c.

back_infostr() wrote into a bare char* through the unchecked strcatbuff()
path. Thread the destination capacity through and use strlcatbuff(), and
fix a latent bug while here: the size/totalsize trailer was sprintf'd
straight into the destination, wiping the URL the function had just
assembled, instead of being built in the scratch buffer and appended.
The fixed-size sprintf() calls become snprintf().

Enlarge back_info()'s status buffer to HTS_URLMAXSIZE*4+1024 so it can
hold both url_adr and url_fil (each HTS_URLMAXSIZE*2) plus framing. The
old HTS_URLMAXSIZE*2+1024 buffer was too small for two full-length URL
fields, so the now-bounded appends would abort on a long URL.

In back_add()'s fast-header cache path, copy the cached location into its
backing array (location_buffer) rather than through the r.location alias,
so the bounded macro sees the real capacity.

Add a back_infostr()/back_info() self-test under -#7: it formats 2000
in-memory slots across every status-code arm with exact-match assertions
(no sockets needed), plus a near-maximal URL driven through back_info()
to guard the buffer sizing. It fails on the clobber bug and on an
undersized status buffer.

htsback.c is now free of pointer-destination buff() warnings.

Signed-off-by: Xavier Roche <roche@httrack.com>

configure.ac

@@ -50,6 +50,9 @@ LT_INIT
 AC_PROG_LN_S
 LT_INIT
 
+# bash, used to run the test scripts (see tests/Makefile.am TEST_LOG_COMPILER)
+AC_PATH_PROGS([BASH], [bash], [/bin/bash])
+
 # Export LD_LIBRARY_PATH name or equivalent.
 AC_SUBST(SHLIBPATH_VAR,$shlibpath_var)
 

html/Makefile.am

@@ -13,22 +13,26 @@ WebIcon32x32dir = $(datadir)/icons/hicolor/32x32/apps
 WebIcon48x48dir = $(datadir)/icons/hicolor/48x48/apps
 VFolderEntrydir = $(prefix)/share/applications
 
+# Wildcards are globbed against $(srcdir): a bare "*.html" is resolved against
+# the build dir and stays unexpanded (breaking "make") in an out-of-tree build.
+# Explicit filenames (e.g. ../history.txt, div/search.sh) resolve via VPATH and
+# need no prefix.
 HelpHtmlroot_DATA = ../httrack-doc.html ../history.txt
-HelpHtml_DATA = *.html
+HelpHtml_DATA = $(srcdir)/*.html
 HelpHtmldiv_DATA = div/search.sh
-HelpHtmlimg_DATA  = img/*
-HelpHtmlimages_DATA = images/*
+HelpHtmlimg_DATA  = $(srcdir)/img/*
+HelpHtmlimages_DATA = $(srcdir)/images/*
 HelpHtmlTxt_DATA = ../greetings.txt ../history.txt ../license.txt
-WebHtml_DATA = server/*.html server/*.js server/*.css
-WebHtmlimages_DATA = server/images/*
+WebHtml_DATA = $(srcdir)/server/*.html $(srcdir)/server/*.js $(srcdir)/server/*.css
+WebHtmlimages_DATA = $(srcdir)/server/images/*
 # note: converted & normalized by
 # ico2xpm favicon.ico -o httrack.xpm
 # mogrify -format xpm -map /usr/share/doc/menu/examples/cmap.xpm httrack.xpm
-WebPixmap_DATA = server/div/*.xpm
-WebIcon16x16_DATA = server/div/16x16/*.png
-WebIcon32x32_DATA = server/div/32x32/*.png
-WebIcon48x48_DATA = server/div/48x48/*.png
-VFolderEntry_DATA = server/div/*.desktop
+WebPixmap_DATA = $(srcdir)/server/div/*.xpm
+WebIcon16x16_DATA = $(srcdir)/server/div/16x16/*.png
+WebIcon32x32_DATA = $(srcdir)/server/div/32x32/*.png
+WebIcon48x48_DATA = $(srcdir)/server/div/48x48/*.png
+VFolderEntry_DATA = $(srcdir)/server/div/*.desktop
 
 EXTRA_DIST = $(HelpHtml_DATA) $(HelpHtmlimg_DATA) $(HelpHtmlimages_DATA) \
 	$(HelpHtmldiv_DATA) $(WebHtml_DATA) $(WebHtmlimages_DATA) \

lang/Makefile.am

@@ -1,6 +1,8 @@
 
 langdir = $(datadir)/httrack/lang
-lang_DATA = *.txt
+# Glob against $(srcdir): a bare "*.txt" is resolved against the build dir and
+# stays unexpanded (breaking "make") in an out-of-tree build.
+lang_DATA = $(srcdir)/*.txt
 langrootdir = $(datadir)/httrack
 langroot_DATA = ../lang.def ../lang.indexes
 

libtest/Makefile.am

@@ -1,6 +1,8 @@
 
 exemplesdir = $(datadir)/httrack/libtest
-exemples_DATA = *.c *.h *.txt
+# Glob against $(srcdir), not the build dir: a bare "*.c" is resolved relative to
+# the build dir and stays unexpanded (breaking "make") in an out-of-tree build.
+exemples_DATA = $(srcdir)/*.c $(srcdir)/*.h $(srcdir)/*.txt
 EXTRA_DIST = $(exemples_DATA) libtest.mak libtest.vcproj
 
 AM_CPPFLAGS = \
@@ -12,7 +14,9 @@ AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DDATADIR=\""$(datadir)"\" \
 	-DLIBDIR=\""$(libdir)"\"
-AM_CPPFLAGS += -I../src
+# Use $(top_srcdir)/src, not ../src: the latter is relative to the build dir and
+# misses the source headers (e.g. httrack-library.h) in an out-of-tree build.
+AM_CPPFLAGS += -I$(top_srcdir)/src
 
 # The callback examples reference libc only through libhttrack, so the direct
 # libc edge gets dropped from DT_NEEDED (library-not-linked-against-libc).

m4/Makefile.am

@@ -1 +1,3 @@
-EXTRA_DIST = *.m4
+# Glob against $(srcdir) so "make dist" works out-of-tree (a bare "*.m4" is
+# resolved against the build dir, where there are no sources).
+EXTRA_DIST = $(srcdir)/*.m4

man/htsserver.1

@@ -1,6 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii htsserver.1
 .\"
+.\" SPDX-License-Identifier: GPL-3.0-or-later
 .TH htsserver 1 "Mar 2003" "httrack website copier"
 .SH NAME
 htsserver \- offline browser server : copy websites to a local directory
@@ -35,7 +36,7 @@ Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of (web)httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) 1998-2013 Xavier Roche and other contributors
+Copyright (C) 1998-2026 Xavier Roche and other contributors
 
 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

man/httrack.1

@@ -2,6 +2,7 @@
 .\" groff -man -Tascii httrack.1
 .\"
 .\" This file is generated by man/makeman.sh; do not edit by hand.
+.\" SPDX-License-Identifier: GPL-3.0-or-later
 .TH httrack 1 "13 June 2026" "httrack website copier"
 .SH NAME
 httrack \- offline browser : copy websites to a local directory

man/makeman.sh

@@ -110,6 +110,7 @@ cat <<'EOF'
 .\" groff -man -Tascii httrack.1
 .\"
 .\" This file is generated by man/makeman.sh; do not edit by hand.
+.\" SPDX-License-Identifier: GPL-3.0-or-later
 EOF
 printf '.TH httrack 1 "%s" "httrack website copier"\n' "$date_str"
 cat <<'EOF'

man/proxytrack.1

@@ -1,6 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii proxytrack.1
 .\"
+.\" SPDX-License-Identifier: GPL-3.0-or-later
 .TH proxytrack 1 "Mar 2003" "httrack website copier"
 .SH NAME
 proxytrack \- proxy to serve content archived by httrack website copier
@@ -25,7 +26,7 @@ Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of (web)httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) 1998-2013 Xavier Roche and other contributors
+Copyright (C) 1998-2026 Xavier Roche and other contributors
 
 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

man/webhttrack.1

@@ -1,6 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii webhttrack.1
 .\"
+.\" SPDX-License-Identifier: GPL-3.0-or-later
 .TH webhttrack 1 "Mar 2003" "httrack website copier"
 .SH NAME
 webhttrack \- offline browser : copy websites to a local directory
@@ -36,7 +37,7 @@ Please reports bugs to
 .B <bugs@httrack.com>.
 Include a complete, self-contained example that will allow the bug to be reproduced, and say which version of (web)httrack you are using. Do not forget to detail options used, OS version, and any other information you deem necessary.
 .SH COPYRIGHT
-Copyright (C) 1998-2013 Xavier Roche and other contributors
+Copyright (C) 1998-2026 Xavier Roche and other contributors
 
 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

src/hts-indextmpl.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsalias.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsalias.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsarrays.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 2014 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsback.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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
@@ -1516,9 +1518,11 @@ int back_add(struct_back * sback, httrackp * opt, cache_back * cache, const char
 
           if (sscanf(text, "%d", &code) == 1) { // got code
             back[p].r.statuscode = code;
-            back[p].status = STATUS_READY;      // terminé
+            back[p].status = STATUS_READY;      // done
             if (lf != NULL && *lf != '\0') {    // got location ?
-              strcpybuff(back[p].r.location, lf + 1);
+              // r.location aliases location_buffer (set above); write the array
+              // so the bounded macro picks up its capacity.
+              strcpybuff(back[p].location_buffer, lf + 1);
             }
             return 0;
           }
@@ -3996,26 +4000,30 @@ LLint back_transferred(LLint nb, struct_back * sback) {
   return nb;
 }
 
-// infos backing
-// j: 1 afficher sockets 2 afficher autres 3 tout afficher
+// backing info
+// j: 1=show sockets 2=show others 3=show all
 void back_info(struct_back * sback, int i, int j, FILE * fp) {
   lien_back *const back = sback->lnk;
   const int back_max = sback->count;
 
   assertf(i >= 0 && i < back_max);
   if (back[i].status >= 0) {
-    char BIGSTK s[HTS_URLMAXSIZE * 2 + 1024];
+    // Holds the status tag plus the full URL: url_adr and url_fil are each
+    // HTS_URLMAXSIZE*2, so reserve room for both (*4) plus framing/trailer.
+    // Undersizing would make back_infostr's bounded appends abort on a long
+    // URL.
+    char BIGSTK s[HTS_URLMAXSIZE * 4 + 1024];
 
     s[0] = '\0';
-    back_infostr(sback, i, j, s);
+    back_infostr(sback, i, j, s, sizeof(s));
     strcatbuff(s, LF);
     fprintf(fp, "%s", s);
   }
 }
 
-// infos backing
-// j: 1 afficher sockets 2 afficher autres 3 tout afficher
-void back_infostr(struct_back * sback, int i, int j, char *s) {
+// backing info
+// j: 1=show sockets 2=show others 3=show all
+void back_infostr(struct_back *sback, int i, int j, char *s, size_t size) {
   lien_back *const back = sback->lnk;
   const int back_max = sback->count;
 
@@ -4025,16 +4033,16 @@ void back_infostr(struct_back * sback, int i, int j, char *s) {
 
     if (j & 1) {
       if (back[i].status == STATUS_CONNECTING) {
-        strcatbuff(s, "CONNECT ");
+        strlcatbuff(s, "CONNECT ", size);
       } else if (back[i].status == STATUS_WAIT_HEADERS) {
-        strcatbuff(s, "INFOS ");
+        strlcatbuff(s, "INFOS ", size);
         aff = 1;
       } else if (back[i].status == STATUS_CHUNK_WAIT
                  || back[i].status == STATUS_CHUNK_CR) {
-        strcatbuff(s, "INFOSC");        // infos chunk
+        strlcatbuff(s, "INFOSC", size); // chunk info
         aff = 1;
       } else if (back[i].status > 0) {
-        strcatbuff(s, "RECEIVE ");
+        strlcatbuff(s, "RECEIVE ", size);
         aff = 1;
       }
     }
@@ -4042,44 +4050,44 @@ void back_infostr(struct_back * sback, int i, int j, char *s) {
       if (back[i].status == STATUS_READY) {
         switch (back[i].r.statuscode) {
         case 200:
-          strcatbuff(s, "READY ");
+          strlcatbuff(s, "READY ", size);
           aff = 1;
           break;
         case -1:
-          strcatbuff(s, "ERROR ");
+          strlcatbuff(s, "ERROR ", size);
           aff = 1;
           break;
         case -2:
-          strcatbuff(s, "TIMEOUT ");
+          strlcatbuff(s, "TIMEOUT ", size);
           aff = 1;
           break;
         case -3:
-          strcatbuff(s, "TOOSLOW ");
+          strlcatbuff(s, "TOOSLOW ", size);
           aff = 1;
           break;
         case 400:
-          strcatbuff(s, "BADREQUEST ");
+          strlcatbuff(s, "BADREQUEST ", size);
           aff = 1;
           break;
         case 401:
         case 403:
-          strcatbuff(s, "FORBIDDEN ");
+          strlcatbuff(s, "FORBIDDEN ", size);
           aff = 1;
           break;
         case 404:
-          strcatbuff(s, "NOT FOUND ");
+          strlcatbuff(s, "NOT FOUND ", size);
           aff = 1;
           break;
         case 500:
-          strcatbuff(s, "SERVERROR ");
+          strlcatbuff(s, "SERVERROR ", size);
           aff = 1;
           break;
         default:
           {
             char s2[256];
 
-            sprintf(s2, "ERROR(%d)", back[i].r.statuscode);
-            strcatbuff(s, s2);
+            snprintf(s2, sizeof(s2), "ERROR(%d)", back[i].r.statuscode);
+            strlcatbuff(s, s2, size);
           }
           aff = 1;
         }
@@ -4090,16 +4098,18 @@ void back_infostr(struct_back * sback, int i, int j, char *s) {
       {
         char BIGSTK s2[HTS_URLMAXSIZE * 2 + 1024];
 
-        sprintf(s2, "\"%s", back[i].url_adr);
-        strcatbuff(s, s2);
+        snprintf(s2, sizeof(s2), "\"%s", back[i].url_adr);
+        strlcatbuff(s, s2, size);
 
         if (back[i].url_fil[0] != '/')
-          strcatbuff(s, "/");
-        sprintf(s2, "%s\" ", back[i].url_fil);
-        strcatbuff(s, s2);
-        sprintf(s, LLintP " " LLintP " ", (LLint) back[i].r.size,
-                (LLint) back[i].r.totalsize);
-        strcatbuff(s, s2);
+          strlcatbuff(s, "/", size);
+        snprintf(s2, sizeof(s2), "%s\" ", back[i].url_fil);
+        strlcatbuff(s, s2, size);
+        // size/totalsize trailer: build in s2, then append (the old code wrote
+        // straight into s here, clobbering the URL it had just assembled).
+        snprintf(s2, sizeof(s2), LLintP " " LLintP " ", (LLint) back[i].r.size,
+                 (LLint) back[i].r.totalsize);
+        strlcatbuff(s, s2, size);
       }
     }
   }

src/htsback.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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
@@ -127,7 +129,7 @@ int back_trylive(httrackp * opt, cache_back * cache, struct_back * sback,
 int back_finalize(httrackp * opt, cache_back * cache, struct_back * sback,
                   const int p);
 void back_info(struct_back * sback, int i, int j, FILE * fp);
-void back_infostr(struct_back * sback, int i, int j, char *s);
+void back_infostr(struct_back *sback, int i, int j, char *s, size_t size);
 LLint back_transferred(LLint add, struct_back * sback);
 
 // hostback

src/htsbase.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsbasenet.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsbauth.c

@@ -1,6 +1,8 @@
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsbauth.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscache.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscache.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscache_selftest.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 2026 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscache_selftest.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 2026 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscatchurl.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscatchurl.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscharset.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscharset.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsconcat.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2013 Xavier Roche and other contributors
+Copyright (C) 2014 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsconfig.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscore.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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
@@ -3993,5 +3995,5 @@ void voidf(void) {
   (void) a;
 }
 
-// HTTrack Website Copier Copyright (C) 1998-2017 Xavier Roche and other contributors
+// HTTrack Website Copier Copyright (C) 1998 Xavier Roche and other contributors
 //

src/htscore.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htscoremain.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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
@@ -153,6 +155,89 @@ static void basic_selftests(void) {
     assertf(strcmp(cookie_get(cbuf, "a\t\tc", 1), "") == 0);  // empty field
     assertf(strcmp(cookie_get(cbuf, "a\tb\tc", 9), "") == 0); // beyond last
   }
+  // back_infostr() status-line formatting (no sockets: pure formatting over
+  // in-memory slots). Stresses a few thousand entries across every status-code
+  // arm. Regression for a clobber bug where the size/totalsize trailer was
+  // written straight into the destination, wiping the URL it had just built.
+  {
+    static const struct {
+      int code;
+      const char *tag;
+    } cases[] = {
+        {200, "READY "},     {-1, "ERROR "},       {-2, "TIMEOUT "},
+        {-3, "TOOSLOW "},    {400, "BADREQUEST "}, {403, "FORBIDDEN "},
+        {404, "NOT FOUND "}, {500, "SERVERROR "},  {999, "ERROR(999)"},
+    };
+    const int ncases = (int) (sizeof(cases) / sizeof(cases[0]));
+    const int n = 2000;
+    lien_back *slots = calloct(n, sizeof(lien_back));
+    char line[HTS_URLMAXSIZE * 4 + 1024];
+    char expect[HTS_URLMAXSIZE * 4 + 1024];
+    struct_back sb;
+    int idx;
+
+    sb.lnk = slots;
+    sb.count = n;
+    sb.ready = NULL;
+    sb.ready_size_bytes = 0;
+    for (idx = 0; idx < n; idx++) {
+      lien_back *const slot = &slots[idx];
+
+      slot->r.location = slot->location_buffer;
+      slot->status = STATUS_READY;
+      slot->r.statuscode = cases[idx % ncases].code;
+      slot->r.size = idx;
+      slot->r.totalsize = idx + 1;
+      snprintf(slot->url_adr, sizeof(slot->url_adr), "http://h%d.example", idx);
+      snprintf(slot->url_fil, sizeof(slot->url_fil), "/p/%d.html", idx);
+    }
+    for (idx = 0; idx < n; idx++) {
+      line[0] = '\0';
+      back_infostr(&sb, idx, 3, line, sizeof(line));
+      // Exact match (not substring): pins tag/URL/trailer order and rejects a
+      // partial clobber, duplication, or truncation that a presence check would
+      // let through. The expected format is stated here independently.
+      snprintf(expect, sizeof(expect),
+               "%s\"http://h%d.example/p/%d.html\" " LLintP " " LLintP " ",
+               cases[idx % ncases].tag, idx, idx, (LLint) idx,
+               (LLint) (idx + 1));
+      assertf(strcmp(line, expect) == 0);
+    }
+    // Near-maximal URL, driven through back_info() (which owns the status
+    // buffer internally and prints to a FILE*). url_adr + url_fil together
+    // overrun the old HTS_URLMAXSIZE*2+1024 buffer, so the bounded appends
+    // would abort unless that buffer is sized to hold both fields. Regression
+    // for that sizing -- exercising back_infostr() directly would miss it,
+    // since the caller's buffer is what matters.
+    {
+      lien_back *const slot = &slots[0];
+      const size_t adrlen = sizeof(slot->url_adr) - 8;
+      const size_t fillen = sizeof(slot->url_fil) - 8;
+      FILE *const fp = tmpfile();
+      size_t got;
+
+      assertf(fp != NULL);
+      slot->status = STATUS_READY;
+      slot->r.statuscode = 200;
+      slot->r.size = 1;
+      slot->r.totalsize = 2;
+      memset(slot->url_adr, 'a', adrlen);
+      slot->url_adr[adrlen] = '\0';
+      slot->url_fil[0] = '/';
+      memset(slot->url_fil + 1, 'b', fillen - 1);
+      slot->url_fil[fillen] = '\0';
+      back_info(&sb, 0, 3, fp);
+      rewind(fp);
+      got = fread(line, 1, sizeof(line) - 1, fp);
+      line[got] = '\0';
+      fclose(fp);
+      snprintf(expect, sizeof(expect),
+               "READY \"%s%s\" " LLintP " " LLintP " " LF, slot->url_adr,
+               slot->url_fil, (LLint) 1, (LLint) 2);
+      assertf(strcmp(line, expect) == 0);
+    }
+    freet(slots);
+  }
 }
 
 /* Self-tests for the htssafe.h bounded string ops (driven by httrack -#8).

src/htscoremain.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsdefines.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsencoding.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 2013 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsencoding.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 2013 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsfilters.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsfilters.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsftp.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsftp.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsglobal.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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
@@ -202,7 +204,7 @@ Please visit our Website: http://www.httrack.com
 /* Taille max ligne de commande (>=HTS_URLMAXSIZE*2) */
 #define HTS_CDLMAXSIZE 1024
 
-/* Copyright (C) 1998-2017 Xavier Roche and other contributors */
+/* Copyright (C) 1998 Xavier Roche and other contributors */
 #define HTTRACK_AFF_AUTHORS "[XR&CO'2014]"
 #define HTS_DEFAULT_FOOTER "<!-- Mirrored from %s%s by HTTrack Website Copier/" HTTRACK_AFF_VERSION " " HTTRACK_AFF_AUTHORS ", %s -->"
 #define HTTRACK_WEB "http://www.httrack.com"

src/htshash.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htshash.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htshelp.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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
@@ -182,7 +184,8 @@ void help_wizard(httrackp * opt) {
   printf("\n");
   printf("Welcome to HTTrack Website Copier (Offline Browser) " HTTRACK_VERSION
          "%s\n", hts_get_version_info(opt));
-  printf("Copyright (C) 1998-2017 Xavier Roche and other contributors\n");
+  printf("Copyright (C) 1998-%s Xavier Roche and other contributors\n",
+         &__DATE__[7]);
 #ifdef _WIN32
   printf("Note: You are running the commandline version,\n");
   printf("run 'WinHTTrack.exe' to get the GUI version.\n");
@@ -795,7 +798,10 @@ void help(const char *app, int more) {
   snprintf(info, sizeof(info), "HTTrack version " HTTRACK_VERSION "%s",
           hts_is_available());
   infomsg(info);
-  infomsg("Copyright (C) 1998-2017 Xavier Roche and other contributors");
+  snprintf(info, sizeof(info),
+           "Copyright (C) 1998-%s Xavier Roche and other contributors",
+           &__DATE__[7]);
+  infomsg(info);
 #ifdef HTS_PLATFORM_NAME
   infomsg("[compiled: " HTS_PLATFORM_NAME "]");
 #endif

src/htshelp.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsindex.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsindex.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsjava.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsjava.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htslib.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htslib.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsmd5.c

@@ -1,7 +1,9 @@
 
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsmd5.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsmodules.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsmodules.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsname.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsname.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsnet.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsopt.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsparse.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsparse.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsrobots.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsrobots.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htssafe.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 2014 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsserver.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsserver.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsstrings.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsthread.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsthread.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htstools.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htstools.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsweb.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htsweb.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htswizard.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htswizard.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htswrap.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htswrap.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htszlib.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/htszlib.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/httrack-library.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/httrack.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/httrack.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/proxy/main.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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
@@ -91,7 +93,8 @@ int main(int argc, char *argv[]) {
   /* Args */
   printf("ProxyTrack %s, build proxies upon HTTrack Website Copier Archives\n",
          PROXYTRACK_VERSION);
-  printf("Copyright (C) 1998-2017 Xavier Roche and other contributors\n");
+  printf("Copyright (C) 1998-%s Xavier Roche and other contributors\n",
+         &__DATE__[7]);
   printf("\n");
   printf("This program is free software: you can redistribute it and/or modify\n");
   printf("it under the terms of the GNU General Public License as published by\n");

src/proxy/proxystrings.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/proxy/proxytrack.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/proxy/proxytrack.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/proxy/store.c

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

src/proxy/store.h

@@ -1,7 +1,9 @@
 /* ------------------------------------------------------------ */
 /*
 HTTrack Website Copier, Offline Browser for Windows and Unix
-Copyright (C) 1998-2017 Xavier Roche and other contributors
+Copyright (C) 1998 Xavier Roche and other contributors
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 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

tests/Makefile.am

@@ -9,6 +9,11 @@ TESTS_ENVIRONMENT += HTTPS_SUPPORT=$(HTTPS_SUPPORT)
 TESTS_ENVIRONMENT += top_srcdir=$(top_srcdir)
 
 TEST_EXTENSIONS = .test
+# Run each .test through bash instead of execve()ing it. This lets "make check"
+# work when the source tree sits on a noexec filesystem (the driver would
+# otherwise fail with "Permission denied"), and removes any reliance on the
+# scripts' executable bit. The scripts are #!/bin/bash and use bash features.
+TEST_LOG_COMPILER = $(BASH)
 TESTS = \
 	00_runnable.test \
 	01_engine-cache.test \