From 394bd0b8d31654a3f01a179114b2b98c46f5a603 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sat, 3 Mar 2007 14:46:44 +0000 Subject: [PATCH] # This block got lost somehow --- ext/spl/spl_directory.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 6ef0bdc8a2..00da33b936 100755 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -675,6 +675,18 @@ SPL_METHOD(SplFileInfo, getBasename) } } + if (intern->path_len && intern->path_len < intern->file_name_len) { + if (intern->file_name_type == IS_UNICODE) { + fname.u = intern->file_name.u + intern->path_len + 1; + } else { + fname.s = intern->file_name.s + intern->path_len + 1; + } + flen = intern->file_name_len - (intern->path_len + 1); + } else { + fname = intern->file_name; + flen = intern->file_name_len; + } + if (intern->file_name_type == IS_UNICODE) { php_u_basename(fname.u, flen, suffix.u, slen, &fname.u, &flen TSRMLS_CC); } else { -- 2.50.1