From 42d592161673bfee386cf307916e73be258bc99c Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 16 Mar 2018 13:37:05 +0000 Subject: fix a w32 bug in texmfmp.c (w32 only) git-svn-id: svn://tug.org/texlive/trunk@46979 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/lib/texmfmp.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'Build/source/texk/web2c/lib') diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index 19b808e7149..162c3c6133e 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -807,8 +807,8 @@ maininit (int ac, string *av) *pp = '/'; } } + is_absolute = kpse_absolute_p(argv[argc-1], false); name = normalize_quotes(argv[argc-1], "argument"); - is_absolute = kpse_absolute_p(name, false); #ifdef XeTeX main_input_file = kpse_find_file(argv[argc-1], INPUT_FORMAT, false); if (!srcspecialsp) { @@ -818,7 +818,10 @@ maininit (int ac, string *av) if (!is_absolute) { strptr = strrchr (name, '/'); if (strptr) { - strptr++; + if (name[0] == '"') + *strptr = '"'; + else + strptr++; name = strptr; } } @@ -845,7 +848,10 @@ maininit (int ac, string *av) if (!is_absolute) { strptr = strrchr (name, '/'); if (strptr) { - strptr++; + if (name[0] == '"' + *strptr = '"'; + else + strptr++; name = strptr; } } @@ -1592,12 +1598,9 @@ get_input_file_name (void) pp++; } } + is_absolute = kpse_absolute_p(argv[optind], false); #endif - name = normalize_quotes(argv[optind], "argument"); -#ifdef WIN32 - is_absolute = kpse_absolute_p(name, false); -#endif #ifdef XeTeX input_file_name = kpse_find_file(argv[optind], INPUT_FORMAT, false); #ifdef WIN32 @@ -1629,7 +1632,10 @@ get_input_file_name (void) if (!is_absolute) { strptr = strrchr (name, '/'); if (strptr) { - strptr++; + if (name[0] == '"') + *strptr = '"'; + else + strptr++; name = strptr; } } -- cgit v1.2.3