Expose ODBC connection string funcs in standard

This is because the code exists in main/, and are shared between
both ODBC extensions, so it doesn't make sense for it to only exist
in one or the other. There may be a better spot for it.

Author: NattyNarwhal

ext/standard/basic_functions.stub.php

@@ -1608,6 +1608,14 @@ function gettimeofday(bool $as_float = false): array|float {}
 function getrusage(int $mode = 0): array|false {}
 #endif
 
+/* odbc_utils.c */
+
+function odbc_connection_string_is_quoted(string $str): bool {}
+
+function odbc_connection_string_should_quote(string $str): bool {}
+
+function odbc_connection_string_quote(string $str): string {}
+
 /* pack.c */
 
 /** @refcount 1 */

ext/standard/basic_functions_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: bbcebdb57572133d5f442f220f1e98a1320ed0f6 */
+ * Stub hash: ad5d1c6846c5258e85bf29cbccc63e1cff391f1a */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -1747,6 +1747,16 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_getrusage, 0, 0, MAY_BE_ARRAY|MA
 ZEND_END_ARG_INFO()
 #endif
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_connection_string_is_quoted, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_odbc_connection_string_should_quote arginfo_odbc_connection_string_is_quoted
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_odbc_connection_string_quote, 0, 1, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 #define arginfo_pack arginfo_sprintf
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_unpack, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
@@ -2710,6 +2720,9 @@ ZEND_FUNCTION(gettimeofday);
 #if defined(HAVE_GETRUSAGE)
 ZEND_FUNCTION(getrusage);
 #endif
+ZEND_FUNCTION(odbc_connection_string_is_quoted);
+ZEND_FUNCTION(odbc_connection_string_should_quote);
+ZEND_FUNCTION(odbc_connection_string_quote);
 ZEND_FUNCTION(pack);
 ZEND_FUNCTION(unpack);
 ZEND_FUNCTION(password_get_info);
@@ -3354,6 +3367,9 @@ static const zend_function_entry ext_functions[] = {
 #if defined(HAVE_GETRUSAGE)
 	ZEND_FE(getrusage, arginfo_getrusage)
 #endif
+	ZEND_FE(odbc_connection_string_is_quoted, arginfo_odbc_connection_string_is_quoted)
+	ZEND_FE(odbc_connection_string_should_quote, arginfo_odbc_connection_string_should_quote)
+	ZEND_FE(odbc_connection_string_quote, arginfo_odbc_connection_string_quote)
 	ZEND_FE(pack, arginfo_pack)
 	ZEND_FE(unpack, arginfo_unpack)
 	ZEND_FE(password_get_info, arginfo_password_get_info)

ext/standard/config.m4

@@ -460,7 +460,8 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.
                             http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
                             var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
                             filters.c proc_open.c streamsfuncs.c http.c password.c \
-                            random.c net.c hrtime.c crc32_x86.c libavifinfo/avifinfo.c,,,
+                            random.c net.c hrtime.c crc32_x86.c libavifinfo/avifinfo.c \
+                            odbc_utils.c,,,
 			    -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
 PHP_ADD_BUILD_DIR($ext_builddir/libavifinfo)

ext/standard/config.w32

@@ -35,7 +35,7 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
 	url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \
 	php_fopen_wrapper.c credits.c css.c var_unserializer.c ftok.c sha1.c \
 	user_filters.c uuencode.c filters.c proc_open.c password.c \
-	streamsfuncs.c http.c flock_compat.c random.c hrtime.c", false /* never shared */,
+	streamsfuncs.c http.c flock_compat.c random.c hrtime.c odbc_utils.c", false /* never shared */,
 	'/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
 ADD_SOURCES("ext/standard/libavifinfo", "avifinfo.c", "standard");
 PHP_STANDARD = "yes";

ext/standard/odbc_utils.c

@@ -0,0 +1,67 @@
+/*
+   +----------------------------------------------------------------------+
+   | Copyright (c) The PHP Group                                          |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | https://www.php.net/license/3_01.txt                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Calvin Buckley <calvin@cmpct.info>                           |
+   +----------------------------------------------------------------------+
+*/
+
+#include "php.h"
+#include "php_odbc_utils.h"
+
+/*
+ * This contains functionality shared between odbc and PDO_ODBC, so it makes
+ * sense for this to be in standard.
+ */
+
+PHP_FUNCTION(odbc_connection_string_is_quoted)
+{
+	zend_string *str;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(str)
+	ZEND_PARSE_PARAMETERS_END();
+
+	bool is_quoted = php_odbc_connstr_is_quoted(ZSTR_VAL(str));
+//fprintf(stderr, "!%s!%d!\n", ZSTR_VAL(str), is_quoted);
+
+	RETURN_BOOL(is_quoted);
+}
+
+PHP_FUNCTION(odbc_connection_string_should_quote)
+{
+	zend_string *str;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(str)
+	ZEND_PARSE_PARAMETERS_END();
+
+	bool should_quote = php_odbc_connstr_should_quote(ZSTR_VAL(str));
+
+//fprintf(stderr, "!%s!%d!\n", ZSTR_VAL(str), should_quote);
+	RETURN_BOOL(should_quote);
+}
+
+PHP_FUNCTION(odbc_connection_string_quote)
+{
+	zend_string *str;
+
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(str)
+	ZEND_PARSE_PARAMETERS_END();
+
+	size_t new_size = php_odbc_connstr_estimate_quote_length(ZSTR_VAL(str));
+	zend_string *new_string = zend_string_alloc(new_size, 0);
+	php_odbc_connstr_quote(ZSTR_VAL(new_string), ZSTR_VAL(str), new_size);
+	/* reset length */
+	ZSTR_LEN(new_string) = strlen(ZSTR_VAL(new_string));
+	RETURN_STR(new_string);
+}