File php7-splfileobject-escape-character.patch of Package php7

Overview Repositories Revisions Requests Users Attributes Meta

File php7-splfileobject-escape-character.patch of Package php7 (Revision 8a49bf0158869c65188b47f177252cdd)

Currently displaying revision 8a49bf0158869c65188b47f177252cdd , Show latest

X-Git-Url: http://208.43.231.11:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fspl%2Fspl_directory.c;h=c08334573e2d68b2d512ee215429f99ee1bf8e2d;hp=8613c9302c6c1cdfb467de63be7e25143cc04a00;hb=6b116932b28b76c3f075921a0f2660f7bf5ac4e1;hpb=fb4a6dc0f1df106dae84c9d8f3ec53cc0da7231b

Index: php-7.0.7/ext/spl/spl_directory.c
===================================================================
--- php-7.0.7.orig/ext/spl/spl_directory.c	2018-04-19 09:00:17.729095987 +0200
+++ php-7.0.7/ext/spl/spl_directory.c	2018-04-19 09:06:23.183404508 +0200
@@ -2657,7 +2657,7 @@ SPL_METHOD(SplFileObject, fputcsv)
 /* }}} */
 
 /* {{{ proto void SplFileObject::setCsvControl([string delimiter [, string enclosure [, string escape ]]])
-   Set the delimiter and enclosure character used in fgetcsv */
+   Set the delimiter, enclosure and escape character used in fgetcsv */
 SPL_METHOD(SplFileObject, setCsvControl)
 {
 	spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis());
@@ -2700,11 +2700,11 @@ SPL_METHOD(SplFileObject, setCsvControl)
 /* }}} */
 
 /* {{{ proto array SplFileObject::getCsvControl()
-   Get the delimiter and enclosure character used in fgetcsv */
+   Get the delimiter, enclosure and escape character used in fgetcsv */
 SPL_METHOD(SplFileObject, getCsvControl)
 {
 	spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(getThis());
-	char delimiter[2], enclosure[2];
+	char delimiter[2], enclosure[2], escape[2];
 
 	array_init(return_value);
 
@@ -2712,9 +2712,12 @@ SPL_METHOD(SplFileObject, getCsvControl)
 	delimiter[1] = '\0';
 	enclosure[0] = intern->u.file.enclosure;
 	enclosure[1] = '\0';
+	escape[0] = intern->u.file.escape;
+	escape[1] = '\0';
 
 	add_next_index_string(return_value, delimiter);
 	add_next_index_string(return_value, enclosure);
+	add_next_index_string(return_value, escape);
 }
 /* }}} */

Places

File php7-splfileobject-escape-character.patch of Package php7 (Revision 8a49bf0158869c65188b47f177252cdd)

Places