summaryrefslogtreecommitdiff
path: root/Build/source/texk/detex/detex-2.8
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-09-18 17:32:56 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-09-18 17:32:56 +0000
commit4b3819719b81f03387cf0be7f4241c37d850e7c9 (patch)
treeba3cdadf58be2419816e2f4e23e248af28bd0b15 /Build/source/texk/detex/detex-2.8
parent2ad6229bbca0c6599e33345b6359e4a5c6160bd4 (diff)
detex: Reduce W32TeX vs TL diffs
git-svn-id: svn://tug.org/texlive/trunk@27701 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/detex/detex-2.8')
-rw-r--r--Build/source/texk/detex/detex-2.8/detex.h3
-rw-r--r--Build/source/texk/detex/detex-2.8/detex.l17
2 files changed, 16 insertions, 4 deletions
diff --git a/Build/source/texk/detex/detex-2.8/detex.h b/Build/source/texk/detex/detex-2.8/detex.h
index 0b4c71d5099..ef0e65840a0 100644
--- a/Build/source/texk/detex/detex-2.8/detex.h
+++ b/Build/source/texk/detex/detex-2.8/detex.h
@@ -51,6 +51,7 @@
#define MAXINCLIST 40
+#ifndef KPATHSEA
#ifdef OS2
#define DEFAULTINPUTS ".;/emtex/texinput"
#define CHPATHSEP ';'
@@ -58,6 +59,8 @@
#define DEFAULTINPUTS ".:/usr/local/tex/inputs"
#define CHPATHSEP ':'
#endif
+#endif
+
#define MAXINPUTPATHS 10
#define DEFAULTENV "array,eqnarray,equation,figure,mathmatica,picture,table,verbatim"
diff --git a/Build/source/texk/detex/detex-2.8/detex.l b/Build/source/texk/detex/detex-2.8/detex.l
index 398dbfea632..aab1d7096ef 100644
--- a/Build/source/texk/detex/detex-2.8/detex.l
+++ b/Build/source/texk/detex/detex-2.8/detex.l
@@ -83,6 +83,11 @@ static char rcsid[] = "$Header: /p/src/local/bin/detex/RCS/detex.l,v 2.22 2007/0
#include <stdlib.h>
#endif
+#ifdef WIN32
+#include <fcntl.h>
+#include <io.h>
+#endif
+
#endif /* KPATHSEA */
#undef IGNORE
@@ -436,10 +441,10 @@ main(int cArgs, char *rgsbArgs[])
#endif
_splitpath (rgsbArgs[0], drive, dir, fname, ext);
sbProgName = strlwr(fname);
-#else
-#ifdef KPATHSEA
+#elif defined(KPATHSEA)
kpse_set_program_name (rgsbArgs[0], NULL);
-#endif
+ sbProgName = kpse_program_name;
+#else
if ((sbProgName = rindex(rgsbArgs[0], '/')) != NULL)
sbProgName++;
else
@@ -462,7 +467,7 @@ main(int cArgs, char *rgsbArgs[])
break;
case CHENVOPT:
if (++iArgs >= cArgs) {
- ErrorExit("-e option requires and argument");
+ ErrorExit("-e option requires an argument");
}
sbEnvList = rgsbArgs[iArgs];
break;
@@ -494,6 +499,10 @@ main(int cArgs, char *rgsbArgs[])
}
SetEnvIgnore(sbEnvList);
+#ifdef WIN32
+ _setmode(fileno(stdout), _O_BINARY);
+#endif
+
/* process input files */
for (; iArgs < cArgs; iArgs++) {
fSawFile++;