From 4a8a3a18c16d601382331b8f1ca251a05c8af744 Mon Sep 17 00:00:00 2001
From: Adam Kennedy <adamk@cpan.org>
Date: Tue, 30 Jun 2009 11:50:51 +0000
Subject: [PATCH] Fixed a bad use of Cwd::getcwd

---
 Changes                               | 3 +++
 lib/Archive/Zip.pm                    | 6 +++---
 lib/Archive/Zip/Archive.pm            | 2 +-
 lib/Archive/Zip/BufferedFileHandle.pm | 2 +-
 lib/Archive/Zip/DirectoryMember.pm    | 2 +-
 lib/Archive/Zip/FileMember.pm         | 2 +-
 lib/Archive/Zip/Member.pm             | 2 +-
 lib/Archive/Zip/MemberRead.pm         | 2 +-
 lib/Archive/Zip/MockFileHandle.pm     | 2 +-
 lib/Archive/Zip/NewFileMember.pm      | 2 +-
 lib/Archive/Zip/StringMember.pm       | 2 +-
 lib/Archive/Zip/Tree.pm               | 2 +-
 lib/Archive/Zip/ZipFileMember.pm      | 2 +-
 13 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Changes b/Changes
index ef66498..903f1db 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension Archive-Zip
 
+1.30 Tue 30 Jun 2009 - Adam Kennedy
+	- Fixed a bad use of Cwd::getcwd
+
 1.29 Mon 29 Jun 2009 - Adam Kennedy
 	- Changed _asLocalName back to rel2abs, but this time using
 	  Cwd::getcwd as the base path instead of Cwd::cwd.
diff --git a/lib/Archive/Zip.pm b/lib/Archive/Zip.pm
index e2b58e6..e4ae8d2 100644
--- a/lib/Archive/Zip.pm
+++ b/lib/Archive/Zip.pm
@@ -6,6 +6,7 @@ BEGIN {
 }
 use UNIVERSAL           ();
 use Carp                ();
+use Cwd                 ();
 use IO::File            ();
 use IO::Seekable        ();
 use Compress::Raw::Zlib ();
@@ -15,7 +16,7 @@ use FileHandle          ();
 
 use vars qw( $VERSION @ISA );
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
 
     require Exporter;
     @ISA = qw( Exporter );
@@ -547,9 +548,8 @@ sub _asLocalName
     $filename = '' unless defined($filename);
     my $localDirs = @paths ? File::Spec->catdir(@paths) : '';
     my $localName = File::Spec->catpath( $volume, $localDirs, $filename );
-    require Cwd;
     unless ( $volume ) {
-        $localName = File::Spec->rel2abs( $localName, Cwd::getcwd );
+        $localName = File::Spec->rel2abs( $localName, Cwd::getcwd() );
     }
     return $localName;
 }
diff --git a/lib/Archive/Zip/Archive.pm b/lib/Archive/Zip/Archive.pm
index 1541a69..e1f3999 100644
--- a/lib/Archive/Zip/Archive.pm
+++ b/lib/Archive/Zip/Archive.pm
@@ -13,7 +13,7 @@ use Cwd;
 use vars qw( $VERSION @ISA );
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     @ISA     = qw( Archive::Zip );
 }
 
diff --git a/lib/Archive/Zip/BufferedFileHandle.pm b/lib/Archive/Zip/BufferedFileHandle.pm
index ab14a96..b204e5a 100644
--- a/lib/Archive/Zip/BufferedFileHandle.pm
+++ b/lib/Archive/Zip/BufferedFileHandle.pm
@@ -13,7 +13,7 @@ use Carp;
 use vars qw{$VERSION};
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     $VERSION = eval $VERSION;
 }
 
diff --git a/lib/Archive/Zip/DirectoryMember.pm b/lib/Archive/Zip/DirectoryMember.pm
index a48dc99..abe4ebe 100644
--- a/lib/Archive/Zip/DirectoryMember.pm
+++ b/lib/Archive/Zip/DirectoryMember.pm
@@ -6,7 +6,7 @@ use File::Path;
 use vars qw( $VERSION @ISA );
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     @ISA     = qw( Archive::Zip::Member );
 }
 
diff --git a/lib/Archive/Zip/FileMember.pm b/lib/Archive/Zip/FileMember.pm
index 5f5aaab..fed5642 100644
--- a/lib/Archive/Zip/FileMember.pm
+++ b/lib/Archive/Zip/FileMember.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( $VERSION @ISA );
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     @ISA     = qw ( Archive::Zip::Member );
 }
 
diff --git a/lib/Archive/Zip/Member.pm b/lib/Archive/Zip/Member.pm
index ec4dc70..7db3f2b 100644
--- a/lib/Archive/Zip/Member.pm
+++ b/lib/Archive/Zip/Member.pm
@@ -6,7 +6,7 @@ use strict;
 use vars qw( $VERSION @ISA );
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     @ISA     = qw( Archive::Zip );
 }
 
diff --git a/lib/Archive/Zip/MemberRead.pm b/lib/Archive/Zip/MemberRead.pm
index 3c32baa..32bd151 100644
--- a/lib/Archive/Zip/MemberRead.pm
+++ b/lib/Archive/Zip/MemberRead.pm
@@ -40,7 +40,7 @@ use vars qw{$VERSION};
 my $nl;
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     $VERSION = eval $VERSION;
      # Requirement for newline conversion. Should check for e.g., DOS and OS/2 as well, but am too lazy.
      $nl = $^O eq 'MSWin32' ? "\r\n" : "\n";
diff --git a/lib/Archive/Zip/MockFileHandle.pm b/lib/Archive/Zip/MockFileHandle.pm
index 96f8b0a..f27e222 100644
--- a/lib/Archive/Zip/MockFileHandle.pm
+++ b/lib/Archive/Zip/MockFileHandle.pm
@@ -10,7 +10,7 @@ use strict;
 use vars qw{$VERSION};
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     $VERSION = eval $VERSION;
 }
 
diff --git a/lib/Archive/Zip/NewFileMember.pm b/lib/Archive/Zip/NewFileMember.pm
index b5a5d75..0b5487c 100644
--- a/lib/Archive/Zip/NewFileMember.pm
+++ b/lib/Archive/Zip/NewFileMember.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( $VERSION @ISA );
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     @ISA     = qw ( Archive::Zip::FileMember );
 }
 
diff --git a/lib/Archive/Zip/StringMember.pm b/lib/Archive/Zip/StringMember.pm
index 0fa2e43..9ad23d7 100644
--- a/lib/Archive/Zip/StringMember.pm
+++ b/lib/Archive/Zip/StringMember.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( $VERSION @ISA );
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     @ISA     = qw( Archive::Zip::Member );
 }
 
diff --git a/lib/Archive/Zip/Tree.pm b/lib/Archive/Zip/Tree.pm
index a9490f3..f3d4612 100644
--- a/lib/Archive/Zip/Tree.pm
+++ b/lib/Archive/Zip/Tree.pm
@@ -3,7 +3,7 @@ package Archive::Zip::Tree;
 use strict;
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.29';
+	$VERSION = '1.30';
 }
 
 use Archive::Zip;
diff --git a/lib/Archive/Zip/ZipFileMember.pm b/lib/Archive/Zip/ZipFileMember.pm
index 0d4c8ff..6bea4e2 100644
--- a/lib/Archive/Zip/ZipFileMember.pm
+++ b/lib/Archive/Zip/ZipFileMember.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw( $VERSION @ISA );
 
 BEGIN {
-    $VERSION = '1.29';
+    $VERSION = '1.30';
     @ISA     = qw ( Archive::Zip::FileMember );
 }
 
-- 
2.11.4.GIT