[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar tar.c
From:       "Greg Beaver" <cellog () php ! net>
Date:       2008-08-31 20:24:04
Message-ID: cvscellog1220214244 () cvsserver
[Download RAW message or body]

cellog		Sun Aug 31 20:24:04 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar	phar.phar tar.c 
  Log:
  use TAR_FILE instead of '0' and '\0' instead of 0
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.45&r2=1.7.2.46&diff_format=u
                
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.45 php-src/ext/phar/phar.phar:1.7.2.46
--- php-src/ext/phar/phar.phar:1.7.2.45	Sun Aug 31 19:46:35 2008
+++ php-src/ext/phar/phar.phar	Sun Aug 31 20:24:04 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?>
-6
-+6
+ �� ��䂱���J���s����*,8�W��?�!~�븅�Y��B�s�.co�d! \
�`w���L�ȹB���.�[�a���s\��� gߜ�  ��b�n�N�@@ -1229,6 +1229,4 @@
 �U�N��	���_�!@��"��ڐF��O���LG3@�=DM�b�P�5��	��aY��
[�⎬m�vO��<�]��)�soS�j�Z \
�/]���v�ǽT%�:��)c��v]�Eb����ӛ*���=K�O)�)���-��]�L���7��ͨ.���z�.j�?8T��,�:��a������hg�
  ���H�#[T5$��޶L���z4ʃ��)�Lu��x�;����;TMe,��{}4b,����]@�����u8�3n�\W���藵�t�������E�����������Gx��ӟ᧾���]���~f�I|��P� \
j�7l1��P�H����iGH�5���$�/r���І~ѐ��g�z�����pu�������;�9��䂯;pU��T��\�����������}�{k��Cz��t8Ǜ6
��.�Z^ \
                �Iw�N$_��@P�ʕ���������B��
-P��3�C�-
-�;Z\ No newline at end of file
+P��3�C�\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.20&r2=1.55.2.21&diff_format=u
                
Index: php-src/ext/phar/tar.c
diff -u php-src/ext/phar/tar.c:1.55.2.20 php-src/ext/phar/tar.c:1.55.2.21
--- php-src/ext/phar/tar.c:1.55.2.20	Sun Aug 31 19:47:31 2008
+++ php-src/ext/phar/tar.c	Sun Aug 31 20:24:04 2008
@@ -369,7 +369,7 @@
 			return FAILURE;
 		}
 
-		entry.tar_type = ((old & (hdr->typeflag == 0)) ? '0' : hdr->typeflag);
+		entry.tar_type = ((old & (hdr->typeflag == '\0')) ? TAR_FILE : hdr->typeflag);
 		entry.offset = entry.offset_abs = pos; /* header_offset unused in tar */
 		entry.fp_type = PHAR_FP;
 		entry.flags = phar_tar_number(hdr->mode, sizeof(hdr->mode)) & PHAR_ENT_PERM_MASK;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]