From 82be4d21c3f55a059514588e522f1babe9ee9f19 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Wed, 31 Jan 2024 02:44:45 +0000 Subject: change #ifndef MSDOS to #if !defined(MSDOS) && !defined(_WIN32) because MSDOS is not defined in the current Windows build git-svn-id: svn://tug.org/texlive/trunk@69644 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 6 ++++++ Build/source/texk/kpathsea/tex-file.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 6a2c61c8c97..ea0f8c2febc 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2024-01-31 Akira Kakuto + + * tex-file.c (kpathsea_name_ok) [MSDOS]: change #ifndef MSDOS + to #if !defined(MSDOS) && !defined(_WIN32) because MSDOS is not + defined in the current Windows build. + 2024-01-30 Karl Berry * tex-file.c (kpathsea_name_ok) [MSDOS]: remove [unix] from cpp diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c index f5c7a5f2bc4..29bab50d7d8 100644 --- a/Build/source/texk/kpathsea/tex-file.c +++ b/Build/source/texk/kpathsea/tex-file.c @@ -1257,7 +1257,7 @@ kpathsea_name_ok (kpathsea kpse, const_string fname, const_string check_var, since TEXMFVAR is typically ~/.texliveYYYY, and we want to allow it. */ expanded_fname = kpathsea_expand (kpse, fname); -#ifndef MSDOS +#if !defined(MSDOS) && !defined(_WIN32) { /* On non-Windows ... */ /* Disallow .rhosts, .login, .ssh/, ..somefile, ..somedir/somefile, etc. But allow .tex (for base LaTeX). Also specially allow @@ -1286,9 +1286,9 @@ kpathsea_name_ok (kpathsea kpse, const_string fname, const_string check_var, qq = q + 1; } } -#else /* MSDOS */ +#else /* !MSDOS && !_WIN32 */ /* Other OSs don't have special names? */ -#endif /* MSDOS */ +#endif /* !MSDOS && !_WIN32 */ /* If setting is only r(estricted), we're done. (Not a useful setting in practice, but no reason to take it out now.) */ -- cgit v1.2.3