TeX & Co: Report number of file offset bits in -version (LFS)

git-svn-id: svn://tug.org/texlive/trunk@25130 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 10 insertions, 5 deletions

diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 286ad12a0a0..581c8a7f4f3 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* lib.h, printversion.c, texmfmp.c: Report file offset bits.
+
 2011-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* setupvar.c (setupboundvariable): Warning message: the bad
diff --git a/Build/source/texk/web2c/lib/lib.h b/Build/source/texk/web2c/lib/lib.h
index e9501dc9f66..31f423508c5 100644
--- a/Build/source/texk/web2c/lib/lib.h
+++ b/Build/source/texk/web2c/lib/lib.h
@@ -47,7 +47,7 @@ extern boolean recorder_enabled;
 extern string output_directory;
 
 /* printversion.c */
-extern void printversionandexit (const_string, const_string, const_string, char*);
+extern void printversionandexit (const_string, const_string, const_string, const_string);
 
 /* setupvar.c */
 /* Set an array size from texmf.cnf.  */
diff --git a/Build/source/texk/web2c/lib/printversion.c b/Build/source/texk/web2c/lib/printversion.c
index 2570cb03c7d..d87f42241f3 100644
--- a/Build/source/texk/web2c/lib/printversion.c
+++ b/Build/source/texk/web2c/lib/printversion.c
@@ -24,7 +24,7 @@ void
 printversionandexit (const_string banner,
                      const_string copyright_holder,  
                      const_string author,
-                     char *extra_info)
+                     const_string extra_info)
 {
   string prog_name;
   unsigned len;
@@ -65,7 +65,8 @@ printversionandexit (const_string banner,
   printf ("Primary author of %s: %s.\n", prog_name, author);
 
   if (extra_info) {
-    puts (extra_info);
+    fputs (extra_info, stdout);
+    printf ("Compiled with %d file offset bits\n", 8 * sizeof (off_t)); 
   }
 
   uexit (0);
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index f3682cfbb6d..4a8bdf40473 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -1679,11 +1679,11 @@ parse_options (int argc, string *argv)
 #endif
 
     } else if (ARGUMENT_IS ("version")) {
-        char *versions;
 #if defined (pdfTeX) || defined(XeTeX)
+        char *versions;
         initversionstring(&versions); 
 #else
-        versions = NULL;
+        const char *versions = "";
 #endif
         printversionandexit (BANNER, COPYRIGHT_HOLDER, AUTHOR, versions);