diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 15:38:50 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 15:38:50 +0000 |
| commit | dbaf849d33199c158ae1118f921f45cf1c144a08 (patch) | |
| tree | 088c30bc5fbf30fa49e44484b14c6aed56289b18 | |
| parent | 1be0010d8648ed649506b41ed2fd1ee511977dab (diff) | |
INTEGRATION: CWS ooo20040620 (1.14.66); FILE MERGED
2004/06/09 01:18:14 vq 1.14.66.2: #i28717# Let guw.pl accept "," as a path seperator. Needed for pre2par.pl
and par2script.pl.
2004/06/05 14:16:19 vq 1.14.66.1: #i28717#, #i28953# *crossmerge* Adapt guw.pl to accept multiple @ and silence
its output.
| -rwxr-xr-x | solenv/bin/guw.pl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl index d2fd0264b923..5df6a5beb53d 100755 --- a/solenv/bin/guw.pl +++ b/solenv/bin/guw.pl @@ -5,9 +5,9 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: guw.pl,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: rt $ $Date: 2004-06-16 10:34:34 $ +# last change: $Author: rt $ $Date: 2004-07-13 16:38:50 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -107,7 +107,8 @@ sub WinFormat { $variable =~ s/([;]|\A)(\w);/$1$2:/g; # get back the drives # Search for posix path ;entry; and replace with cygpath -w entry, accept quotes. - while ( $variable =~ /(?:;|\A)[\'\"]?((?:\/[\w\.\- ~]+)+)[\'\"]?(?:;|\Z)/ ) { # Normal paths + # iz28717 Accept ',' as path seperator. + while ( $variable =~ /(?:[;,]|\A)[\'\"]?((?:\/[\w\.\- ~]+)+)[\'\"]?(?:[;,]|\Z)/ ) { # Normal paths if ( defined $debug ) { print(STDERR "WinFormat:\nnormal path:\n$variable\n");}; $d1 = $1 ; chomp( $d2 = qx{cygpath -w "$d1"} ) ; |