archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- MFH: locateName should not change the state/error, can be used to test

Browse source 
an entry
This commit is contained in:
Pierre Joye 2006-08-13 23:43:11 +00:00
parent 8d07735332
commit 284ce40c4a
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/zip/php_zip.c
View file

@ -1153,6 +1153,7 @@ ZIPARCHIVE_METHOD(locateName)
char *name;
int name_len;
long flags = 0;
long idx = -1;
if (!this) {
RETURN_FALSE;
@ -1169,7 +1170,18 @@ ZIPARCHIVE_METHOD(locateName)
RETURN_FALSE;
}
RETURN_LONG((long)zip_name_locate(intern, (const char *)name, flags))
idx = (long)zip_name_locate(intern, (const char *)name, flags);
if (idx<0) {
/* reset the error */
if (intern->error.str) {
_zip_error_fini(&intern->error);
}
_zip_error_init(&intern->error);
RETURN_FALSE;
} else {
RETURN_LONG(idx);
}
}
/* }}} */

17
ext/zip/tests/oo_namelocate.phpt
View file

@ -31,15 +31,16 @@ if (!$zip->open($file)) {
exit('failed');
}
echo $zip->locateName('entry1.txt') . "\n";
echo $zip->locateName('eNtry2.txt') . "\n";
echo $zip->locateName('eNtry2.txt', ZIPARCHIVE::FL_NOCASE) . "\n";
echo $zip->locateName('enTRy2d.txt', ZIPARCHIVE::FL_NOCASE|ZIPARCHIVE::FL_NODIR) . "\n";
var_dump($zip->locateName('entry1.txt'));
var_dump($zip->locateName('eNtry2.txt'));
var_dump($zip->locateName('eNtry2.txt', ZIPARCHIVE::FL_NOCASE));
var_dump($zip->locateName('enTRy2d.txt', ZIPARCHIVE::FL_NOCASE|ZIPARCHIVE::FL_NODIR));
$zip->close();
?>
--EXPECTF--
0
-1
1
2
int(0)
bool(false)
int(1)
int(2)