From 376082647d10be8cb6f417b0554c2ebf38cfb2fe Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 15 Jul 2014 07:24:28 +0000 Subject: Replace the deprecated spawnvp() by _spawnvp(), they differ for 64-bit MinGW git-svn-id: svn://tug.org/texlive/trunk@34617 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 5 +++++ Build/source/texk/kpathsea/tex-make.c | 2 +- Build/source/texk/kpathsea/win32/ChangeLog | 5 +++++ Build/source/texk/kpathsea/win32/mktexfmt.c | 2 +- Build/source/texk/kpathsea/win32/mktexpk.c | 14 +++++++------- Build/source/texk/kpathsea/win32/mktextfm.c | 2 +- Build/source/texk/kpathsea/win32lib.c | 2 +- Build/source/texk/texlive/ChangeLog | 5 +++++ Build/source/texk/texlive/w32_wrapper/callexe.c | 2 +- Build/source/texk/web2c/lib/ChangeLog | 5 +++++ Build/source/texk/web2c/lib/texmfmp.c | 2 +- Build/source/texk/web2c/mplibdir/ChangeLog | 5 +++++ Build/source/texk/web2c/mplibdir/mpxout.w | 2 +- Build/source/texk/web2c/otps/win32/ChangeLog | 6 ++++++ Build/source/texk/web2c/otps/win32/mkocp.c | 2 +- Build/source/texk/web2c/otps/win32/mkofm.c | 2 +- 16 files changed, 47 insertions(+), 16 deletions(-) diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index baf8f109a1b..28aa77a14d1 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,8 @@ +2014-07-15 Peter Breitenlohner + + * tex-make.c, win32lib.c: Replace the deprecated spawnvp() by + _spawnvp(), they differ for 64-bit MinGW. + 2014-07-13 Peter Breitenlohner * debug.c, hash.c, knj.c, tex-make.c: [WIN64] Avoid cast from diff --git a/Build/source/texk/kpathsea/tex-make.c b/Build/source/texk/kpathsea/tex-make.c index 8c3e46816d0..6671b5474ba 100644 --- a/Build/source/texk/kpathsea/tex-make.c +++ b/Build/source/texk/kpathsea/tex-make.c @@ -231,7 +231,7 @@ maketex (kpathsea kpse, kpse_file_format_type format, string* args) } } fprintf(stderr, "\nThe command name is %s\n", fullbin); - hchild = (HANDLE)spawnvp(_P_NOWAIT, fullbin, (const char * const *) args); + hchild = (HANDLE)_spawnvp(_P_NOWAIT, fullbin, (const char * const *) args); _dup2(hstdout, fileno(stdout)); close(hstdout); diff --git a/Build/source/texk/kpathsea/win32/ChangeLog b/Build/source/texk/kpathsea/win32/ChangeLog index b45c36e3e23..1fd84adbd50 100644 --- a/Build/source/texk/kpathsea/win32/ChangeLog +++ b/Build/source/texk/kpathsea/win32/ChangeLog @@ -1,3 +1,8 @@ +2014-07-15 Peter Breitenlohner + + * mktexfmt.c, mktexpk.c, mktextfm.c: Replace the deprecated + spawnvp() by _spawnvp(), they differ for 64-bit MinGW. + 2012-12-08 Akira Kakuto * getdestdir.c: Correct return value of getdestdir(). diff --git a/Build/source/texk/kpathsea/win32/mktexfmt.c b/Build/source/texk/kpathsea/win32/mktexfmt.c index 826bedecba3..e6b3e6ff32c 100644 --- a/Build/source/texk/kpathsea/win32/mktexfmt.c +++ b/Build/source/texk/kpathsea/win32/mktexfmt.c @@ -73,7 +73,7 @@ int main(int ac, char **av) strcpy(fullbin, texbindir); strcat(fullbin, "fmtutil.exe"); fprintf(stderr, "Running the command %s\n", fullbin); - spawnlp(_P_WAIT, fullbin, "fmtutil", "--byfmt", av[1], NULL); + _spawnlp(_P_WAIT, fullbin, "fmtutil", "--byfmt", av[1], NULL); /* END COMMAND */ diff --git a/Build/source/texk/kpathsea/win32/mktexpk.c b/Build/source/texk/kpathsea/win32/mktexpk.c index 97035a5397d..2d562528495 100644 --- a/Build/source/texk/kpathsea/win32/mktexpk.c +++ b/Build/source/texk/kpathsea/win32/mktexpk.c @@ -774,7 +774,7 @@ main (int ac, char **av) fprintf (stderr, "%s %s\n", execfile, cmd); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, NULL); + (void) _spawnlp (_P_WAIT, fullbin, execfile, cmd, NULL); sprintf (cmd, "%s.%sgf", name, dpi); @@ -796,7 +796,7 @@ main (int ac, char **av) fprintf (stderr, "%s %s %s\n", execfile, cmd, pkname); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, pkname, NULL); + (void) _spawnlp (_P_WAIT, fullbin, execfile, cmd, pkname, NULL); if (_access (pkname, 0) != 0) { tpkerr ("Failed to make pk from gf."); @@ -1115,7 +1115,7 @@ skip flag fprintf (stderr, "%s %s\n", execfile, cmd); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, NULL); + (void) _spawnlp (_P_WAIT, fullbin, execfile, cmd, NULL); if (_access (pkname, 0) != 0) { tpkerr ("ps2pk failed to make pk font."); @@ -1138,7 +1138,7 @@ skip flag fprintf (stderr, "%s %s %s\n", execfile, name, dpi); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (_P_WAIT, fullbin, execfile, name, dpi, NULL); + (void) _spawnlp (_P_WAIT, fullbin, execfile, name, dpi, NULL); if (_access (pkname, 0) != 0) { tpkerr ("gsftopk cannot be used."); @@ -1148,7 +1148,7 @@ skip flag fprintf (stderr, "%s -q %s %s\n", execfile, name, dpi); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (_P_WAIT, fullbin, execfile, "-q", name, dpi, NULL); + (void) _spawnlp (_P_WAIT, fullbin, execfile, "-q", name, dpi, NULL); if (_access (pkname, 0) != 0) { tpkerr ("ttf2pk failed."); @@ -1158,7 +1158,7 @@ skip flag fprintf (stderr, "%s -q -p %s %s\n", execfile, name, dpi); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (_P_WAIT, fullbin, execfile, "-q -p", name, dpi, NULL); + (void) _spawnlp (_P_WAIT, fullbin, execfile, "-q -p", name, dpi, NULL); sprintf (cmd, "%s.%sgf", name, dpi); if (_access (cmd, 0) != 0) { @@ -1172,7 +1172,7 @@ skip flag fprintf (stderr, "%s %s %s\n", execfile, cmd, pkname); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, pkname, NULL); + (void) _spawnlp (_P_WAIT, fullbin, execfile, cmd, pkname, NULL); if (_access (pkname, 0) != 0) { tpkerr ("All trials failed."); diff --git a/Build/source/texk/kpathsea/win32/mktextfm.c b/Build/source/texk/kpathsea/win32/mktextfm.c index ee69d22c606..7277d10af70 100644 --- a/Build/source/texk/kpathsea/win32/mktextfm.c +++ b/Build/source/texk/kpathsea/win32/mktextfm.c @@ -283,7 +283,7 @@ issetdest = 2 : current directory fprintf (stderr, "%s %s\n", execfile, cmd); strcpy(fullbin, texbindir); strcat(fullbin, execfile); - (void) spawnlp (_P_WAIT, fullbin, execfile, cmd, NULL); + (void) _spawnlp (_P_WAIT, fullbin, execfile, cmd, NULL); /* return to original stdout and stdin */ _dup2 (savo, fileno (stdout)); diff --git a/Build/source/texk/kpathsea/win32lib.c b/Build/source/texk/kpathsea/win32lib.c index 32d3381a492..35a0267887e 100644 --- a/Build/source/texk/kpathsea/win32lib.c +++ b/Build/source/texk/kpathsea/win32lib.c @@ -411,7 +411,7 @@ int win32_system(const char *cmd) *q++ = '"'; *q = '\0'; av[3] = NULL; - ret = spawnvp(_P_WAIT, av[0], av); + ret = _spawnvp(_P_WAIT, av[0], av); free(av[0]); free(av[1]); free(av[2]); diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog index dd58da44659..2fe43b5633f 100644 --- a/Build/source/texk/texlive/ChangeLog +++ b/Build/source/texk/texlive/ChangeLog @@ -1,3 +1,8 @@ +2014-07-15 Peter Breitenlohner + + * w32_wrapper/callexe.c: Replace the deprecated spawnvp() by + _spawnvp(), they differ for 64-bit MinGW. + 2014-06-16 Peter Breitenlohner * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. diff --git a/Build/source/texk/texlive/w32_wrapper/callexe.c b/Build/source/texk/texlive/w32_wrapper/callexe.c index 1d4dac4a80e..2aa041ea0da 100644 --- a/Build/source/texk/texlive/w32_wrapper/callexe.c +++ b/Build/source/texk/texlive/w32_wrapper/callexe.c @@ -39,5 +39,5 @@ int main(int argc, char *argv[]) } } argv[argc] = NULL; - return spawnvp(_P_WAIT, EXEPROG, (const char * const *)argv); + return _spawnvp(_P_WAIT, EXEPROG, (const char * const *)argv); } diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index bce3844d032..3874cde447e 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,3 +1,8 @@ +2014-07-15 Peter Breitenlohner + + * texmfmp.c: Replace the deprecated spawnvp() by _spawnvp(), + they differ for 64-bit MinGW. + 2014-07-04 Akira Kakuto * texmfmp.c: Remove redundant cpp macros (w32 only). diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 7aae9b5a6a2..f7908936ecc 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -1680,7 +1680,7 @@ parse_options (int argc, string *argv) /* Try to start up the other end if it's not already. */ if (!ipc_is_open ()) { #ifdef WIN32 - if (spawnlp (_P_NOWAIT, IPC_SERVER_CMD, IPC_SERVER_CMD, NULL) != -1) { + if (_spawnlp (_P_NOWAIT, IPC_SERVER_CMD, IPC_SERVER_CMD, NULL) != -1) { #else if (system (IPC_SERVER_CMD) == 0) { #endif diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 203996cfa1a..0f4621c055d 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,8 @@ +2014-07-15 Peter Breitenlohner + + * mpxout.w: Replace the deprecated spawnvp() by _spawnvp(), + they differ for 64-bit MinGW. + 2014-06-21 Peter Breitenlohner * mpxout.w: Avoid undefined behaviour when char is signed. diff --git a/Build/source/texk/web2c/mplibdir/mpxout.w b/Build/source/texk/web2c/mplibdir/mpxout.w index c26881b0f24..186d904939d 100644 --- a/Build/source/texk/web2c/mplibdir/mpxout.w +++ b/Build/source/texk/web2c/mplibdir/mpxout.w @@ -3989,7 +3989,7 @@ static int do_spawn (MPX mpx, char *icmd, char **options) { } } #else - retcode = spawnvp(_P_WAIT, cmd, (const char* const*)options); + retcode = _spawnvp(_P_WAIT, cmd, (const char* const*)options); #endif xfree(cmd); return retcode; diff --git a/Build/source/texk/web2c/otps/win32/ChangeLog b/Build/source/texk/web2c/otps/win32/ChangeLog index 677cbdd52a2..499a073e740 100644 --- a/Build/source/texk/web2c/otps/win32/ChangeLog +++ b/Build/source/texk/web2c/otps/win32/ChangeLog @@ -1,3 +1,9 @@ +2014-07-15 Peter Breitenlohner + + * mkocp.c: Replace the deprecated spawnlp() by _spawnlp(). + * mkofm.c: Replace the deprecated spawnvp() by _spawnvp(), + they differ for 64-bit MinGW. + 2012-08-03 Peter Breitenlohner * mkocp.c, mkofm.c: Replace P_WAIT by _P_WAIT. diff --git a/Build/source/texk/web2c/otps/win32/mkocp.c b/Build/source/texk/web2c/otps/win32/mkocp.c index dceb3ecab06..595ea346d31 100644 --- a/Build/source/texk/web2c/otps/win32/mkocp.c +++ b/Build/source/texk/web2c/otps/win32/mkocp.c @@ -50,7 +50,7 @@ int main(int ac, char **av) /* COMMAND */ - spawnlp(_P_WAIT, "otp2ocp", "otp2ocp", name, NULL); + _spawnlp(_P_WAIT, "otp2ocp", "otp2ocp", name, NULL); /* END COMMAND */ diff --git a/Build/source/texk/web2c/otps/win32/mkofm.c b/Build/source/texk/web2c/otps/win32/mkofm.c index 9ddd714ecaa..cb6ef4cd8eb 100644 --- a/Build/source/texk/web2c/otps/win32/mkofm.c +++ b/Build/source/texk/web2c/otps/win32/mkofm.c @@ -5,5 +5,5 @@ int main(int argc, char *argv[]) { strcpy(argv[0], "mkofm"); - return spawnvp(_P_WAIT, "mktextfm.exe", (const char* const*)argv); + return _spawnvp(_P_WAIT, "mktextfm.exe", (const char* const*)argv); } -- cgit v1.2.3