]> granicus.if.org Git - php/commitdiff
- MFH fix for #17323.
authorMarkus Fischer <mfischer@php.net>
Mon, 20 May 2002 23:31:02 +0000 (23:31 +0000)
committerMarkus Fischer <mfischer@php.net>
Mon, 20 May 2002 23:31:02 +0000 (23:31 +0000)
ext/posix/posix.c

index 6f8dc85122e8c492184b79c6169260c928019a1d..fd4778ac32ea123185d767f5e0209a56d814a678 100644 (file)
@@ -585,13 +585,15 @@ PHP_FUNCTION(posix_ctermid)
    Determine terminal device name (POSIX.1, 4.7.2) */
 PHP_FUNCTION(posix_ttyname)
 {
-       long fd;
+       zval *z_fd;
        char *p;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &fd) == FAILURE)
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_fd) == FAILURE)
                return;
 
-       if (NULL == (p = ttyname(fd))) {
+       convert_to_long(z_fd);
+
+       if (NULL == (p = ttyname(Z_LVAL_P(z_fd)))) {
                POSIX_G(last_error) = errno;
                RETURN_FALSE;
        }
@@ -604,13 +606,15 @@ PHP_FUNCTION(posix_ttyname)
    Determine if filedesc is a tty (POSIX.1, 4.7.1) */
 PHP_FUNCTION(posix_isatty)
 {
-       long fd;
+       zval *z_fd;
        int   result;
        
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &fd) == FAILURE)
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &z_fd) == FAILURE)
                return;
 
-       result = isatty(fd);
+       convert_to_long(z_fd);
+
+       result = isatty(Z_LVAL_P(z_fd));
        if (!result)
                RETURN_FALSE;