From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 24 Jan 2005 22:35:23 +0000 (+0000)
Subject: Use multibyte specific code for handling files and generic basename based
X-Git-Tag: RELEASE_0_2~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71695f815910d6c22202e674f7296466e61252b2;p=php

Use multibyte specific code for handling files and generic basename based
code in all other instances.
---

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 4982cf3e59..e7748a089f 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -32,6 +32,7 @@
 #include "php_globals.h"
 #include "php_variables.h"
 #include "rfc1867.h"
+#include "ext/standard/php_string.h"
 
 #define DEBUG_FILE_UPLOAD ZEND_DEBUG
 
@@ -1082,17 +1083,14 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 					s = tmp;
 				}
 				num_vars--;
-			} else {
-				s = strrchr(filename, '\\');
-				if ((tmp = strrchr(filename, '/')) > s) {
-					s = tmp;
-				}
-			}
-#else
-			s = strrchr(filename, '\\');
-			if ((tmp = strrchr(filename, '/')) > s) {
-				s = tmp;
+				goto filedone;
 			}
+#endif			
+			php_basename(filename, strlen(filename), NULL, 0, &s, NULL TSRMLS_CC);
+			efree(filename);
+			filename = s;
+#if HAVE_MBSTRING && !defined(COMPILE_DL_MBSTRING)
+filedone:			
 #endif
 			
 			if (!is_anonymous) {