From 812aa90acbef4930ae356ab194f3f2a8f573f6e4 Mon Sep 17 00:00:00 2001 From: Martin Schröder Date: Tue, 26 Dec 2006 23:37:34 +0000 Subject: Import pdftex 1.40-rc4, which also changes the signature of print_version_and_exit, and adds a new library (libs/obsdcompat). git-svn-id: svn://tug.org/texlive/trunk@2959 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/lib/printversion.c | 10 ++++++-- Build/source/texk/web2c/lib/texmfmp.c | 39 ++++++++++++++++++------------ 2 files changed, 32 insertions(+), 17 deletions(-) (limited to 'Build/source/texk/web2c/lib') diff --git a/Build/source/texk/web2c/lib/printversion.c b/Build/source/texk/web2c/lib/printversion.c index cbcf5d56a00..a120deccb3c 100644 --- a/Build/source/texk/web2c/lib/printversion.c +++ b/Build/source/texk/web2c/lib/printversion.c @@ -16,8 +16,10 @@ This is PROGRAM, Version VERSION-NUMBER program, but tangle doesn't allow multiline string constants ... */ void -printversionandexit P3C(const_string, banner, - const_string, copyright_holder, const_string, author) +printversionandexit P4C(const_string, banner, + const_string, copyright_holder, + const_string, author, + char*, extra_info) { extern string versionstring; /* from web2c/lib/version.c */ extern KPSEDLL string kpathsea_version_string;/* from kpathsea/version.c */ @@ -54,5 +56,9 @@ printversionandexit P3C(const_string, banner, printf ("Primary author of %s: %s.\n", prog_name, author); puts ("Kpathsea written by Karl Berry, Olaf Weber, and others.\n"); + if (extra_info) { + puts (extra_info); + } + uexit (0); } diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 865a991b39b..cf7fa725f93 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -44,8 +44,7 @@ #include #elif defined (pdfTeX) #include -#elif defined (pdfeTeX) -#include +#include #elif defined (Omega) #include #elif defined (eOmega) @@ -187,7 +186,7 @@ maininit P2C(int, ac, string *, av) /* Must be initialized before options are parsed. */ interactionoption = 4; -#if defined(pdfTeX) || defined(pdfeTeX) +#if defined(pdfTeX) ptexbanner = BANNER; #endif @@ -273,7 +272,7 @@ maininit P2C(int, ac, string *, av) } #endif #endif -#if defined(eTeX) || defined(pdfeTeX) || defined(Aleph) || defined(XeTeX) +#if defined(eTeX) || defined(Aleph) || defined(XeTeX) if (etexp) { fprintf(stderr, "-etex only works with -ini\n"); } @@ -591,7 +590,6 @@ ipcpage P1C(int, is_eof) { static boolean begun = false; unsigned len = 0; - unsigned i; string p = ""; if (!begun) { @@ -607,8 +605,9 @@ ipcpage P1C(int, is_eof) #endif name = (string)xmalloc (len + 1); #if !defined(Omega) && !defined(eOmega) && !defined(Aleph) - strncpy (name, &strpool[strstart[outputfilename]], len); + strncpy (name, (string)&strpool[strstart[outputfilename]], len); #else + unsigned i; for (i=0; i