use IS_SLASH

Author: LamentXU123

ext/mysqlnd/mysqlnd_debug.c

@@ -511,7 +511,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const
 				if (i + 1 < mode_len && mode[i+1] == ',') {
 					unsigned int j = i + 2;
 #ifdef PHP_WIN32
-					if (i+4 < mode_len && mode[i+3] == ':' && (mode[i+4] == '\\' || mode[i+4] == '/')) {
+					if (i+4 < mode_len && mode[i+3] == ':' && IS_SLASH(mode[i+4])) {
 						j = i + 5;
 					}
 #endif

ext/phar/phar_object.c

@@ -1530,7 +1530,7 @@ static int phar_build(zend_object_iterator *iter, void *puser) /* {{{ */
 
 			str_key = fname + base_len;
 
-			if (*str_key == '/' || *str_key == '\\') {
+			if (IS_SLASH(*str_key)) {
 				str_key++;
 				str_key_len--;
 			}
@@ -3565,7 +3565,7 @@ static void phar_add_file(phar_archive_data **pphar, zend_string *file_name, con
 	) {
 		size_t prefix_len = (ZSTR_VAL(file_name)[0] == '/') + sizeof(".phar")-1;
 		char next_char = ZSTR_VAL(file_name)[prefix_len];
-		if (next_char == '/' || next_char == '\\' || next_char == '\0') {
+		if (IS_SLASH(next_char) || next_char == '\0') {
 			zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Cannot create any files in magic \".phar\" directory");
 			return;
 		}

ext/standard/string.c

@@ -1342,11 +1342,10 @@ PHP_FUNCTION(str_decrement)
 static bool _is_basename_start(const char *start, const char *pos)
 {
 	if (pos - start >= 1
-	    && *(pos-1) != '/'
-	    && *(pos-1) != '\\') {
+	    && !IS_SLASH(*(pos-1))) {
 		if (pos - start == 1) {
 			return true;
-		} else if (*(pos-2) == '/' || *(pos-2) == '\\') {
+		} else if (IS_SLASH(*(pos-2))) {
 			return true;
 		} else if (*(pos-2) == ':'
 			&& _is_basename_start(start, pos - 2)) {
@@ -1369,8 +1368,7 @@ PHPAPI zend_string *php_basename(const char *s, size_t len, const char *suffix,
 		/* Strip trailing slashes */
 		while (basename_end >= s
 #ifdef PHP_WIN32
-			&& (*basename_end == '/'
-				|| *basename_end == '\\'
+			&& (IS_SLASH(*basename_end)
 				|| (*basename_end == ':'
 					&& _is_basename_start(s, basename_end)))) {
 #else
@@ -1387,8 +1385,7 @@ PHPAPI zend_string *php_basename(const char *s, size_t len, const char *suffix,
 		basename_end++;
 		while (basename_start > s
 #ifdef PHP_WIN32
-			&& *(basename_start-1) != '/'
-			&& *(basename_start-1) != '\\') {
+			&& !IS_SLASH(*(basename_start-1))) {
 
 			if (*(basename_start-1) == ':' &&
 				_is_basename_start(s, basename_start - 1)) {
@@ -1414,7 +1411,7 @@ PHPAPI zend_string *php_basename(const char *s, size_t len, const char *suffix,
 					goto quit_loop;
 				case 1:
 #ifdef PHP_WIN32
-					if (*s == '/' || *s == '\\') {
+					if (IS_SLASH(*s)) {
 #else
 					if (*s == '/') {
 #endif

sapi/cgi/cgi_main.c

@@ -1250,10 +1250,7 @@ static void init_request_info(fcgi_request *request)
 			 */
 			if (script_path_translated &&
 				(script_path_translated_len = strlen(script_path_translated)) > 0 &&
-				(script_path_translated[script_path_translated_len-1] == '/' ||
-#ifdef PHP_WIN32
-				script_path_translated[script_path_translated_len-1] == '\\' ||
-#endif
+				(IS_SLASH(script_path_translated[script_path_translated_len-1]) ||
 				(real_path = tsrm_realpath(script_path_translated, NULL)) == NULL)
 			) {
 				char *pt = estrndup(script_path_translated, script_path_translated_len);