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±æêÔ*,8W?°!~ýë¸ Y åBós.coîd!¨`w¡óLæÈ¹BÀí.å[aäÙs\í¹ gß× óbnáN@@ -1229,6 +1229,4 @@ ùUNøÖ [EMAIL PROTECTED]"[EMAIL PROTECTED] ¬Ë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,[EMAIL PROTECTED] íÑèµïtúÎþ®øÚ÷Eí»ú¡ÃÏàÇGxîÓá§¾óãæ]¢Õ~fI|øðP j7l1ØÛPHüéÅiGH¬5´¯$ß/rªýëÐ~Ñúgìªz²¢ÎÛ¦puùäûù;â9³ä¯;[EMAIL PROTECTED] -Pàø3C°- -;Z\ No newline at end of file +Pàø3C°\ 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