diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:35:30 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-09-18 17:35:30 +0000 |
commit | 0a79e02c16542d31043943dec87016f5b0da7cc5 (patch) | |
tree | 65ab6c25d57b965850968474eb9d1e01164caafb /Build/source | |
parent | 90c0c71a735e84ed8a19b201cc6811e35e1b86fe (diff) |
web2c/lib: Reduce TL/W32TeX diffs
git-svn-id: svn://tug.org/texlive/trunk@27703 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r-- | Build/source/texk/web2c/lib/ChangeLog | 11 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/main.c | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/openclose.c | 13 | ||||
-rw-r--r-- | Build/source/texk/web2c/lib/texmfmp.c | 2 |
4 files changed, 21 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 54a52556c8a..8bcd5cd9856 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -3,6 +3,17 @@ * texmfmp.c (maininit): On Windows, latex "\input" "a b c", for example, was not allowed. Allow file name with spaces in these cases. +2012-08-28 Peter Breitenlohner <peb@mppmu.mpg.de> + + * main.c [WIN32]: Added _setmaxstdio() (from W32TeX). + + * openclose.c (recorder_start): Reduce TL/W32TeX diffs. + Avoid using pid_t lacking in WIN32 (MSVC). + +2012-08-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * texmfmp.c [IS_pTeX]: Rename initdefaultkanji() => initkanji(). + 2012-08-06 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * texmfmp.c [WIN32]: bug fix. use rewind (f) to clear error and diff --git a/Build/source/texk/web2c/lib/main.c b/Build/source/texk/web2c/lib/main.c index 6d11dc96a37..d3f5a45aa43 100644 --- a/Build/source/texk/web2c/lib/main.c +++ b/Build/source/texk/web2c/lib/main.c @@ -19,6 +19,10 @@ main (int ac, string* av) _response (&ac, &av); #endif +#ifdef WIN32 + _setmaxstdio(2048); +#endif + argc = ac; argv = av; mainbody (); diff --git a/Build/source/texk/web2c/lib/openclose.c b/Build/source/texk/web2c/lib/openclose.c index b71df46e235..2620b8894bd 100644 --- a/Build/source/texk/web2c/lib/openclose.c +++ b/Build/source/texk/web2c/lib/openclose.c @@ -43,15 +43,12 @@ recorder_start(void) default name. Throw in the pid so at least parallel builds might work (Debian bug 575731). */ string cwd; - pid_t pid = getpid(); char pid_str[MAX_INT_LENGTH]; - sprintf (pid_str, "%ld", (long) pid); - - recorder_name = xmalloc(strlen(kpse_program_name) - + strlen (pid_str) + 5); - strcpy(recorder_name, kpse_program_name); - strcat(recorder_name, pid_str); - strcat(recorder_name, ".fls"); + + /* Windows (MSVC) seems to have no pid_t, so instead of storing the + value returned by getpid() we immediately consume it. */ + sprintf (pid_str, "%ld", (long) getpid()); + recorder_name = concat3(kpse_program_name, pid_str, ".fls"); /* If an output directory was specified, use it instead of cwd. */ if (output_directory) { diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index f86eeb4e4fa..d6944a1e711 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -658,7 +658,7 @@ maininit (int ac, string *av) #if IS_pTeX kpse_set_program_name (argv[0], NULL); - initdefaultkanji (); + initkanji (); #endif /* If the user says --help or --version, we need to notice early. And |