From ce0114418fd0a18847d8250af087529027f96138 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 23 May 2011 16:34:58 -0500 Subject: [PATCH] tools: Fix LocalPath on Cygwin The LocalPath() function must not replace /cygdrive/x with x: This used to be necessary when mixing win32 and cygwin tools, but we tell users not to do that any more. This problem only appears if the path to base starts with /cygdrive/x. --- src/tools/EPICS/Path.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/tools/EPICS/Path.pm b/src/tools/EPICS/Path.pm index f67f25010..ba6ad4a9b 100644 --- a/src/tools/EPICS/Path.pm +++ b/src/tools/EPICS/Path.pm @@ -64,7 +64,6 @@ put into a file. It converts paths from the Unix form that Perl understands to any necessary external representation, and also removes automounter prefixes to put the path into its canonical form. -On cygwin we convert cygdrive paths to their equivalent Windows drive specs. Before Leopard, the Mac OS X automounter inserted a verbose prefix, and in case anyone is still using SunOS it adds its own prefix as well. @@ -72,9 +71,7 @@ anyone is still using SunOS it adds its own prefix as well. sub LocalPath { my ($newpath) = @_; - if ($^O eq 'cygwin') { - $newpath =~ s{^/cygdrive/([a-zA-Z])/}{$1:/}; - } elsif ($^O eq 'darwin') { + if ($^O eq 'darwin') { # Darwin automounter $newpath =~ s{^/private/var/auto\.}{/}; } elsif ($^O eq 'sunos') {