From: Steph Fox <sfox@php.net>
Date: Sun, 22 Jun 2008 14:46:10 +0000 (+0000)
Subject: - Revert the tar.c part of the inode calculation fix
X-Git-Tag: php-5.3.0alpha1~659
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3844ecd17e2605d9847e7b3883b2c9ec58ad644;p=php

- Revert the tar.c part of the inode calculation fix
- All tests now pass under win32, please test under *nix/osx (4 known fails at present)
---

diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index 51a4026390..8f12943122 100644
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -223,11 +223,6 @@ int phar_parse_tarfile(php_stream* fp, char *fname, int fname_len, char *alias,
 		zend_get_hash_value, NULL, (zend_bool)myphar->is_persistent);
 	zend_hash_init(&myphar->virtual_dirs, 4 + (totalsize >> 11),
 		zend_get_hash_value, NULL, (zend_bool)myphar->is_persistent);
-	myphar->fname = pestrndup(fname, fname_len, myphar->is_persistent);
-#ifdef PHP_WIN32
-	phar_unixify_path_separators(myphar->fname, fname_len);
-#endif
-	myphar->fname_len = fname_len;
 	myphar->is_tar = 1;
 	/* remember whether this entire phar was compressed with gz/bzip2 */
 	myphar->flags = compression;
@@ -549,6 +544,11 @@ bail:
 		return FAILURE;
 	}
 
+	myphar->fname = pestrndup(fname, fname_len, myphar->is_persistent);
+#ifdef PHP_WIN32
+	phar_unixify_path_separators(myphar->fname, fname_len);
+#endif
+	myphar->fname_len = fname_len;
 	myphar->fp = fp;
 	p = strrchr(myphar->fname, '/');