diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/tex4htk/ChangeLog | 3 | ||||
| -rw-r--r-- | Build/source/texk/tex4htk/t4ht.c | 20 | ||||
| -rw-r--r-- | Build/source/texk/tex4htk/tex4ht.c | 20 |
3 files changed, 16 insertions, 27 deletions
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index c8d3e830f0a..bdbb1195d44 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,6 +1,7 @@ 2012-07-25 Peter Breitenlohner <peb@mppmu.mpg.de> - * t4ht.c, tex4ht.c [WIN32]: More changes from W32TeX . + * t4ht.c, tex4ht.c [WIN32]: More changes from W32TeX. + Must not free argv. 2012-07-23 Peter Breitenlohner <peb@mppmu.mpg.de> diff --git a/Build/source/texk/tex4htk/t4ht.c b/Build/source/texk/tex4htk/t4ht.c index 90c94c791d1..a5a3286a8ce 100644 --- a/Build/source/texk/tex4htk/t4ht.c +++ b/Build/source/texk/tex4htk/t4ht.c @@ -1,5 +1,5 @@ -/* t4ht.c (2010-12-16-08:47), generated from tex4ht-t4ht.tex +/* t4ht.c (2012-07-25-19:28), generated from tex4ht-t4ht.tex Copyright (C) 2009-2012 TeX Users Group Copyright (C) 1998-2009 Eitan M. Gurari @@ -1437,7 +1437,7 @@ get_env_dir(argv[0]) - + #ifdef WIN32 /* See comments in tex4ht */ if (argc > 2) { @@ -1477,12 +1477,6 @@ 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; @@ -1490,7 +1484,7 @@ get_env_dir(argv[0]) #endif - + #ifdef SIGSEGV (void) signal(SIGSEGV,sig_err); @@ -1512,15 +1506,15 @@ SetConsoleCtrlHandler((PHANDLER_ROUTINE)sigint_handler, TRUE); (IGNORED) printf("----------------------------\n"); #ifndef KPATHSEA #ifdef PLATFORM - (IGNORED) printf("t4ht.c (2010-12-16-08:47 %s)\n",PLATFORM); + (IGNORED) printf("t4ht.c (2012-07-25-19:28 %s)\n",PLATFORM); #else - (IGNORED) printf("t4ht.c (2010-12-16-08:47)\n"); + (IGNORED) printf("t4ht.c (2012-07-25-19:28)\n"); #endif #else #ifdef PLATFORM - (IGNORED) printf("t4ht.c (2010-12-16-08:47 %s kpathsea)\n",PLATFORM); + (IGNORED) printf("t4ht.c (2012-07-25-19:28 %s kpathsea)\n",PLATFORM); #else - (IGNORED) printf("t4ht.c (2010-12-16-08:47 kpathsea)\n"); + (IGNORED) printf("t4ht.c (2012-07-25-19:28 kpathsea)\n"); #endif #endif diff --git a/Build/source/texk/tex4htk/tex4ht.c b/Build/source/texk/tex4htk/tex4ht.c index 808af8760af..e058c32eae8 100644 --- a/Build/source/texk/tex4htk/tex4ht.c +++ b/Build/source/texk/tex4htk/tex4ht.c @@ -1,5 +1,5 @@ -/* tex4ht.c (2010-12-16-08:39), generated from tex4ht-c.tex +/* tex4ht.c (2012-07-25-19:36), generated from tex4ht-c.tex Copyright (C) 2009-2012 TeX Users Group Copyright (C) 1996-2009 Eitan M. Gurari @@ -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,12 +5952,6 @@ 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; @@ -5965,7 +5959,7 @@ struct htf_com_rec* htf_font_dir = (struct htf_com_rec *) 0; #endif - + #ifdef SIGSEGV (void) signal(SIGSEGV,sig_err); @@ -5987,15 +5981,15 @@ SetConsoleCtrlHandler((PHANDLER_ROUTINE)sigint_handler, TRUE); (IGNORED) printf("----------------------------\n"); #ifndef KPATHSEA #ifdef PLATFORM - (IGNORED) printf("tex4ht.c (2010-12-16-08:39 %s)\n",PLATFORM); + (IGNORED) printf("tex4ht.c (2012-07-25-19:36 %s)\n",PLATFORM); #else - (IGNORED) printf("tex4ht.c (2010-12-16-08:39)\n"); + (IGNORED) printf("tex4ht.c (2012-07-25-19:36)\n"); #endif #else #ifdef PLATFORM - (IGNORED) printf("tex4ht.c (2010-12-16-08:39 %s kpathsea)\n",PLATFORM); + (IGNORED) printf("tex4ht.c (2012-07-25-19:36 %s kpathsea)\n",PLATFORM); #else - (IGNORED) printf("tex4ht.c (2010-12-16-08:39 kpathsea)\n"); + (IGNORED) printf("tex4ht.c (2012-07-25-19:36 kpathsea)\n"); #endif #endif for(i=0; i<argc; i++){ |