From c6becc71ca64b8ead4c788fc0cc1d5b9f1579c57 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Wed, 10 Aug 2011 08:14:06 +0000 Subject: fmtutil returns a nonzero value if it fails to make a format git-svn-id: svn://tug.org/texlive/trunk@23478 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/win32/ChangeLog | 4 ++ Build/source/texk/kpathsea/win32/fmtutil.c | 89 +++++++++++++++--------------- 2 files changed, 48 insertions(+), 45 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/kpathsea/win32/ChangeLog b/Build/source/texk/kpathsea/win32/ChangeLog index ccd19f9b8d5..36a89fa2c84 100644 --- a/Build/source/texk/kpathsea/win32/ChangeLog +++ b/Build/source/texk/kpathsea/win32/ChangeLog @@ -1,3 +1,7 @@ +2011-08-10 Akira Kakuto + + *fmtutil.c: returns a nonzero value if it fails to make a format. + 2011-08-10 Peter Breitenlohner * getdestdir.c, mktexmf.c, mktexpk.c, mktextfm.c, mktexupd.c, diff --git a/Build/source/texk/kpathsea/win32/fmtutil.c b/Build/source/texk/kpathsea/win32/fmtutil.c index 6a9252f8110..421a77962c2 100644 --- a/Build/source/texk/kpathsea/win32/fmtutil.c +++ b/Build/source/texk/kpathsea/win32/fmtutil.c @@ -26,11 +26,6 @@ Web2C-2010 (2010/07/03 --ak) new options. #include "dirutil.h" #include "mktexupd.h" -#ifndef __MINGW32__ -#undef system -#define system win32_system -#endif - #define BLEN 512 #define SLEN 256 #define MAXFMT 128 @@ -142,38 +137,38 @@ do_initex(char *fm, char *en, char *args) strcpy(enginesubdir, en); - if(!stricmp(enginesubdir, "mf-nowin")) + if(!strcasecmp(enginesubdir, "mf-nowin")) strcpy(enginesubdir, "metafont"); - if(!stricmp(enginesubdir, "mf")) + if(!strcasecmp(enginesubdir, "mf")) strcpy(enginesubdir, "metafont"); - if(!stricmp(enginesubdir, "mpost")) + if(!strcasecmp(enginesubdir, "mpost")) strcpy(enginesubdir, "metapost"); - if(!stricmp(en, "mf-nowin")) { + if(!strcasecmp(en, "mf-nowin")) { strcpy(fmt, "--jobname="); strcpy(ext, ".base"); } - else if(!stricmp(en, "mf")) { + else if(!strcasecmp(en, "mf")) { strcpy(fmt, "--jobname="); strcpy(ext, ".base"); } - else if(!stricmp(en, "mpost")) { + else if(!strcasecmp(en, "mpost")) { strcpy(fmt, "--jobname="); strcpy(ext, ".mem"); } - else if(!stricmp(en, "pmpost")) { + else if(!strcasecmp(en, "pmpost")) { strcpy(fmt, "--jobname="); strcpy(ext, ".mem"); } - else if(!stricmp(en, "upmpost")) { + else if(!strcasecmp(en, "upmpost")) { strcpy(fmt, "--jobname="); strcpy(ext, ".mem"); } - else if(!stricmp(en, "mp641")) { + else if(!strcasecmp(en, "mp641")) { strcpy(fmt, "--jobname="); strcpy(ext, ".mem"); } - else if(!stricmp(en, "nts")) { + else if(!strcasecmp(en, "nts")) { strcpy(fmt, "--fmt="); strcpy(ext, ".nfmt"); } @@ -182,12 +177,12 @@ do_initex(char *fm, char *en, char *args) strcpy(ext, ".fmt"); } - if(!stricmp(en, "pmpost") || !stricmp(en, "mpost") - || !stricmp(en, "upmpost") || !stricmp(en, "mp641")) + if(!strcasecmp(en, "pmpost") || !strcasecmp(en, "mpost") + || !strcasecmp(en, "upmpost") || !strcasecmp(en, "mp641")) strcpy(progn2, "mpost"); - else if(!stricmp(en, "mf-nowin")) + else if(!strcasecmp(en, "mf-nowin")) strcpy(progn2, "mf"); - else if(!stricmp(en, "nts")) + else if(!strcasecmp(en, "nts")) strcpy(progn2, "tex"); else strcpy(progn2, progn); @@ -207,7 +202,7 @@ do_initex(char *fm, char *en, char *args) strcat(fullbin, en); strcat(fullbin, "\""); - if(!stricmp(en, "nts")) + if(!strcasecmp(en, "nts")) sprintf(cmd, "%s --ini --progname=%s %s