[PHP-DEV] CVS update: php3/functions From: sas (php-dev <email protected>)
Date: 02/27/99

Date: Saturday February 27, 1999 @ 11:07
Author: sas

Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv2500/functions

Modified Files:
        file.c
Log Message:
more ptr changes
Index: php3/functions/file.c
diff -c php3/functions/file.c:1.199 php3/functions/file.c:1.200
*** php3/functions/file.c:1.199 Sun Feb 7 11:37:41 1999
--- php3/functions/file.c Sat Feb 27 11:07:51 1999
***************
*** 26,32 ****
     | Authors: Rasmus Lerdorf <rasmus <email protected>> |
     +----------------------------------------------------------------------+
   */
! /* $Id: file.c,v 1.199 1999/02/07 16:37:41 rasmus Exp $ */
  #ifdef THREAD_SAFE
  #include "tls.h"
  #endif
--- 26,32 ----
     | Authors: Rasmus Lerdorf <rasmus <email protected>> |
     +----------------------------------------------------------------------+
   */
! /* $Id: file.c,v 1.200 1999/02/27 16:07:51 sas Exp $ */
  #ifdef THREAD_SAFE
  #include "tls.h"
  #endif
***************
*** 275,281 ****
          }
          /* Now loop through the file and do the magic quotes thing if needed */
          memset(buf,0,8191);
! while((issock?SOCK_FGETS(buf,8191,socketd):(int)fgets(buf,8191,fp))
                  && !php3i_stristr(buf,"</head>")) {
                  if(php3i_stristr(buf,"<meta")) {
  
--- 275,281 ----
          }
          /* Now loop through the file and do the magic quotes thing if needed */
          memset(buf,0,8191);
! while((issock?SOCK_FGETS(buf,8191,socketd):fgets(buf,8191,fp) != NULL)
                  && !php3i_stristr(buf,"</head>")) {
                  if(php3i_stristr(buf,"<meta")) {
  
***************
*** 397,403 ****
  
          /* Now loop through the file and do the magic quotes thing if needed */
          memset(buf,0,8191);
! while(issock?SOCK_FGETS(buf,8191,socketd):(int)fgets(buf,8191,fp)) {
                  if (php3_ini.magic_quotes_runtime) {
                          int len;
                          
--- 397,403 ----
  
          /* Now loop through the file and do the magic quotes thing if needed */
          memset(buf,0,8191);
! while(issock?SOCK_FGETS(buf,8191,socketd):fgets(buf,8191,fp) != NULL) {
                  if (php3_ini.magic_quotes_runtime) {
                          int len;
                          
***************
*** 795,801 ****
          buf = emalloc(sizeof(char) * (len + 1));
          /* needed because recv doesnt put a null at the end*/
          memset(buf,0,len+1);
! if (!(issock?SOCK_FGETS(buf,len,socketd):(int)fgets(buf,len,fp))) {
                  efree(buf);
                  RETVAL_FALSE;
          } else {
--- 795,801 ----
          buf = emalloc(sizeof(char) * (len + 1));
          /* needed because recv doesnt put a null at the end*/
          memset(buf,0,len+1);
! if (!(issock?SOCK_FGETS(buf,len,socketd):fgets(buf,len,fp) != NULL)) {
                  efree(buf);
                  RETVAL_FALSE;
          } else {
***************
*** 889,895 ****
          buf = emalloc(sizeof(char) * (len + 1));
          /*needed because recv doesnt set null char at end*/
          memset(buf,0,len+1);
! if (!(issock?SOCK_FGETS(buf,len,socketd):(int)fgets(buf, len, fp))) {
                  efree(buf);
                  RETURN_FALSE;
          }
--- 889,895 ----
          buf = emalloc(sizeof(char) * (len + 1));
          /*needed because recv doesnt set null char at end*/
          memset(buf,0,len+1);
! if (!(issock?SOCK_FGETS(buf,len,socketd):fgets(buf, len, fp) != NULL)) {
                  efree(buf);
                  RETURN_FALSE;
          } 

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>