Increment version

git-svn-id: https://svn.php.net/repository/pecl/expect/trunk@337808 c90b9560-bf6c-de11-be94-00142212c4b1

config.m4

@@ -5,6 +5,9 @@ dnl
 PHP_ARG_WITH(expect,for expect support, 
 [  --with-expect[=DIR]        Include expect support (requires libexpect >= 5.43.0).])
 
+PHP_ARG_WITH(tcldir,specify path to Tcl needed by expect, 
+[  --with-tcldir[=DIR]        Specify path to Tcl config script (tclConfig.sh).])
+
 if test "$PHP_EXPECT" != "no"; then
 
   for i in $PHP_EXPECT/include/expect.h $PHP_EXPECT/include/*/expect.h \
@@ -18,9 +21,21 @@ if test "$PHP_EXPECT" != "no"; then
     fi
   done
 
+  for i in $PHP_TCLDIR/tclConfig.sh /usr/lib/tcl*/tclConfig.sh \
+        /usr/local/lib/tcl*/tclConfig.sh \
+	/System/Library/Frameworks/Tcl.framework/Versions/Current/tclConfig.sh;
+  do
+    if test -f $i; then
+      . $i
+      break
+    fi
+  done
+
+  PHP_ADD_LIBRARY_WITH_PATH(tcl$TCL_VERSION, $TCL_PREFIX/lib, EXPECT_SHARED_LIBADD)
   PHP_ADD_LIBRARY_WITH_PATH(expect, $LIBEXPECT_DIR/lib, EXPECT_SHARED_LIBADD)
   PHP_ADD_INCLUDE($LIBEXPECT_INCLUDE_DIR)
 
   PHP_NEW_EXTENSION(expect, expect.c expect_fopen_wrapper.c, $ext_shared)
   PHP_SUBST(EXPECT_SHARED_LIBADD)
 fi
+

expect.c

@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Michael Spector <michael@zend.com>                           |
+  | Author: Michael Spector <michael@php.net>                            |
   +----------------------------------------------------------------------+
 */
 
@@ -87,7 +87,9 @@ static PHP_INI_MH(OnSetExpectTimeout)
 {
 	if (new_value) {
 		exp_timeout = atoi(new_value);
+		return SUCCESS;
 	}
+	return FAILURE;
 }
 /* }}} */
 
@@ -97,7 +99,9 @@ static PHP_INI_MH(OnSetExpectMatchMax)
 {
 	if (new_value) {
 		exp_match_max = atoi(new_value);
+		return SUCCESS;
 	}
+	return FAILURE;
 }
 /* }}} */
 
@@ -107,12 +111,17 @@ static PHP_INI_MH(OnSetExpectMatchMax)
 static PHP_INI_MH(OnSetExpectLogUser)
 {
 	if (new_value) {
-		if (strncasecmp("on", new_value, sizeof("on"))) {
-			exp_loguser = atoi(new_value);
-		} else {
+		if (strncasecmp("on", new_value, sizeof("on")) == 0
+			|| strncasecmp("true", new_value, sizeof("true")) == 0
+			|| strncasecmp("yes", new_value, sizeof("yes")) == 0
+			|| strncasecmp("1", new_value, sizeof("1")) == 0) {
 			exp_loguser = 1;
+		} else {
+			exp_loguser = 0;
 		}
+		return SUCCESS;
 	}
+	return FAILURE;
 }
 /* }}} */
 
@@ -167,6 +176,18 @@ PHP_MINIT_FUNCTION(expect)
 	REGISTER_LONG_CONSTANT("EXP_FULLBUFFER", EXP_FULLBUFFER, CONST_CS | CONST_PERSISTENT);
 
 	REGISTER_INI_ENTRIES();
+
+	Tcl_Interp *interp = Tcl_CreateInterp();
+	if (Tcl_Init(interp) == TCL_ERROR) {
+		php_error_docref (NULL TSRMLS_CC, E_ERROR, 
+			"Unable to initialize TCL interpreter: %s", Tcl_GetStringResult (interp));
+		return FAILURE;
+	}
+	if (Expect_Init(interp) == TCL_ERROR) {
+		php_error_docref (NULL TSRMLS_CC, E_ERROR,
+			"Unable to initialize Expect: %s", Tcl_GetStringResult (interp));
+		return FAILURE;
+	}
 	
 	return SUCCESS;
 }
@@ -239,7 +260,7 @@ PHP_FUNCTION(expect_popen)
  */
 PHP_FUNCTION(expect_expectl)
 {
-	struct exp_case *ecases, *ec, matchedcase;
+	struct exp_case *ecases, *ecases_ptr, matchedcase;
 	zval *z_stream, *z_cases, *z_match=NULL, **z_case, **z_value;
 	php_stream *stream;
 	int fd, argc;
@@ -264,8 +285,8 @@ PHP_FUNCTION(expect_expectl)
 
 	argc = zend_hash_num_elements (Z_ARRVAL_P(z_cases));
 	ecases = (struct exp_case*) safe_emalloc (argc + 1, sizeof(struct exp_case), 0);
+	ecases_ptr = ecases;
 
-	ec = ecases;
 	zend_hash_internal_pointer_reset (Z_ARRVAL_P(z_cases));
 
 	while (zend_hash_get_current_data (Z_ARRVAL_P(z_cases), (void **)&z_case) == SUCCESS)
@@ -279,8 +300,8 @@ PHP_FUNCTION(expect_expectl)
 			return;
 		}
 
-		ec->re = NULL;
-		ec->type = exp_glob;
+		ecases_ptr->re = NULL;
+		ecases_ptr->type = exp_glob;
 
 		/* Gather pattern */
 		if (zend_hash_index_find(Z_ARRVAL_PP(z_case), 0, (void **)&z_pattern) != SUCCESS) {
@@ -293,7 +314,7 @@ PHP_FUNCTION(expect_expectl)
 			php_error_docref (NULL TSRMLS_CC, E_ERROR, "pattern must be of string type");
 			return;
 		}
-		ec->pattern = Z_STRVAL_PP(z_pattern);
+		ecases_ptr->pattern = Z_STRVAL_PP(z_pattern);
 
 		/* Gather value */
 		if (zend_hash_index_find(Z_ARRVAL_PP(z_case), 1, (void **)&z_value) != SUCCESS) {
@@ -301,7 +322,7 @@ PHP_FUNCTION(expect_expectl)
 			php_error_docref (NULL TSRMLS_CC, E_ERROR, "missing parameter for value at index: 1");
 			return;
 		}
-		ec->value = key;
+		ecases_ptr->value = key;
 
 		/* Gather expression type (optional, default: EXPECT_GLOB) */
 		if (zend_hash_index_find(Z_ARRVAL_PP(z_case), 2, (void **)&z_exp_type) == SUCCESS) {
@@ -315,54 +336,71 @@ PHP_FUNCTION(expect_expectl)
 				php_error_docref (NULL TSRMLS_CC, E_ERROR, "expression type must be either EXPECT_GLOB, EXPECT_EXACT or EXPECT_REGEXP");
 				return;
 			}
-			ec->type = Z_LVAL_PP(z_exp_type);
+			ecases_ptr->type = Z_LVAL_PP(z_exp_type);
 		}
 
-		ec++;
+		ecases_ptr++;
 		zend_hash_move_forward(Z_ARRVAL_P(z_cases));
 	}
-	ec->type = exp_end;
+	ecases_ptr->pattern = NULL;
+	ecases_ptr->re = NULL;
+	ecases_ptr->value = 0;
+	ecases_ptr->type = exp_end;
 
-	key = exp_expectv (fd, ecases);
+	int exp_retval = exp_expectv (fd, ecases);
+	int case_found = 0;
+	if (exp_retval >= 0) {
+		key = exp_retval;
 
-	int exp_match_len = exp_match_end - exp_match;
-	if (z_match && exp_match && exp_match_len > 0) {
-		char *tmp = (char *)emalloc (sizeof(char) * (exp_match_len + 1));
-		strlcpy (tmp, exp_match, exp_match_len + 1);
-		zval_dtor (z_match);
-		array_init(z_match);
-		add_index_string(z_match, 0, tmp, 1);
-		/* Get case that was matched */
-		matchedcase = ecases[key];
-		/* If there are subpattern matches ... */
-		if (matchedcase.re->startp != NULL) {
-			int i;
-			/* iterate across all possible 9 subpatterns (a limitation of libexpect)
-			   and add matching substring to matches array */
-			for (i = 1; i <= 9; i++) {
-				if (matchedcase.re->startp[i] != NULL) {
-					int sub_match_len = matchedcase.re->endp[i] - matchedcase.re->startp[i];
-					char *sub_match = (char *)emalloc (sizeof(char) * (sub_match_len + 1));
-					strlcpy (sub_match, matchedcase.re->startp[i], sub_match_len + 1);
-					add_next_index_string(z_match, sub_match, 1);
-					efree (sub_match);
+		int exp_match_len = exp_match_end - exp_match;
+		if (z_match && exp_match && exp_match_len > 0) {
+			char *tmp = (char *)emalloc (sizeof(char) * (exp_match_len + 1));
+			strlcpy (tmp, exp_match, exp_match_len + 1);
+			zval_dtor (z_match);
+			array_init(z_match);
+			add_index_string(z_match, 0, tmp, 1);
+			/* Get case that was matched */
+			matchedcase = ecases[key];
+			/* If there are subpattern matches ... */
+			if (matchedcase.re != NULL && matchedcase.re->startp != NULL) {
+				int i;
+				/* iterate across all possible 9 subpatterns (a limitation of libexpect)
+				   and add matching substring to matches array */
+				for (i = 1; i <= 9; i++) {
+					if (matchedcase.re->startp[i] != NULL) {
+						int sub_match_len = matchedcase.re->endp[i] - matchedcase.re->startp[i];
+						char *sub_match = (char *)emalloc (sizeof(char) * (sub_match_len + 1));
+						strlcpy (sub_match, matchedcase.re->startp[i], sub_match_len + 1);
+						add_next_index_string(z_match, sub_match, 1);
+						efree (sub_match);
+					}
 				}
 			}
+			efree (tmp);
 		}
-		efree (tmp);
-	}
 
-	if (zend_hash_index_find (Z_ARRVAL_P(z_cases), key, (void **)&z_case) == SUCCESS) {
-		if (zend_hash_index_find(Z_ARRVAL_PP(z_case), 1, (void **)&z_value) == SUCCESS) {
-			*return_value = **z_value;
-			zval_copy_ctor (return_value);
+		if (zend_hash_index_find (Z_ARRVAL_P(z_cases), key, (void **)&z_case) == SUCCESS) {
+			if (zend_hash_index_find(Z_ARRVAL_PP(z_case), 1, (void **)&z_value) == SUCCESS) {
+				*return_value = **z_value;
+				zval_copy_ctor (return_value);
+				case_found = 1;
+			}
 		}
 	}
-	else {
-		RETURN_LONG (key);
-	}
 
+	// Free compiled patterns:
+	ecases_ptr = ecases;
+	while (ecases_ptr != NULL && ecases_ptr->type != exp_end) {
+		if (ecases_ptr->re != NULL) {
+			free(ecases_ptr->re);
+		}
+		ecases_ptr++;
+	}
 	efree (ecases);
+
+	if (!case_found) {
+		RETURN_LONG(exp_retval);
+	}
 }
 /* }}} */
 

expect_fopen_wrapper.c

@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Michael Spector <michael@zend.com>                           |
+  | Author: Michael Spector <michael@php.net>                            |
   +----------------------------------------------------------------------+
 */
 

package.xml

@@ -14,19 +14,19 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>michael@php.net</email>
   <active>yes</active>
  </lead>
- <date>2011-01-25</date>
- <time>23:07:00</time>
+ <date>2015-09-11</date>
+ <time>15:25:00</time>
  <version>
-  <release>0.2.9</release>
-  <api>0.2.9</api>
+  <release>0.3.2</release>
+  <api>0.3.2</api>
  </version>
  <stability>
-  <release>beta</release>
-  <api>beta</api>
+  <release>stable</release>
+  <api>stable</api>
  </stability>
  <license uri="http://www.php.net/license">PHP License</license>
  <notes>
-Provide a default value for expect.match_max (Bug #21823)
+  Fixed #70458
  </notes>
  <contents>
   <dir name="/">

php_expect.h

@@ -12,7 +12,7 @@
   | obtain it through the world-wide-web, please send a note to          |
   | license@php.net so we can mail you a copy immediately.               |
   +----------------------------------------------------------------------+
-  | Author: Michael Spector <michael@zend.com>                           |
+  | Author: Michael Spector <michael@php.net>                            |
   +----------------------------------------------------------------------+
 */
 
@@ -30,12 +30,14 @@
 #include <SAPI.h>
 #include <ext/standard/info.h>
 
+#include <tcl.h>
+#include <expect_tcl.h>
 #include <expect.h>
 
 extern zend_module_entry expect_module_entry;
 #define phpext_expect_ptr &expect_module_entry
 
-#define PHP_EXPECT_VERSION "0.2.7-dev"
+#define PHP_EXPECT_VERSION "0.3.2"
 
 #ifdef PHP_WIN32
 #define PHP_EXPECT_API __declspec(dllexport)

tests/bug22566.phpt

@@ -0,0 +1,16 @@
+--TEST--
+PECL Bug #22566 CGI
+--SKIPIF--
+<?php if (!extension_loaded("expect")) print "skip"; ?>
+--FILE--
+<?php
+var_dump(ini_set('expect.timeout', 3));
+var_dump(ini_set('expect.match_max', '2000'));
+var_dump(ini_get('expect.timeout'));
+var_dump(ini_get('expect.match_max'));
+?>
+--EXPECT--
+string(2) "10"
+string(4) "5000"
+string(1) "3"
+string(4) "2000"