texlive[49432] Build/source/texk/web2c/lib: do not assume "This is"

[commits+karl at tug.org]

Revision: 49432
          http://tug.org/svn/texlive?view=revision&revision=49432
Author:   karl
Date:     2018-12-17 18:45:10 +0100 (Mon, 17 Dec 2018)
Log Message:
-----------
do not assume "This is" prefix in banner (from AndreasS)

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/lib/ChangeLog
    trunk/Build/source/texk/web2c/lib/printversion.c

Modified: trunk/Build/source/texk/web2c/lib/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/lib/ChangeLog	2018-12-17 01:23:23 UTC (rev 49431)
+++ trunk/Build/source/texk/web2c/lib/ChangeLog	2018-12-17 17:45:10 UTC (rev 49432)
@@ -1,3 +1,8 @@
+2018-12-17  Andreas Scherer  <https://ascherer.github.io>
+
+	* printversion.c (printversionandexit): Search for PROGNAME
+	in banner independent of 'This is' prefix.
+
 2018-11-19  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* texmfmp.c: Remove unused functions for XeTeX.

Modified: trunk/Build/source/texk/web2c/lib/printversion.c
===================================================================
--- trunk/Build/source/texk/web2c/lib/printversion.c	2018-12-17 01:23:23 UTC (rev 49431)
+++ trunk/Build/source/texk/web2c/lib/printversion.c	2018-12-17 17:45:10 UTC (rev 49432)
@@ -28,22 +28,27 @@
 {
   string prog_name;
   unsigned len;
+  const_string prog_name_start;
   const_string prog_name_end = strchr (banner, ',');
   const_string prog_version = strrchr (banner, ' ');
   assert (prog_name_end && prog_version);
   prog_version++;
   
-  len = prog_name_end - banner - sizeof ("This is");
+  len = prog_name_end - banner;
   prog_name = xmalloc (len + 1);
-  strncpy (prog_name, banner + sizeof ("This is"), len);
+  strncpy (prog_name, banner, len);
   prog_name[len] = 0;
 
+  prog_name_start = strrchr (prog_name, ' ');
+  assert (prog_name_start);
+  prog_name_start++;
+
   /* The Web2c version string starts with a space.  */
 #ifdef PTEX
-  printf ("%s %s (%s)%s\n", prog_name, prog_version, get_enc_string(),
+  printf ("%s %s (%s)%s\n", prog_name_start, prog_version, get_enc_string(),
           versionstring);
 #else
-  printf ("%s %s%s\n", prog_name, prog_version, versionstring);
+  printf ("%s %s%s\n", prog_name_start, prog_version, versionstring);
 #endif
   puts (kpathsea_version_string);
 #ifdef PTEX
@@ -58,11 +63,11 @@
 
   puts ("There is NO warranty.  Redistribution of this software is");
   fputs ("covered by the terms of ", stdout);
-  printf ("both the %s copyright and\n", prog_name);
+  printf ("both the %s copyright and\n", prog_name_start);
   puts ("the Lesser GNU General Public License.");
   puts ("For more information about these matters, see the file");
-  printf ("named COPYING and the %s source.\n", prog_name);
-  printf ("Primary author of %s: %s.\n", prog_name, author);
+  printf ("named COPYING and the %s source.\n", prog_name_start);
+  printf ("Primary author of %s: %s.\n", prog_name_start, author);
 
   if (extra_info)
     fputs (extra_info, stdout);