diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-25 14:31:43 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-25 14:31:43 +0000 |
commit | d964467896393d6dd54a2f89955c18e52ae5a60c (patch) | |
tree | 259fa5b48097be7ab0901c99ff2ee6137c4f8a41 /Build/source/texk/tex4htk | |
parent | 81a1ae0580404be5dcb69e1a523987c52fcc0508 (diff) |
tex4htk: More changes from W32TeX
git-svn-id: svn://tug.org/texlive/trunk@27154 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/tex4htk')
-rw-r--r-- | Build/source/texk/tex4htk/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/tex4htk/t4ht.c | 7 | ||||
-rw-r--r-- | Build/source/texk/tex4htk/tex4ht.c | 9 |
3 files changed, 15 insertions, 5 deletions
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index c8f46e9dadb..c8d3e830f0a 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,7 @@ +2012-07-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + * t4ht.c, tex4ht.c [WIN32]: More changes from W32TeX . + 2012-07-23 Peter Breitenlohner <peb@mppmu.mpg.de> * t4ht.c, tex4ht.c [WIN32]: Use binary mode for output files. diff --git a/Build/source/texk/tex4htk/t4ht.c b/Build/source/texk/tex4htk/t4ht.c index 96b74f934c4..90c94c791d1 100644 --- a/Build/source/texk/tex4htk/t4ht.c +++ b/Build/source/texk/tex4htk/t4ht.c @@ -1437,7 +1437,7 @@ get_env_dir(argv[0]) - + #ifdef WIN32 /* See comments in tex4ht */ if (argc > 2) { @@ -1477,9 +1477,12 @@ get_env_dir(argv[0]) } } +#if 0 + /* crashes here for some reason. */ for (i=0; i < argc; i++) free (argv[i]); free (argv); +#endif nargv[nargc] = NULL; argv = nargv; argc = nargc; @@ -1487,7 +1490,7 @@ get_env_dir(argv[0]) #endif - + #ifdef SIGSEGV (void) signal(SIGSEGV,sig_err); diff --git a/Build/source/texk/tex4htk/tex4ht.c b/Build/source/texk/tex4htk/tex4ht.c index 39edce416ba..808af8760af 100644 --- a/Build/source/texk/tex4htk/tex4ht.c +++ b/Build/source/texk/tex4htk/tex4ht.c @@ -4144,7 +4144,7 @@ static FILE* search_file_ext HANDLE hnd; int proceed; (IGNORED) strcpy((char *) dirname, (char *) str); - strct(dirname, "/*.*"); + strct(dirname, "/*.*"); hnd = FindFirstFile(dirname, &find_file_data); if (hnd != INVALID_HANDLE_VALUE) { @@ -5906,7 +5906,7 @@ get_env_dir(argv[0]) struct htf_com_rec* htf_font_dir = (struct htf_com_rec *) 0; - + #ifdef WIN32 /* The idea here is to split options apart at spaces: a single argument "-foo -bar" becomes the two options "-foo" and "-bar". We need to @@ -5952,9 +5952,12 @@ struct htf_com_rec* htf_font_dir = (struct htf_com_rec *) 0; } } +#if 0 + /* crashes here for some reason. */ for (i=0; i < argc; i++) free (argv[i]); free (argv); +#endif nargv[nargc] = NULL; argv = nargv; argc = nargc; @@ -5962,7 +5965,7 @@ struct htf_com_rec* htf_font_dir = (struct htf_com_rec *) 0; #endif - + #ifdef SIGSEGV (void) signal(SIGSEGV,sig_err); |