Merge pull request #21 from mojca/TL-patches

[WIP] TeX Live patches for Windows

Author: kohler

include/config.h

@@ -7,6 +7,7 @@
 #ifdef WIN32
 # ifdef __MINGW32__
 #  include <winsock2.h>
+#  include <windows.h>
 # else
 #  include <win32lib.h>
 # endif

otftotfm/automatic.cc

@@ -39,7 +39,9 @@
 #include <algorithm>
 
 #ifdef WIN32
-# define mkdir(dir, access) mkdir(dir)
+# include <io.h>
+# include <direct.h>
+# define mkdir(dir, access) _mkdir(dir)
 # define COPY_CMD "copy"
 # define CMD_SEP "&"
 #else
@@ -124,7 +126,16 @@ look_for_writable_texdir(const char *path_variable, bool create)
 static void
 find_writable_texdir(ErrorHandler *errh, const char *)
 {
-    look_for_writable_texdir("$TEXMFVAR", true);
+    // Check if TEXMFVAR is writable.
+    // Some distributions like W32TeX do not have TEXMFVAR defined,
+    // in which case we check TEXMFLOCAL.
+    char *p = kpsei_var_value("TEXMFVAR");
+    if (p == NULL)
+        look_for_writable_texdir("$TEXMFLOCAL", true);
+    else {
+        free (p);
+        look_for_writable_texdir("$TEXMFVAR", true);
+    }
     if (!writable_texdir)
         look_for_writable_texdir("$VARTEXMF", false);
     if (!writable_texdir)
@@ -313,7 +324,7 @@ update_odir(int o, String file, ErrorHandler *errh)
     String ls_r = writable_texdir + "ls-R";
     bool success = false;
     if (access(ls_r.c_str(), R_OK) >= 0) // make sure it already exists
-        if (FILE *f = fopen(ls_r.c_str(), "a")) {
+        if (FILE *f = fopen(ls_r.c_str(), "ab")) {
             fprintf(f, "./%s:\n%s\n", directory.c_str(), file.c_str());
             success = true;
             fclose(f);
@@ -323,7 +334,11 @@ update_odir(int o, String file, ErrorHandler *errh)
     if (!success && writable_texdir.find_left('\'') < 0 && directory.find_left('\'') < 0 && file.find_left('\'') < 0) {
         // look for mktexupd script
         if (!mktexupd_tried) {
+#ifdef _WIN32
+            mktexupd = "mktexupd.exe";
+#else
             mktexupd = kpsei_string(kpsei_find_file("mktexupd", KPSEI_FMT_WEB2C));
+#endif
             mktexupd_tried = true;
         }
 
@@ -677,7 +692,7 @@ update_autofont_map(const String &fontname, String mapline, ErrorHandler *errh)
 #endif
             {
                 fclose(f);
-                f = fopen(map_file.c_str(), "w");
+                f = fopen(map_file.c_str(), "wb");
                 fd = fileno(f);
             }
 

otftotfm/kpseinterface.c

@@ -21,6 +21,7 @@
 #include <kpathsea/expand.h>
 #include <kpathsea/c-pathch.h>
 #include <kpathsea/tex-file.h>
+#include <kpathsea/variable.h>
 #include "kpseinterface.h"
 
 int kpsei_env_sep_char = ENV_SEP;
@@ -49,6 +50,12 @@ kpsei_path_expand(const char* path)
     return kpse_path_expand(path);
 }
 
+char*
+kpsei_var_value(const char *name)
+{
+    return kpse_var_value(name);
+}
+
 char*
 kpsei_find_file(const char* name, int format)
 {

otftotfm/kpseinterface.h

@@ -7,6 +7,7 @@ extern "C" {
 void kpsei_init(const char* argv0, const char* progname);
 extern int kpsei_env_sep_char;
 char* kpsei_path_expand(const char* path); /* free() result */
+char* kpsei_var_value(const char *name);
 enum { KPSEI_FMT_WEB2C, KPSEI_FMT_ENCODING, KPSEI_FMT_TYPE1,
        KPSEI_FMT_OTHER_TEXT, KPSEI_FMT_MAP, KPSEI_FMT_TRUETYPE,
        KPSEI_FMT_OPENTYPE, KPSEI_FMT_TYPE42 };

otftotfm/otftotfm.cc

@@ -16,6 +16,7 @@
 #endif
 #ifdef WIN32
 # define _USE_MATH_DEFINES
+# include <io.h>
 #endif
 #include <efont/psres.hh>
 #include <efont/t1rw.hh>
@@ -590,7 +591,7 @@ output_pl(Metrics &metrics, const String &ps_name, int boundary_char,
 
     if (verbose)
         errh->message("creating %s", filename.c_str());
-    FILE *f = fopen(filename.c_str(), "w");
+    FILE *f = fopen(filename.c_str(), "wb");
     if (!f) {
         errh->error("%s: %s", filename.c_str(), strerror(errno));
         return;
@@ -1048,7 +1049,7 @@ write_encoding_file(String &filename, const String &encoding_name,
 #endif
     {
         fclose(f);
-        f = fopen(filename.c_str(), "w");
+        f = fopen(filename.c_str(), "wb");
         fd = fileno(f);
     }
 

t1dotlessj/t1dotlessj.cc

@@ -410,10 +410,10 @@ particular purpose.\n");
     // write it to output
     if (!outputf)
 	outputf = stdout;
-    if (binary) {
 #if defined(_MSDOS) || defined(_WIN32)
-	_setmode(_fileno(outputf), _O_BINARY);
+    _setmode(_fileno(outputf), _O_BINARY);
 #endif
+    if (binary) {
 	Type1PFBWriter w(outputf);
 	dotless_font->write(w);
     } else {

t1rawafm/t1rawafm.cc

@@ -359,6 +359,9 @@ particular purpose.\n");
         if (!outf)
             errh->fatal("%s: %s", output_file, strerror(errno));
     }
+#if defined(_MSDOS) || defined(_WIN32)
+    _setmode(_fileno(outf), _O_BINARY);
+#endif
 
     write_afm(outf, font);
 

t1reencode/t1reencode.cc

@@ -1094,10 +1094,10 @@ particular purpose.\n");
 	if (!outf)
 	    errh->fatal("%s: %s", output_file, strerror(errno));
     }
-    if (binary) {
 #if defined(_MSDOS) || defined(_WIN32)
-	_setmode(_fileno(outf), _O_BINARY);
+    _setmode(_fileno(outf), _O_BINARY);
 #endif
+    if (binary) {
 	Type1PFBWriter w(outf);
 	font->write(w);
     } else {

t1testpage/t1testpage.cc

@@ -665,6 +665,9 @@ particular purpose.\n");
 	if (!outf)
 	    errh->fatal("%s: %s", output_file, strerror(errno));
     }
+#if defined(_MSDOS) || defined(_WIN32)
+    _setmode(_fileno(outf), _O_BINARY);
+#endif
 
     //font->undo_synthetic();