diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-08-11 07:22:38 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-08-11 07:22:38 +0000 |
commit | 700591ff18ff6c18204966850312f0d7053fc7d8 (patch) | |
tree | 9d0bc4fe124fd0b81f984d2f0de2444439316a91 | |
parent | 090235c58112424f104b7d3137e877f8dd39edda (diff) |
utils/xindy: Better handling of pathnames with spaces (from Joachim Schrod)
git-svn-id: svn://tug.org/texlive/trunk@38097 c570f23f-e606-0410-a88d-b1316a301751
4 files changed, 28 insertions, 18 deletions
diff --git a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog index f02ab62d6a0..498673c0575 100644 --- a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog +++ b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/ChangeLog @@ -1,16 +1,20 @@ -2014-10-30 Peter Breitenlohner <peb@mppmu.mpg.de> +2015-08-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-02-win32-paths-with-spaces: Use File::Glob::bsd_glob(). + +2015-06-30 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-02-win32-paths-with-spaces: Quotify lang_dir. -2014-10-29 Peter Breitenlohner <peb@mppmu.mpg.de> +2015-06-29 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-02-win32-paths-with-spaces: Sync with MikTeX. -2014-10-27 Peter Breitenlohner <peb@mppmu.mpg.de> +2015-06-27 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-02-win32-paths-with-spaces: Also quotify filter. -2014-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> +2015-06-24 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-02-win32-paths-with-spaces (new): Patch from Akira. See <http://tex.stackexchange.com/questions/251221/ diff --git a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces index 16ef575fc03..cd7f57b1ed0 100644 --- a/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces +++ b/Build/source/utils/xindy/xindy-2.5.1-PATCHES/patch-02-win32-paths-with-spaces @@ -1,6 +1,6 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xindy.1 xindy-2.5.1/user-commands/xindy.1 --- xindy-2.5.1.orig/user-commands/xindy.1 2014-05-29 22:26:05.000000000 +0200 -+++ xindy-2.5.1/user-commands/xindy.1 2015-06-30 08:43:32.000000000 +0200 ++++ xindy-2.5.1/user-commands/xindy.1 2015-08-11 09:02:33.000000000 +0200 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28) +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28) @@ -12,14 +12,22 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind .\" .IX Title "xindy 1" -.TH xindy 1 "2014-05-29" "Release 2.5.1" "xindy" -+.TH xindy 1 "2015-06-30" "Release 2.5.1" "xindy" ++.TH xindy 1 "2015-08-11" "Release 2.5.1" "xindy" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xindy.in xindy-2.5.1/user-commands/xindy.in --- xindy-2.5.1.orig/user-commands/xindy.in 2014-10-24 10:38:47.000000000 +0200 -+++ xindy-2.5.1/user-commands/xindy.in 2015-06-30 08:43:25.000000000 +0200 -@@ -394,7 +394,7 @@ ++++ xindy-2.5.1/user-commands/xindy.in 2015-08-11 09:01:56.000000000 +0200 +@@ -353,6 +353,7 @@ + + use Cwd; + use File::Basename; ++use File::Glob qw(:bsd_glob); + use File::Spec; + use File::Temp qw(tempfile tmpnam); + use Getopt::Long qw(:config bundling); +@@ -394,7 +395,7 @@ # FIXME: In standalone installations, modules are still placed in lib # directory. This is not conformant to FHS. @@ -28,7 +36,7 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind $modules_dir = Cwd::realpath("$cmd_dir/../../xindy/modules"); die "$cmd: Cannot locate xindy modules directory" unless -d $modules_dir; -@@ -402,8 +402,12 @@ +@@ -402,8 +403,12 @@ if ( $is_w32 ) { if ( -d "$cmd_dir/../../../bin/win32" ) { # TeX Live $cmd_dir = "$cmd_dir/../../../bin/win32"; @@ -43,7 +51,7 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind } else { die "$cmd: Cannot locate bin directory"; } -@@ -626,7 +630,11 @@ +@@ -626,7 +631,11 @@ usage(1); } my ($name, $path, $suffix) = fileparse ($ARGV[0], '\.[^\.]+'); @@ -55,7 +63,7 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind } # FIXME: xindy wants a log file. Really? -@@ -706,6 +714,7 @@ +@@ -706,6 +715,7 @@ my $output = tmpnam(); push (@temp_files, $output); $output=quotify($output); @@ -63,14 +71,12 @@ diff -ur -N -x Makefile.in -x autom4te.cache xindy-2.5.1.orig/user-commands/xind print "Running filter: $filter <$input >$output\n" if $verbose; system "$filter <$input >$output"; print "filtered xindy input file: $output\n" if $debug{script}; -@@ -764,8 +773,9 @@ - # "latin", "cp", "iso8859", "ascii", or "utf8". +@@ -765,7 +775,7 @@ @codepages = qw(latin cp iso8859 ascii utf8) unless @codepages; my @styles; -+ my $quotified_lang_dir = quotify($lang_dir); foreach my $cp ( @codepages ) { - @styles = glob("$lang_dir/$variant$cp*-lang.xdy"); -+ @styles = glob("$quotified_lang_dir/$variant$cp*-lang.xdy"); ++ @styles = bsd_glob("$lang_dir/$variant$cp*-lang.xdy"); last if @styles; } unless ( @styles ) { diff --git a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 index 983541b3e49..52ce19eea0b 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 +++ b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "xindy 1" -.TH xindy 1 "2015-06-30" "Release 2.5.1" "xindy" +.TH xindy 1 "2015-08-11" "Release 2.5.1" "xindy" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in index 91f2834da58..73e5b12e93b 100644 --- a/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in +++ b/Build/source/utils/xindy/xindy-2.5.1/user-commands/xindy.in @@ -353,6 +353,7 @@ our $VERSION = sprintf "%d.%02d", q$Revision: 1.18 $ =~ /: (\d+)\.(\d+)/ ; use Cwd; use File::Basename; +use File::Glob qw(:bsd_glob); use File::Spec; use File::Temp qw(tempfile tmpnam); use Getopt::Long qw(:config bundling); @@ -773,9 +774,8 @@ sub xindy_expression () { # "latin", "cp", "iso8859", "ascii", or "utf8". @codepages = qw(latin cp iso8859 ascii utf8) unless @codepages; my @styles; - my $quotified_lang_dir = quotify($lang_dir); foreach my $cp ( @codepages ) { - @styles = glob("$quotified_lang_dir/$variant$cp*-lang.xdy"); + @styles = bsd_glob("$lang_dir/$variant$cp*-lang.xdy"); last if @styles; } unless ( @styles ) { |