summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuji Tanaka <KXD02663@nifty.ne.jp>2014-01-27 14:22:17 +0000
committerTakuji Tanaka <KXD02663@nifty.ne.jp>2014-01-27 14:22:17 +0000
commite0fa7cac47b40ea2e80ce307644d3f6d0882d500 (patch)
tree40622ca75447c3dc2896654824c34f30142bacd5
parent2e5f42f2a5ab9526bb4deff35d3b18c4f45f9a39 (diff)
dvipsk, dvipdfm-x [win32]: Revise procedure of reading command line arguments
git-svn-id: svn://tug.org/texlive/trunk@32803 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog9
-rw-r--r--Build/source/texk/dvipdfm-x/dvipdfmx.c20
-rw-r--r--Build/source/texk/dvipsk/ChangeLog5
-rw-r--r--Build/source/texk/dvipsk/dvips.c19
4 files changed, 24 insertions, 29 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index ee075d313d2..867eed20c71 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-27 TANAKA Takuji <KXD02663@nifty.ne.jp>
+
+ * dvipdfmx.c: Revise procedure of reading command line arguments.
+ (Windows only)
+
2014-01-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* dpxfile.c: Fix a bug in dpx_file_apply_filter(), report from
@@ -15,9 +20,9 @@
2014-01-12 TANAKA Takuji <KXD02663@nifty.ne.jp>
- * dvipdfm.c: Add '--kpathsea-debug' option and
+ * dvipdfmx.c: Add '--kpathsea-debug' option and
fix a bug in '--dvipdfm' option.
- * dvipdfm.c, mfileio.[ch], dbxfile.c: Allow Unicode file name
+ * dvipdfmx.c, mfileio.[ch], dbxfile.c: Allow Unicode file name
on Windows.
2014-01-02 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c
index b5e0eb7ba89..85c19b4ac9e 100644
--- a/Build/source/texk/dvipdfm-x/dvipdfmx.c
+++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c
@@ -884,29 +884,18 @@ do_mps_pages (void)
}
}
-#ifdef WIN32
-int argc;
-char **argv;
-#endif
-
/* TODO: MetaPost mode */
#if defined(MIKTEX)
# define main Main
#endif
int CDECL
-#ifdef WIN32
-main (int ac, char *av[])
-#else
main (int argc, char *argv[])
-#endif
{
double dvi2pts;
char *base;
#ifdef WIN32
- char *enc;
-
- argc=ac;
- argv=av;
+ int ac;
+ char **av, *enc;
#endif
#ifdef MIKTEX
@@ -916,7 +905,10 @@ main (int argc, char *argv[])
#ifdef WIN32
texlive_gs_init ();
enc = kpse_var_value("command_line_encoding");
- get_command_line_args_utf8(enc, &argc, &argv);
+ if (get_command_line_args_utf8(enc, &ac, &av)) {
+ argc = ac;
+ argv = av;
+ }
#endif
#endif
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index b63d3c9b37c..51eccf3d3d8 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-27 TANAKA Takuji <KXD02663@nifty.ne.jp>
+
+ * dvips.c: Revise procedure of reading command line arguments.
+ (Windows only)
+
2014-01-13 TANAKA Takuji <KXD02663@nifty.ne.jp>
* dvips.c, resident.c: Allow multibyte string with 0x5c
diff --git a/Build/source/texk/dvipsk/dvips.c b/Build/source/texk/dvipsk/dvips.c
index a6dd4bb8add..a3d242abbea 100644
--- a/Build/source/texk/dvipsk/dvips.c
+++ b/Build/source/texk/dvipsk/dvips.c
@@ -576,11 +576,6 @@ queryargs(void)
qargv[qargc] = (char *)NULL;
}
-#if defined(KPATHSEA) && defined(WIN32)
-int argc;
-char **argv;
-#endif
-
/*
* Finally, our main routine.
*/
@@ -588,12 +583,8 @@ char **argv;
main(void)
#else
int
-#if defined(KPATHSEA) && defined(WIN32)
-main(int ac, char **av)
-#else
main(int argc, char **argv)
#endif
-#endif
{
int i, lastext = -1;
#ifdef MVSXA
@@ -603,9 +594,8 @@ main(int argc, char **argv)
#ifdef WIN32
#if defined(KPATHSEA)
- char *enc;
- argc=ac;
- argv=av;
+ int ac;
+ char **av, *enc;
#endif
SET_BINARY(fileno(stdin));
SET_BINARY(fileno(stdout));
@@ -622,7 +612,10 @@ main(int argc, char **argv)
kpse_set_program_enabled (kpse_pk_format, MAKE_TEX_PK_BY_DEFAULT, kpse_src_compile);
#ifdef WIN32
enc = kpse_var_value("command_line_encoding");
- get_command_line_args_utf8(enc, &argc, &argv);
+ if (get_command_line_args_utf8(enc, &ac, &av)) {
+ argc = ac;
+ argv = av;
+ }
#endif
#endif