merge minor optimization removing strlen from pecl/phar

diff --git a/ext/phar/phar.phar b/ext/phar/phar.phar
index 56469b35ba8c6d30592f26ffbc4c5b047cab61f1..ab748ede1ae40e736b479aca2aeb13769beaf349 100755 (executable)
--- a/ext/phar/phar.phar
+++ b/ext/phar/phar.phar
@@ -1171,8 +1171,8 @@ spl_autoload_register('command_autoload');
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?>\r
-6\ 1\0\0\ 6\0\0\0\11\0\0\0\ 1\0\v\0\0\0pharcommand\0\0\0\0\ e\0\0\0clicommand.incü!\0\0¥:ºH%
-\0\0Ç\15\9aí¶\11\0\0\0\0\0\0\1a\0\0\0directorygraphiterator.incò\ 2\0\0¥:ºHu\ 1\0\0.X\aM¶\11\0\0\0\0\0\0\19\0\0\0directorytreeiterator.inc\1d\ 5\0\0¥:ºHX\ 2\0\0\ 2e#Q¶\11\0\0\0\0\0\0\19\0\0\0invertedregexiterator.incÕ\ 1\0\0¥:ºHÕ\0\0\0j©\1dQ¶\11\0\0\0\0\0\0\ f\0\0\0pharcommand.inc4\9a\0\0¥:ºH\e#\0\0\85¿Z^¶\11\0\0\0\0\0\0\b\0\0\0phar.inc\16\ 3\0\0¥:ºH+\ 1\0\0CbcD¶\11\0\0\0\0\0\0µ\1aksÚHò3ü\8a1Å­¤\18°±·j÷L`/\97»­Úªd/åd?\11\8a\92Å\bt\11\127#a»²þï×ÝóÐ\b     ìÍí¥Ê fzú=ýR^ÿ´ÛìºÝ\8bW¯Øßâ$å,J\93(ßnÃl5J²¨Ë`=ÉÖ"/wìÃ&\14´p'\12\1e\ 3d(%{ûî\97·
+6\ 1\0\0\ 6\0\0\0\11\0\0\0\ 1\0\v\0\0\0pharcommand\0\0\0\0\ e\0\0\0clicommand.incü!\0\0õ;ºH%
+\0\0Ç\15\9aí¶\11\0\0\0\0\0\0\1a\0\0\0directorygraphiterator.incò\ 2\0\0õ;ºHu\ 1\0\0.X\aM¶\11\0\0\0\0\0\0\19\0\0\0directorytreeiterator.inc\1d\ 5\0\0õ;ºHX\ 2\0\0\ 2e#Q¶\11\0\0\0\0\0\0\19\0\0\0invertedregexiterator.incÕ\ 1\0\0õ;ºHÕ\0\0\0j©\1dQ¶\11\0\0\0\0\0\0\ f\0\0\0pharcommand.inc4\9a\0\0õ;ºH\e#\0\0\85¿Z^¶\11\0\0\0\0\0\0\b\0\0\0phar.inc\16\ 3\0\0õ;ºH+\ 1\0\0CbcD¶\11\0\0\0\0\0\0µ\1aksÚHò3ü\8a1Å­¤\18°±·j÷L`/\97»­Úªd/åd?\11\8a\92Å\bt\11\127#a»²þï×ÝóÐ\b     ìÍí¥Ê fzú=ýR^ÿ´ÛìºÝ\8bW¯Øßâ$å,J\93(ßnÃl5J²¨Ë`=ÉÖ"/wìÃ&\14´p'\12\1e\ 3d(%{ûî\97·
 \9e¶Â²Øä\82±÷¡\88JÉþ\9es±æêÔ*,8\83\7fW\97\97?°!~ý\bë¸\85\88Y\85åBós\84.coîd!¨`w¡\ 4\8eóLæȹBÀ\92í.å[\9e\15a\91äÙs\í¹\90\0ÆÆ£K"\1d\1aÜ\rñ¾v;;\91\17<*ø\8aõC±\8e&\87+ûúJ´]I6e¡\10á£\1f4 \8fî\15\8f»Ú^·\13\97Y\84Ò°å\12Å-D\19\15>ñ0P`\8a|Ðí\0\97\9d~±Iäp\86Û\80Æ°ê,ïõòÞYÖÌJ\9eÆ77k^h±¥Oû\81\ 3©Ù³\90oÄú\13,Y@\80Lb¦Øc¯ÙUÀ\90©\8e\82çBäÂïý\9a[{­\93=Ï\ 6,Úðè\vë\7fE¶æ\97\8b'¶áéîsÖ#ÊO\8c§\92#Ö³DJ^ø\ eÓs\92d>^,æ\9e(3o\11´\11ü-û\92å÷\99¥êiJãÅ\93÷"â
 gß\9c×
 \84ó\ 4b\84náN\9f\0îà@Å]e\rTf\14¦é²\94\,ÑÔ¾2=\81\fØil\13B\96\0\8e±zÜ\ 2\ fpu`!\ e\81oZ¼ßàÝöÏÏ\ 1ðµò\bÍ\865Õ~ÞO\16 ;\9bN\997ôÌ6í\83Ã¥<«À\ 2\ 4ºbß}Çjò¢,ó
@@ -1229,4 +1229,4 @@ t
 \13ùU\99NøÖ        þ­î\ 5_ê!@Îå°"¦ÚÚ\90FóõOÿ¨ÊLG\1d3@§=DM¡b\a\8dP½5ùâ       ¬Ë\ 3aY\9aº\ 1[Ãâ\8e¬mòv\rO\8fë<ý]¸¹)\17×soS\e\85jßZæ/]ûô\82Þv¿Ç½T%æ:ýÚ)c\81\rÚv]¶Ebô«\8cÐÓ\9b*\80Çê=KÕO)ò\8f)\91\ 2\16\b\12«\1dË-Ô\7f\8d]µLí\8b\15·¡7µ¾Í¨.î\7f\v\9f\9azÿ.jß?8Tù®,\98:\a«Äa\8d\16·éï¤Á»hg\95
 ±\17µÉH¨#[T5$ÜßÞ¶\ 2LÐâ\18¯z4Ê\83\e¼\vè)ÿLu\1dÒñxï;\17ñ©Æø³\16;T\aMe,¯¿{}\124b,­°\84í]@¿úÁ\ f\ fëÀu8\ 6á3nã\ 2\WÊ\fíÑè\97µïtúÎþ®\1e\18øÚ÷Eí»ú¡\1eÃÏà\9b\9f\82ÇGx\89îÓ\9f\1e᧾óãæ]\8e¢Õ~f\96I|øðP\9b\0|·s\14\15ºH@N*E¯èWÐzø\ f\1f\vn\ 4SVµ:C§^©_\ f^\93B¯"\8djÀïp \1ft?Õ\ f\0y\91`\8a»\ 5\vr©BÓÐõ\8aÿ+Æc\8dBÅ\12\97^\18\97\83­\96RM°ê°:+©Äí\84O*\80ÄY\7fxm66:´\0¿7\152r¿\83ÌRºl@>kÂ1ÊU\90³_4     \8f\85;%\9e\ 6Xçð¡Ñ\80¸ï%\eù\88\8d\90lüìA­Á\18µ\ f\10Ôß\ eE\81\19c\91\81Õ,§½à³á_f\9f}\86ÇAyÞ\9eÀôð,\7f.ö÷öúbW¿9 ï6n=};³8\1dQ\89\9c°t\9f3¿\88­µiÅsjºhp\1d\8b¾¬1j®ëC¨Íâ°5;ÿûæ\ 5¢¯oñ\9dS}oä¿\96²À\1d\1coÛÜ\90ß°v¨\8f\83\ 3\ eZzkÅ\ 6X\96c­½¬By´  ¨w®æÑxN\17â@\97Z\ 3a\83ExÝÓc& ¼À/®°vÄÅDò\9b¡\b\ eè'\15ùj4\19\96½@ $ÄxäWì\b·?¼\9a\ f1©\eú\ eoãß]ò¯\99û]¼\1f4Àïìå)Bº9ztw+Ç\1f.£<M\16:£\8b/Ê4\8d\85Bw\v\17®É\91\9a\17çã\88Ï\8fS\b7qåÚ\99Ñð欫æÿP\9e\\8d|PWxÌ\17\ f\ 37\7f\ eϪïÕ\8crÎ\8a\9d~{ª9N翲yfÐóQ0Ä@\aì5§ù\9a\86í7ò2¯ &\87\7fýÛðÑp\7f_l«\93fTì}òßo\9d&\86Î'v/\8aBжÁkÐ4ôCkx\10ÙÆt|úÂÁÄ\16>Ì¢\1f\Rñù\ e\9eÒ\9f8\87¨
 j\847l1ØÛ\15P\9aH\86üéÅiGH¬5´¯\92$\10ß/\er\13ªýëÐ\86~Ñ\90\9b\14úgìªz²¢ÎÛ\7f¦\11pu\80\8a\8dùäûù;â9³\99\ 5ä\82¯;pUµ\96\1aT°\17¬\ÍÏàé\16¨«éóÀ¨Ð\v}º{këáCz·\16«\1dt8Ç\9b6\ 1¬ò\93.ÑZ^Âø\ 2Iw®N\ 2$_ÿ¸@P\85Ê\95¡\7fðÙÎö¯ØïÇB\88Ï
-Pàø3\81C°\0\ 3쬡Í?ÞS\1f\9e\1cÝû\1f\8d\92AO\83@\10\85Ïì¯\98£6±T/\9aØXk/zhÒØ\1f`¦0ÀÆe!³»¨!þw\aª©mH[.dÞ÷æí[ÂtV\17µRñh¤`\ 4\8f\996\ 4u\81<Ö6é\15ms®B\r+\11{aÃ\9a2H\f:·\131ø¢b\80%r\12\1c<UÄ9mQ\8a\9e@\9e\9bÉä\16®º×\9dè\1dê¶aQ\95%ÚTæXÅ1´mû/\eèÓ\93Mex^½Í9)tC\7f]{Þ[»éXWØzuY\e*Ézôº²§j7ÄNlp=\9eôÝ\8e\97Ú\85;x¥$ÈnC/\9e\18}ŪUQ\16lÒ\1d\v9ùµÎ-úÀtq©"a\11\93L\1624\8eîUô­öýs£Ñ\9dãeúÐ6ýuî\91\ 6\8dNÏ\89\90ê,·\18Êx§¯!ÙÊç\18Ò\vt\8bB\9bTâμç\81ý0mI\1eågÂ!,Û'ðÚ\87Í\10r\aHàìá\a©;Ãe¸È\ 1Ê6¹\87´£4Z+ñ\16pÞ\ 2\0\0\0GBMB
\ No newline at end of file
+Pàø3\81C°\0\ 3쬡Í?ÞS\1f\9e\1cÝû\1f\8d\92AO\83@\10\85Ïì¯\98£6±T/\9aØXk/zhÒØ\1f`¦0ÀÆe!³»¨!þw\aª©mH[.dÞ÷æí[ÂtV\17µRñh¤`\ 4\8f\996\ 4u\81<Ö6é\15ms®B\r+\11{aÃ\9a2H\f:·\131ø¢b\80%r\12\1c<UÄ9mQ\8a\9e@\9e\9bÉä\16®º×\9dè\1dê¶aQ\95%ÚTæXÅ1´mû/\eèÓ\93Mex^½Í9)tC\7f]{Þ[»éXWØzuY\e*Ézôº²§j7ÄNlp=\9eôÝ\8e\97Ú\85;x¥$ÈnC/\9e\18}ŪUQ\16lÒ\1d\v9ùµÎ-úÀtq©"a\11\93L\1624\8eîUô­öýs£Ñ\9dãeúÐ6ýuî\91\ 6\8dNÏ\89\90ê,·\18Êx§¯!ÙÊç\18Ò\vt\8bB\9bTâμç\81ý0mI\1eågÂ!,Û'ðÚ\87Í\10r\aHàìá\a¤¥\87\98T\90a\92`.»¤å$Ñ\7f,\92®<\ 2\0\0\0GBMB
\ No newline at end of file

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 4a0f729ea525515b903ef9a1c9ac883749c6b0ec..4cd8c013ddfbe6d10d374cb3d49069b8ba5a75f2 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1984,6 +1984,7 @@ static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool c
        char *error;
        const char *pcr_error;
        int ext_len = ext ? strlen(ext) : 0;
+       int oldname_len;
        phar_archive_data **pphar = NULL;
 
        if (!ext) {
@@ -2049,12 +2050,13 @@ static zval *phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool c
        oldpath = estrndup(phar->fname, phar->fname_len);
        oldname = zend_memrchr(phar->fname, '/', phar->fname_len);
        ++oldname;
+       oldname_len = strlen(oldname);
 
-       basename = estrndup(oldname, strlen(oldname));
+       basename = estrndup(oldname, oldname_len);
        spprintf(&newname, 0, "%s.%s", strtok(basename, "."), ext);
        efree(basename);
 
-       basepath = estrndup(oldpath, strlen(oldpath) - strlen(oldname));
+       basepath = estrndup(oldpath, (strlen(oldpath) - oldname_len));
        phar->fname_len = spprintf(&newpath, 0, "%s%s", basepath, newname);
        phar->fname = newpath;
        phar->ext = newpath + phar->fname_len - strlen(ext) - 1;