[PHP-CVS] cvs: php4(PHP_4_3) /ext/imap config.m4

2003-01-27 Thread Jani Taskinen 
sniper  Tue Jan 28 01:56:43 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/imap  config.m4 
  Log:
  MFH: typo fixes
  
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.49.2.1 php4/ext/imap/config.m4:1.49.2.2
--- php4/ext/imap/config.m4:1.49.2.1Sat Jan 18 02:01:11 2003
+++ php4/ext/imap/config.m4 Tue Jan 28 01:56:42 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.49.2.1 2003/01/18 07:01:11 sniper Exp $
+dnl $Id: config.m4,v 1.49.2.2 2003/01/28 06:56:42 sniper Exp $
 dnl
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -94,7 +94,7 @@
 AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
   AC_MSG_ERROR([This c-client library is built with Kerberos support. 
 
-  Add --with-kerberos<=DIR> to your configure line. Check config.log for details.
+  Add --with-kerberos to your configure line. Check config.log for details.
   ])
 ])
   fi
@@ -103,7 +103,7 @@
 
 AC_DEFUN(PHP_IMAP_SSL_CHK, [
   AC_ARG_WITH(imap-ssl,
-  [  --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install 
dir.],[
+  [  --with-imap-ssl= IMAP: Include SSL support. DIR is the OpenSSL install 
+dir.],[
 PHP_IMAP_SSL=$withval
   ],[
 PHP_IMAP_SSL=no
@@ -133,7 +133,7 @@
   AC_MSG_RESULT(yes)
   AC_MSG_ERROR([This c-client library is built with SSL support. 
  
-  Add --with-imap-ssl<=DIR> to your configure line. Check config.log for details.
+  Add --with-imap-ssl= to your configure line. Check config.log for details.
   ])
 ], $TST_LIBS)
   fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/imap config.m4

2003-01-27 Thread Jani Taskinen 
sniper  Tue Jan 28 01:56:32 2003 EDT

  Modified files:  
/php4/ext/imap  config.m4 
  Log:
  fix some typos
  
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.51 php4/ext/imap/config.m4:1.52
--- php4/ext/imap/config.m4:1.51Sat Jan 18 02:00:47 2003
+++ php4/ext/imap/config.m4 Tue Jan 28 01:56:32 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.51 2003/01/18 07:00:47 sniper Exp $
+dnl $Id: config.m4,v 1.52 2003/01/28 06:56:32 sniper Exp $
 dnl
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -94,7 +94,7 @@
 AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
   AC_MSG_ERROR([This c-client library is built with Kerberos support. 
 
-  Add --with-kerberos<=DIR> to your configure line. Check config.log for details.
+  Add --with-kerberos to your configure line. Check config.log for details.
   ])
 ])
   fi
@@ -103,7 +103,7 @@
 
 AC_DEFUN(PHP_IMAP_SSL_CHK, [
   AC_ARG_WITH(imap-ssl,
-  [  --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install 
dir.],[
+  [  --with-imap-ssl= IMAP: Include SSL support. DIR is the OpenSSL install 
+dir.],[
 PHP_IMAP_SSL=$withval
   ],[
 PHP_IMAP_SSL=no
@@ -133,7 +133,7 @@
   AC_MSG_RESULT(yes)
   AC_MSG_ERROR([This c-client library is built with SSL support. 
  
-  Add --with-imap-ssl<=DIR> to your configure line. Check config.log for details.
+  Add --with-imap-ssl= to your configure line. Check config.log for details.
   ])
 ], $TST_LIBS)
   fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 /ext/mime_magic config.m4

2003-01-27 Thread Jani Taskinen 

Yeah, that was a typo. :)

--Jani


On Tue, 28 Jan 2003, Marcus Börger wrote:

>At 02:00 28.01.2003, Jani Taskinen wrote:
>>sniper  Mon Jan 27 20:00:16 2003 EDT
>>
>>   Modified files:
>> /php4/ext/mime_magicconfig.m4
>>   Log:
>>   - Cleaned up and made less error-prone
>>   - Changed --enable-mime-magic -> --with-mime-magic[=FILE] to allow
>> specifying of the file during configure.
>>
>>
>>Index: php4/ext/mime_magic/config.m4
>>diff -u php4/ext/mime_magic/config.m4:1.7 php4/ext/mime_magic/config.m4:1.8
>>--- php4/ext/mime_magic/config.m4:1.7   Sat Jan 25 05:51:04 2003
>>+++ php4/ext/mime_magic/config.m4   Mon Jan 27 20:00:15 2003
>>@@ -1,28 +1,37 @@
>>-dnl $Id: config.m4,v 1.7 2003/01/25 10:51:04 hholzgra Exp $
>>-dnl config.m4 for extension mime_magic
>>+dnl
>>+dnl $Id: config.m4,v 1.8 2003/01/28 01:00:15 sniper Exp $
>>+dnl
>>
>>-PHP_ARG_ENABLE(mime-magic, whether to enable mime_magic support,
>>-[  --enable-mime-magic Enable mime_magic support])
>>+PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
>>+[  --with-mime-magic[=FILE]  Include mime_magic support. FILE is the optional
>>+pathname to the magic.mime file.])
>>
>>-if test "$PHP_MIME_MAGIC" = "yes"; then
>>-  dnl PHP_SUBST(MIME_MAGIC_SHARED_LIBADD)
>>+if test "$PHP_MIME_MAGIC" != "no"; then
>>
>>PHP_NEW_EXTENSION(mime_magic, mime_magic.c, $ext_shared)
>>
>>-  # Try to see if we can find the path of the magic file in its
>>-  # default locations.
>>-  if test -f /usr/share/magic.mime ; then
>>-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic.mime
>>-  elif test -f /usr/share/magic ; then
>>-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic
>>-  elif test -f /usr/share/misc/magic.mime ; then
>>-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/misc/magic.mime
>>-  elif test -f /etc/magic ; then
>>-   PHP_MIME_MAGIC_FILE_PATH=/etc/magic.mime
>>+  PHP_MIME_MAGIC_FILE_PATH=
>>+
>>+  dnl
>>+  dnl Try to see if we can find the path of the magic file in its default 
>>locations.
>>+  dnl
>>+  if test "$PHP_MIME_MAGIC" = "yes"; then
>>+if test -f $PHP_MIME_MAGIC; then
>>+  PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
>>+else
>>+  AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
>>+fi
>>else
>>-   PHP_MIME_MAGIC_FILE_PATH=""
>>-  fi
>>+MAGIC_MIME_LOCATIONS="/usr/share/magic.mime 
>>/usr/share/misc/magic.mime /etc/magic.mime"
>>
>>+for i in $MAGIC_MIME_LOCATIONS; do
>>+  if test -f $i; then
>>+PHP_MIME_MAGIC_FILE_PATH=$i
>>+break
>>+  fi
>>+done
>>+  fi
>>+
>> 
>>AC_DEFINE_UNQUOTED(PHP_MIME_MAGIC_FILE_PATH,"$PHP_MIME_MAGIC_FILE_PATH",[magic 
>>file path])
>>
>>  fi
>
>
>As far as i understand that code you are looking for a file called "yes" now.
>
>I guess you meant if the configure value is neither yes nor no search for 
>that beeing a file.
>With check against no already done this looks like "!=" instead of "=":
>   if test "$PHP_MIME_MAGIC" != "yes"; then
> if test -f $PHP_MIME_MAGIC; then
>

-- 
<- For Sale! ->


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/mime_magic config.m4

2003-01-27 Thread Jani Taskinen 
sniper  Tue Jan 28 01:52:33 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/mime_magicconfig.m4 
  Log:
  MFH: typo fix
  
Index: php4/ext/mime_magic/config.m4
diff -u php4/ext/mime_magic/config.m4:1.6.2.1 php4/ext/mime_magic/config.m4:1.6.2.2
--- php4/ext/mime_magic/config.m4:1.6.2.1   Mon Jan 27 20:00:42 2003
+++ php4/ext/mime_magic/config.m4   Tue Jan 28 01:52:33 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.6.2.1 2003/01/28 01:00:42 sniper Exp $
+dnl $Id: config.m4,v 1.6.2.2 2003/01/28 06:52:33 sniper Exp $
 dnl
 
 PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
@@ -15,7 +15,7 @@
   dnl
   dnl Try to see if we can find the path of the magic file in its default locations.
   dnl
-  if test "$PHP_MIME_MAGIC" = "yes"; then
+  if test "$PHP_MIME_MAGIC" != "yes"; then
 if test -f $PHP_MIME_MAGIC; then
   PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
 else



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/mime_magic config.m4

2003-01-27 Thread Jani Taskinen 
sniper  Tue Jan 28 01:52:09 2003 EDT

  Modified files:  
/php4/ext/mime_magicconfig.m4 
  Log:
  fix typo
  
Index: php4/ext/mime_magic/config.m4
diff -u php4/ext/mime_magic/config.m4:1.8 php4/ext/mime_magic/config.m4:1.9
--- php4/ext/mime_magic/config.m4:1.8   Mon Jan 27 20:00:15 2003
+++ php4/ext/mime_magic/config.m4   Tue Jan 28 01:52:09 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.8 2003/01/28 01:00:15 sniper Exp $
+dnl $Id: config.m4,v 1.9 2003/01/28 06:52:09 sniper Exp $
 dnl
 
 PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
@@ -15,7 +15,7 @@
   dnl
   dnl Try to see if we can find the path of the magic file in its default locations.
   dnl
-  if test "$PHP_MIME_MAGIC" = "yes"; then
+  if test "$PHP_MIME_MAGIC" != "yes"; then
 if test -f $PHP_MIME_MAGIC; then
   PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
 else



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 /ext/mime_magic config.m4

2003-01-27 Thread Marcus Börger 
At 02:00 28.01.2003, Jani Taskinen wrote:

sniper  Mon Jan 27 20:00:16 2003 EDT

  Modified files:
/php4/ext/mime_magicconfig.m4
  Log:
  - Cleaned up and made less error-prone
  - Changed --enable-mime-magic -> --with-mime-magic[=FILE] to allow
specifying of the file during configure.


Index: php4/ext/mime_magic/config.m4
diff -u php4/ext/mime_magic/config.m4:1.7 php4/ext/mime_magic/config.m4:1.8
--- php4/ext/mime_magic/config.m4:1.7   Sat Jan 25 05:51:04 2003
+++ php4/ext/mime_magic/config.m4   Mon Jan 27 20:00:15 2003
@@ -1,28 +1,37 @@
-dnl $Id: config.m4,v 1.7 2003/01/25 10:51:04 hholzgra Exp $
-dnl config.m4 for extension mime_magic
+dnl
+dnl $Id: config.m4,v 1.8 2003/01/28 01:00:15 sniper Exp $
+dnl

-PHP_ARG_ENABLE(mime-magic, whether to enable mime_magic support,
-[  --enable-mime-magic Enable mime_magic support])
+PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
+[  --with-mime-magic[=FILE]  Include mime_magic support. FILE is the optional
+pathname to the magic.mime file.])

-if test "$PHP_MIME_MAGIC" = "yes"; then
-  dnl PHP_SUBST(MIME_MAGIC_SHARED_LIBADD)
+if test "$PHP_MIME_MAGIC" != "no"; then

   PHP_NEW_EXTENSION(mime_magic, mime_magic.c, $ext_shared)

-  # Try to see if we can find the path of the magic file in its
-  # default locations.
-  if test -f /usr/share/magic.mime ; then
-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic.mime
-  elif test -f /usr/share/magic ; then
-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic
-  elif test -f /usr/share/misc/magic.mime ; then
-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/misc/magic.mime
-  elif test -f /etc/magic ; then
-   PHP_MIME_MAGIC_FILE_PATH=/etc/magic.mime
+  PHP_MIME_MAGIC_FILE_PATH=
+
+  dnl
+  dnl Try to see if we can find the path of the magic file in its default 
locations.
+  dnl
+  if test "$PHP_MIME_MAGIC" = "yes"; then
+if test -f $PHP_MIME_MAGIC; then
+  PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
+else
+  AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
+fi
   else
-   PHP_MIME_MAGIC_FILE_PATH=""
-  fi
+MAGIC_MIME_LOCATIONS="/usr/share/magic.mime 
/usr/share/misc/magic.mime /etc/magic.mime"

+for i in $MAGIC_MIME_LOCATIONS; do
+  if test -f $i; then
+PHP_MIME_MAGIC_FILE_PATH=$i
+break
+  fi
+done
+  fi
+

AC_DEFINE_UNQUOTED(PHP_MIME_MAGIC_FILE_PATH,"$PHP_MIME_MAGIC_FILE_PATH",[magic 
file path])

 fi


As far as i understand that code you are looking for a file called "yes" now.

I guess you meant if the configure value is neither yes nor no search for 
that beeing a file.
With check against no already done this looks like "!=" instead of "=":
  if test "$PHP_MIME_MAGIC" != "yes"; then
if test -f $PHP_MIME_MAGIC; then


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/dba config.m4

2003-01-27 Thread Marcus Boerger 
helly   Tue Jan 28 01:27:19 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/dba   config.m4 
  Log:
  MFH
  
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.29.2.5 php4/ext/dba/config.m4:1.29.2.6
--- php4/ext/dba/config.m4:1.29.2.5 Mon Jan 27 19:12:19 2003
+++ php4/ext/dba/config.m4  Tue Jan 28 01:27:19 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.29.2.5 2003/01/28 00:12:19 helly Exp $
+dnl $Id: config.m4,v 1.29.2.6 2003/01/28 06:27:19 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -10,7 +10,8 @@
 
 AC_DEFUN(PHP_TEMP_LDFLAGS,[
   old_LDFLAGS=$LDFLAGS
-  LDFLAGS="$1 $LDFLAGS"
+dnl  LDFLAGS="$1 $LDFLAGS"
+  LDFLAGS="$1"
   $2
   LDFLAGS=$old_LDFLAGS
 ])
@@ -141,14 +142,14 @@
   for LIB in $2; do
 PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
   AC_CHECK_LIB($LIB, $3, [
-  AC_EGREP_CPP(yes,[
+AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
-  yes
+yes
 #endif
 ],[
   THIS_LIBS=$LIB
   break
-],[ ])
+])
   ])
 ])
   done



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/dba config.m4

2003-01-27 Thread Marcus Boerger 
helly   Tue Jan 28 01:27:01 2003 EDT

  Modified files:  
/php4/ext/dba   config.m4 
  Log:
  - fix this: els is optional but may not be empty
  
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.36 php4/ext/dba/config.m4:1.37
--- php4/ext/dba/config.m4:1.36 Mon Jan 27 19:10:05 2003
+++ php4/ext/dba/config.m4  Tue Jan 28 01:27:01 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.36 2003/01/28 00:10:05 helly Exp $
+dnl $Id: config.m4,v 1.37 2003/01/28 06:27:01 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -10,7 +10,8 @@
 
 AC_DEFUN(PHP_TEMP_LDFLAGS,[
   old_LDFLAGS=$LDFLAGS
-  LDFLAGS="$1 $LDFLAGS"
+dnl  LDFLAGS="$1 $LDFLAGS"
+  LDFLAGS="$1"
   $2
   LDFLAGS=$old_LDFLAGS
 ])
@@ -141,14 +142,14 @@
   for LIB in $2; do
 PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
   AC_CHECK_LIB($LIB, $3, [
-  AC_EGREP_CPP(yes,[
+AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
-  yes
+yes
 #endif
 ],[
   THIS_LIBS=$LIB
   break
-],[ ])
+])
   ])
 ])
   done



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard info.c

2003-01-27 Thread Frank M. Kromann 
fmk Tue Jan 28 00:02:13 2003 EDT

  Modified files:  
/php4/ext/standard  info.c 
  Log:
  Fix the setting of computer name and processor type for php_uname() on Win32
  
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.224 php4/ext/standard/info.c:1.225
--- php4/ext/standard/info.c:1.224  Sat Jan 18 15:01:43 2003
+++ php4/ext/standard/info.cTue Jan 28 00:02:12 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.224 2003/01/18 20:01:43 iliaa Exp $ */
+/* $Id: info.c,v 1.225 2003/01/28 05:02:12 fmk Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -211,6 +211,12 @@
DWORD dwVersion = GetVersion();
DWORD dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
DWORD dwWindowsMinorVersion =  (DWORD)(HIBYTE(LOWORD(dwVersion)));
+   DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1;
+   char ComputerName[MAX_COMPUTERNAME_LENGTH + 1];
+   SYSTEM_INFO SysInfo;
+
+   GetComputerName(ComputerName, &dwSize);
+   GetSystemInfo(&SysInfo);
 
if (mode == 's') {
if (dwVersion < 0x8000) {
@@ -222,25 +228,57 @@
snprintf(tmp_uname, sizeof(tmp_uname), "%d.%d", dwWindowsMajorVersion, 
dwWindowsMinorVersion);
php_uname = tmp_uname;
} else if (mode == 'n') {
-   /* XXX HOW TO GET THIS ON WINDOWS? */
-   php_uname = "localhost";
+   php_uname = ComputerName;
} else if (mode == 'v') {
dwBuild = (DWORD)(HIWORD(dwVersion));
snprintf(tmp_uname, sizeof(tmp_uname), "build %d", dwBuild);
php_uname = tmp_uname;
} else if (mode == 'm') {
-   /* XXX HOW TO GET THIS ON WINDOWS? */
-   php_uname = "i386";
+   switch (SysInfo.wProcessorArchitecture) {
+   case PROCESSOR_ARCHITECTURE_INTEL :
+   snprintf(tmp_uname, sizeof(tmp_uname), "i%d", 
+SysInfo.dwProcessorType);
+   php_uname = tmp_uname;
+   break;
+   case PROCESSOR_ARCHITECTURE_MIPS :
+   php_uname = "MIPS R4000";
+   php_uname = tmp_uname;
+   break;
+   case PROCESSOR_ARCHITECTURE_ALPHA :
+   snprintf(tmp_uname, sizeof(tmp_uname), "Alpha %d", 
+SysInfo.wProcessorLevel);
+   php_uname = tmp_uname;
+   break;
+   case PROCESSOR_ARCHITECTURE_PPC :
+   snprintf(tmp_uname, sizeof(tmp_uname), "PPC 6%02d", 
+SysInfo.wProcessorLevel);
+   php_uname = tmp_uname;
+   break;
+   case PROCESSOR_ARCHITECTURE_IA64 :
+   php_uname = "IA64";
+   break;
+#if defined(PROCESSOR_ARCHITECTURE_IA32_ON_WIN64)
+   case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 :
+   php_uname = "IA32";
+   break;
+#endif
+#if defined(PROCESSOR_ARCHITECTURE_AMD64)
+   case PROCESSOR_ARCHITECTURE_AMD64 :
+   php_uname = "AMD64";
+   break;
+#endif
+   case PROCESSOR_ARCHITECTURE_UNKNOWN :
+   default :
+   php_uname = "Unknown";
+   break;
+   }
} else { /* assume mode == 'a' */
/* Get build numbers for Windows NT or Win95 */
if (dwVersion < 0x8000){
dwBuild = (DWORD)(HIWORD(dwVersion));
snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d build %d",
-"Windows NT", "localhost",
+"Windows NT", ComputerName,
 dwWindowsMajorVersion, dwWindowsMinorVersion, 
dwBuild);
} else {
snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d",
-"Windows 9x", "localhost",
+"Windows 9x", ComputerName,
 dwWindowsMajorVersion, dwWindowsMinorVersion);
}
php_uname = tmp_uname;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard info.c

2003-01-27 Thread Frank M. Kromann 
fmk Tue Jan 28 00:01:48 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  info.c 
  Log:
  Fix the setting of computer name and processor type for php_uname() on Win32
  
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.218.2.3 php4/ext/standard/info.c:1.218.2.4
--- php4/ext/standard/info.c:1.218.2.3  Fri Jan 17 13:12:38 2003
+++ php4/ext/standard/info.cTue Jan 28 00:01:46 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.218.2.3 2003/01/17 18:12:38 derick Exp $ */
+/* $Id: info.c,v 1.218.2.4 2003/01/28 05:01:46 fmk Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -211,6 +211,12 @@
DWORD dwVersion = GetVersion();
DWORD dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
DWORD dwWindowsMinorVersion =  (DWORD)(HIBYTE(LOWORD(dwVersion)));
+   DWORD dwSize = MAX_COMPUTERNAME_LENGTH + 1;
+   char ComputerName[MAX_COMPUTERNAME_LENGTH + 1];
+   SYSTEM_INFO SysInfo;
+
+   GetComputerName(ComputerName, &dwSize);
+   GetSystemInfo(&SysInfo);
 
if (mode == 's') {
if (dwVersion < 0x8000) {
@@ -222,25 +228,57 @@
snprintf(tmp_uname, sizeof(tmp_uname), "%d.%d", dwWindowsMajorVersion, 
dwWindowsMinorVersion);
php_uname = tmp_uname;
} else if (mode == 'n') {
-   /* XXX HOW TO GET THIS ON WINDOWS? */
-   php_uname = "localhost";
+   php_uname = ComputerName;
} else if (mode == 'v') {
dwBuild = (DWORD)(HIWORD(dwVersion));
snprintf(tmp_uname, sizeof(tmp_uname), "build %d", dwBuild);
php_uname = tmp_uname;
} else if (mode == 'm') {
-   /* XXX HOW TO GET THIS ON WINDOWS? */
-   php_uname = "i386";
+   switch (SysInfo.wProcessorArchitecture) {
+   case PROCESSOR_ARCHITECTURE_INTEL :
+   snprintf(tmp_uname, sizeof(tmp_uname), "i%d", 
+SysInfo.dwProcessorType);
+   php_uname = tmp_uname;
+   break;
+   case PROCESSOR_ARCHITECTURE_MIPS :
+   php_uname = "MIPS R4000";
+   php_uname = tmp_uname;
+   break;
+   case PROCESSOR_ARCHITECTURE_ALPHA :
+   snprintf(tmp_uname, sizeof(tmp_uname), "Alpha %d", 
+SysInfo.wProcessorLevel);
+   php_uname = tmp_uname;
+   break;
+   case PROCESSOR_ARCHITECTURE_PPC :
+   snprintf(tmp_uname, sizeof(tmp_uname), "PPC 6%02d", 
+SysInfo.wProcessorLevel);
+   php_uname = tmp_uname;
+   break;
+   case PROCESSOR_ARCHITECTURE_IA64 :
+   php_uname = "IA64";
+   break;
+#if defined(PROCESSOR_ARCHITECTURE_IA32_ON_WIN64)
+   case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 :
+   php_uname = "IA32";
+   break;
+#endif
+#if defined(PROCESSOR_ARCHITECTURE_AMD64)
+   case PROCESSOR_ARCHITECTURE_AMD64 :
+   php_uname = "AMD64";
+   break;
+#endif
+   case PROCESSOR_ARCHITECTURE_UNKNOWN :
+   default :
+   php_uname = "Unknown";
+   break;
+   }
} else { /* assume mode == 'a' */
/* Get build numbers for Windows NT or Win95 */
if (dwVersion < 0x8000){
dwBuild = (DWORD)(HIWORD(dwVersion));
snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d build %d",
-"Windows NT", "localhost",
+"Windows NT", ComputerName,
 dwWindowsMajorVersion, dwWindowsMinorVersion, 
dwBuild);
} else {
snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d",
-"Windows 9x", "localhost",
+"Windows 9x", ComputerName,
 dwWindowsMajorVersion, dwWindowsMinorVersion);
}
php_uname = tmp_uname;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 / makedist makedist.ZendEngine2

2003-01-27 Thread Jani Taskinen 
sniper  Mon Jan 27 21:49:35 2003 EDT

  Removed files:   
/php4   makedist.ZendEngine2 

  Modified files:  
/php4   makedist 
  Log:
  - Removed unnecessary makedist.ZendEngine2
  - Modified makedist to use php5 CVS module (alias)
  
  
Index: php4/makedist
diff -u php4/makedist:1.28 php4/makedist:1.29
--- php4/makedist:1.28  Thu Oct 10 15:01:34 2002
+++ php4/makedist   Mon Jan 27 21:49:34 2003
@@ -9,7 +9,7 @@
 # where  is the package name and the CVS module
 # and  s the version number with underscores instead of dots.
 #
-# For example: cvs tag php_3_0a1
+# For example: cvs tag php_5_0_1
 #
 # The distribution ends up in a .tar.gz file that contains the distribution
 # in a directory called -.  The distribution contains all
@@ -24,7 +24,7 @@
 #
 # Written by Stig Bakken <[EMAIL PROTECTED]> 1997-05-28.
 #
-# $Id: makedist,v 1.28 2002/10/10 19:01:34 derick Exp $
+# $Id: makedist,v 1.29 2003/01/28 02:49:34 sniper Exp $
 #
 
 if test "$#" != "2"; then
@@ -45,10 +45,7 @@
 IFS="$old_IFS"
 
 PHPROOT=:pserver:[EMAIL PROTECTED]:/repository
-ZENDROOT=:pserver:[EMAIL PROTECTED]:/repository
-PHPMOD=php4
-ZENDMOD=Zend
-TSRMMOD=TSRM
+PHPMOD=php5
 LT_TARGETS='ltconfig ltmain.sh config.guess config.sub'
 
 if echo '\c' | grep -s c >/dev/null 2>&1
@@ -79,27 +76,27 @@
 CVSVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
 
 # CVS release tag
-CVSTAG=${PKG}_$CVSVER
+if test "$VER" != "HEAD"; then
+  CVSTAG=${PKG}_$CVSVER
+else
+  CVSTAG=HEAD
+fi
 
 if test ! -d $DIRPATH; then
 mkdir -p $DIRPATH || exit 2
 fi
 
-#cd $DIRPATH || exit 3
-
 # Export PHP
 $ECHO_N "makedist: exporting tag '$CVSTAG' from '$PHPMOD'...$ECHO_C"
 cvs -z 9 -d $PHPROOT export -d $DIR -r $CVSTAG $PHPMOD || exit 4
 echo ""
 
-# Export the other modules inside the PHP directory
-cd $DIR || exit 5
-
 # remove CVS stuff...
+cd $DIR || exit 5
 find . \( \( -name CVS -type d \) -o -name .cvsignore \) -exec rm -rf {} \;
 
 # The full ChangeLog is available separately from lxr.php.net
-rm ChangeLog*
+rm -f ChangeLog*
 
 # hide away our own versions of libtool-generated files
 for i in $LT_TARGETS; do



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) / configure.in /main php_ini.c php_scandir.c php_scandir.h /win32 php4dllts.dsp readdir.c readdir.h

2003-01-27 Thread Ilia Alshanetsky 
iliaa   Mon Jan 27 20:51:27 2003 EDT

  Added files: (Branch: PHP_4_3)
/php4/main  php_scandir.h php_scandir.c 

  Modified files:  
/php4/main  php_ini.c 
/php4/win32 readdir.h readdir.c php4dllts.dsp 
/php4   configure.in 
  Log:
  MFH (scandir patch).
  
  
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.106.2.3 php4/main/php_ini.c:1.106.2.4
--- php4/main/php_ini.c:1.106.2.3   Sat Jan 25 20:46:40 2003
+++ php4/main/php_ini.c Mon Jan 27 20:51:25 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_ini.c,v 1.106.2.3 2003/01/26 01:46:40 shane Exp $ */
+/* $Id: php_ini.c,v 1.106.2.4 2003/01/28 01:51:25 iliaa Exp $ */
 
 /* Check CWD for php.ini */
 #define INI_CHECK_CWD
@@ -31,12 +31,10 @@
 #include "SAPI.h"
 #include "php_main.h"
 
-#ifdef PHP_WIN32
-#include "readdir.h"
-/* this makes no sence, vc6 errors if this declaration is not here */
-extern int alphasort(const struct dirent **a, const struct dirent **b);
+#if !HAVE_SCANDIR || !HAVE_ALPHASORT
+ #include "php_scandir.h"
 #else
-#include "dirent.h"
+ #include 
 #endif
 
 #ifndef S_ISREG
Index: php4/win32/readdir.h
diff -u php4/win32/readdir.h:1.6.4.1 php4/win32/readdir.h:1.6.4.2
--- php4/win32/readdir.h:1.6.4.1Sat Jan 25 20:46:40 2003
+++ php4/win32/readdir.hMon Jan 27 20:51:26 2003
@@ -39,10 +39,5 @@
 int readdir_r(DIR *, struct dirent *, struct dirent **);
 int closedir(DIR *);
 int rewinddir(DIR *);
-int scandir(const char *dirname,
-   struct dirent **namelist[],
-   int (*selector) (const struct dirent *entry),
-   int (*compare) (const struct dirent **a, const struct dirent 
**b));
-int alphasort(const struct dirent **a, const struct dirent **b);
 
 #endif /* READDIR_H */
Index: php4/win32/readdir.c
diff -u php4/win32/readdir.c:1.8.4.1 php4/win32/readdir.c:1.8.4.2
--- php4/win32/readdir.c:1.8.4.1Sat Jan 25 20:46:40 2003
+++ php4/win32/readdir.cMon Jan 27 20:51:26 2003
@@ -141,83 +141,3 @@
 
 return 0;
 }
-
-int alphasort(const struct dirent **a, const struct dirent **b)
-{
-   return strcoll((*a)->d_name,(*b)->d_name);
-}
-
-int scandir(const char *dirname,
-   struct dirent **namelist[],
-   int (*selector) (const struct dirent *entry),
-   int (*compare) (const struct dirent **a, const struct dirent 
**b))
-{
-   DIR *dirp = NULL;
-   struct dirent **vector = NULL;
-   struct dirent *dp = NULL;
-   int vector_size = 0;
-
-   int nfiles = 0;
-   int fail = 0;
-
-   if (namelist == NULL)
-   return -1;
-
-   dirp = opendir(dirname);
-   if (dirp == NULL)
-   return -1;
-
-   for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp))
-   {
-   int dsize = 0;
-   struct dirent *newdp = NULL;
-
-   if (selector && (*selector)(dp) == 0)
-   continue;
-
-   if (nfiles == vector_size)
-   {
-   struct dirent **newv;
-   if (vector_size == 0)
-   vector_size = 10;
-   else
-   vector_size *= 2;
-
-   newv = (struct dirent **) realloc (vector, vector_size * 
sizeof (struct dirent *));
-   if (newv == NULL)
-   {
-   fail = 1;
-   break;
-   }
-   vector = newv;
-   }
-
-   dsize = sizeof (struct dirent) + ((strlen(dp->d_name) + 1) * 
sizeof(char));
-   newdp = (struct dirent *) malloc(dsize);
-
-   if (newdp == NULL)
-   {
-   fail = 1;
-   break;
-   }
-
-   vector[nfiles++] = (struct dirent *) memcpy(newdp, dp, dsize);
-   }
-
-   closedir(dirp);
-
-   if (fail)
-   {
-   while (nfiles-- > 0) free(vector[nfiles]);
-   free(vector);
-   return -1;
-   }
-
-
-   *namelist = vector;
-
-   if (compare)
-   qsort (*namelist,nfiles,sizeof (struct dirent *),compare);
-
-   return nfiles;
-}
Index: php4/win32/php4dllts.dsp
diff -u php4/win32/php4dllts.dsp:1.87.2.4 php4/win32/php4dllts.dsp:1.87.2.5
--- php4/win32/php4dllts.dsp:1.87.2.4   Wed Jan 15 04:10:56 2003
+++ php4/win32/php4dllts.dspMon Jan 27 20:51:26 2003
@@ -210,6 +210,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\main\php_scandir.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\main\php_ticks.c
 # End Source File
 # Begin Source File
@@ -339,6 +343,10 @@
 # Begin Source File
 
 SOURCE=..\main\php_output.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\main\php_scandir.h
 # E

[PHP-CVS] cvs: php4 /ext/standard basic_functions.c dir.c php_dir.h

2003-01-27 Thread Ilia Alshanetsky 
iliaa   Mon Jan 27 20:48:57 2003 EDT

  Modified files:  
/php4/ext/standard  dir.c php_dir.h basic_functions.c 
  Log:
  Added scandir() function, which allows quick retrieval of all files &
  directories within the specified path and sort the output in alphabetical
  or reverse alphabetical order.
  
  
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.114 php4/ext/standard/dir.c:1.115
--- php4/ext/standard/dir.c:1.114   Mon Jan 27 11:29:47 2003
+++ php4/ext/standard/dir.c Mon Jan 27 20:48:57 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.114 2003/01/27 16:29:47 edink Exp $ */
+/* $Id: dir.c,v 1.115 2003/01/28 01:48:57 iliaa Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -39,6 +39,10 @@
 #include "win32/readdir.h"
 #endif
 
+#if !HAVE_ALPHASORT || !HAVE_SCANDIR
+#include "php_scandir.h"
+#endif
+
 #ifdef HAVE_GLOB
 #ifndef PHP_WIN32
 #include 
@@ -421,6 +425,77 @@
 }
 /* }}} */
 #endif 
+
+/* {{{ php_alphasortr
+*/
+static int php_alphasortr(const struct dirent **a, const struct dirent **b)
+{
+   return strcoll((*b)->d_name, (*a)->d_name);
+}
+/* }}} */
+
+/* {{{ proto array scandir(string dir [, int sorting_order])
+   List files & directories inside the specified path */
+PHP_FUNCTION(scandir)
+{
+   char *dirn;
+   int dirn_len;
+   int flags = 0;
+   char *path;
+   struct dirent **namelist;
+   int n, i;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &dirn, &dirn_len, 
+&flags) == FAILURE) {
+   return;
+   }
+
+#ifdef ZTS
+   if(!IS_ABSOLUTE_PATH(dirn, dirn_len)) {
+   path = expand_filepath(dirn, NULL TSRMLS_CC);
+   } else 
+#endif
+   path = dirn;
+
+   if (PG(safe_mode) && (!php_checkuid(path, NULL, CHECKUID_CHECK_FILE_AND_DIR))) 
+{
+   RETVAL_FALSE;
+   goto err;
+   }
+   if(php_check_open_basedir(path TSRMLS_CC)) {
+   RETVAL_FALSE;
+   goto err;
+   }
+
+   if (!flags) {
+   n = scandir(path, &namelist, 0, alphasort);
+   } else {
+   n = scandir(path, &namelist, 0, php_alphasortr);
+   }
+
+   if (n < 0) {
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "(errno %d): %s", errno, 
+strerror(errno));
+   RETVAL_FALSE;
+   goto err;
+   }
+   
+   array_init(return_value);
+
+   for (i = 0; i < n; i++) {
+   add_next_index_string(return_value, namelist[i]->d_name, 1);
+   free(namelist[i]);
+   }
+
+   if (n) {
+   free(namelist);
+   }
+
+err:
+   if (path && path != dirn) {
+   efree(path);
+   }
+
+   return;
+}
+/* }}} */
 
 /*
  * Local variables:
Index: php4/ext/standard/php_dir.h
diff -u php4/ext/standard/php_dir.h:1.20 php4/ext/standard/php_dir.h:1.21
--- php4/ext/standard/php_dir.h:1.20Tue Dec 31 11:07:50 2002
+++ php4/ext/standard/php_dir.h Mon Jan 27 20:48:57 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_dir.h,v 1.20 2002/12/31 16:07:50 sebastian Exp $ */
+/* $Id: php_dir.h,v 1.21 2003/01/28 01:48:57 iliaa Exp $ */
 
 #ifndef PHP_DIR_H
 #define PHP_DIR_H
@@ -35,5 +35,6 @@
 PHP_NAMED_FUNCTION(php_if_readdir);
 PHP_FUNCTION(getdir);
 PHP_FUNCTION(glob);
+PHP_FUNCTION(scandir);
 
 #endif /* PHP_DIR_H */
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.565 
php4/ext/standard/basic_functions.c:1.566
--- php4/ext/standard/basic_functions.c:1.565   Tue Jan 21 09:53:16 2003
+++ php4/ext/standard/basic_functions.c Mon Jan 27 20:48:57 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.565 2003/01/21 14:53:16 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.566 2003/01/28 01:48:57 iliaa Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -724,6 +724,7 @@
PHP_FE(rewinddir,  
 NULL)
PHP_STATIC_FE("readdir",php_if_readdir,
 NULL)
PHP_FALIAS(dir, getdir,
 NULL)
+   PHP_FE(scandir,
+ NULL)
 #ifdef HAVE_GLOB
PHP_FE(glob,   
 NULL)
 #endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /sapi/apache2filter php_functions.c

2003-01-27 Thread Ilia Alshanetsky 
iliaa   Mon Jan 27 20:25:34 2003 EDT

  Modified files:  
/php4/sapi/apache2filterphp_functions.c 
  Log:
  Fixed win32 build (bug #21506).
  Fixed a bug that would cause garbage data to appear at the end of the 
  loaded apache modules list in phpinfo().
  
  
Index: php4/sapi/apache2filter/php_functions.c
diff -u php4/sapi/apache2filter/php_functions.c:1.36 
php4/sapi/apache2filter/php_functions.c:1.37
--- php4/sapi/apache2filter/php_functions.c:1.36Sat Jan 18 15:27:04 2003
+++ php4/sapi/apache2filter/php_functions.c Mon Jan 27 20:25:34 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_functions.c,v 1.36 2003/01/18 20:27:04 iliaa Exp $ */
+/* $Id: php_functions.c,v 1.37 2003/01/28 01:25:34 iliaa Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_smart_str.h"
@@ -40,8 +40,6 @@
 
 #include "php_apache.h"
 
-extern module **ap_loaded_modules;
-
 static request_rec *php_apache_lookup_uri(char *filename TSRMLS_DC)
 {
php_struct *ctx;
@@ -341,6 +339,9 @@
smart_str_appends(&tmp1, s);
}
smart_str_appendc(&tmp1, ' ');
+   }
+   if ((tmp1.len - 1) >= 0) {
+   tmp1.c[tmp1.len - 1] = '\0';
}
 
php_info_print_table_start();



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/mime_magic config.m4

2003-01-27 Thread Jani Taskinen 
sniper  Mon Jan 27 20:00:44 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/mime_magicconfig.m4 
  Log:
  MFH
  
Index: php4/ext/mime_magic/config.m4
diff -u php4/ext/mime_magic/config.m4:1.6 php4/ext/mime_magic/config.m4:1.6.2.1
--- php4/ext/mime_magic/config.m4:1.6   Tue Sep 24 02:37:17 2002
+++ php4/ext/mime_magic/config.m4   Mon Jan 27 20:00:42 2003
@@ -1,28 +1,37 @@
-dnl $Id: config.m4,v 1.6 2002/09/24 06:37:17 sas Exp $
-dnl config.m4 for extension mime_magic
+dnl
+dnl $Id: config.m4,v 1.6.2.1 2003/01/28 01:00:42 sniper Exp $
+dnl
 
-PHP_ARG_ENABLE(mime-magic, whether to enable mime_magic support,
-[  --enable-mime-magic Enable mime_magic support])
+PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
+[  --with-mime-magic[=FILE]  Include mime_magic support. FILE is the optional
+pathname to the magic.mime file.])
 
-if test "$PHP_MIME_MAGIC" = "yes"; then
-  dnl PHP_SUBST(MIME_MAGIC_SHARED_LIBADD)
+if test "$PHP_MIME_MAGIC" != "no"; then
 
   PHP_NEW_EXTENSION(mime_magic, mime_magic.c, $ext_shared)
 
-  # Try to see if we can find the path of the magic file in its 
-  # default locations.
-  if test -f /usr/share/magic.mime ; then
-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic.mime
-  elif test -f /usr/share/magic ; then
-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic   
-  elif test -f /usr/share/misc/magic.mime ; then
-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/misc/magic.mime
-  elif test -f /etc/magic ; then
-   PHP_MIME_MAGIC_FILE_PATH=/etc/magic
+  PHP_MIME_MAGIC_FILE_PATH=
+
+  dnl
+  dnl Try to see if we can find the path of the magic file in its default locations.
+  dnl
+  if test "$PHP_MIME_MAGIC" = "yes"; then
+if test -f $PHP_MIME_MAGIC; then
+  PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
+else
+  AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
+fi
   else
-   PHP_MIME_MAGIC_FILE_PATH="" 
-  fi
+MAGIC_MIME_LOCATIONS="/usr/share/magic.mime /usr/share/misc/magic.mime 
+/etc/magic.mime"
 
+for i in $MAGIC_MIME_LOCATIONS; do
+  if test -f $i; then
+PHP_MIME_MAGIC_FILE_PATH=$i
+break
+  fi
+done
+  fi
+  
   AC_DEFINE_UNQUOTED(PHP_MIME_MAGIC_FILE_PATH,"$PHP_MIME_MAGIC_FILE_PATH",[magic file 
path])
 
 fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/mime_magic config.m4

2003-01-27 Thread Jani Taskinen 
sniper  Mon Jan 27 20:00:16 2003 EDT

  Modified files:  
/php4/ext/mime_magicconfig.m4 
  Log:
  - Cleaned up and made less error-prone
  - Changed --enable-mime-magic -> --with-mime-magic[=FILE] to allow
specifying of the file during configure.
  
  
Index: php4/ext/mime_magic/config.m4
diff -u php4/ext/mime_magic/config.m4:1.7 php4/ext/mime_magic/config.m4:1.8
--- php4/ext/mime_magic/config.m4:1.7   Sat Jan 25 05:51:04 2003
+++ php4/ext/mime_magic/config.m4   Mon Jan 27 20:00:15 2003
@@ -1,28 +1,37 @@
-dnl $Id: config.m4,v 1.7 2003/01/25 10:51:04 hholzgra Exp $
-dnl config.m4 for extension mime_magic
+dnl
+dnl $Id: config.m4,v 1.8 2003/01/28 01:00:15 sniper Exp $
+dnl
 
-PHP_ARG_ENABLE(mime-magic, whether to enable mime_magic support,
-[  --enable-mime-magic Enable mime_magic support])
+PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
+[  --with-mime-magic[=FILE]  Include mime_magic support. FILE is the optional
+pathname to the magic.mime file.])
 
-if test "$PHP_MIME_MAGIC" = "yes"; then
-  dnl PHP_SUBST(MIME_MAGIC_SHARED_LIBADD)
+if test "$PHP_MIME_MAGIC" != "no"; then
 
   PHP_NEW_EXTENSION(mime_magic, mime_magic.c, $ext_shared)
 
-  # Try to see if we can find the path of the magic file in its 
-  # default locations.
-  if test -f /usr/share/magic.mime ; then
-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic.mime
-  elif test -f /usr/share/magic ; then
-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/magic   
-  elif test -f /usr/share/misc/magic.mime ; then
-   PHP_MIME_MAGIC_FILE_PATH=/usr/share/misc/magic.mime
-  elif test -f /etc/magic ; then
-   PHP_MIME_MAGIC_FILE_PATH=/etc/magic.mime
+  PHP_MIME_MAGIC_FILE_PATH=
+
+  dnl
+  dnl Try to see if we can find the path of the magic file in its default locations.
+  dnl
+  if test "$PHP_MIME_MAGIC" = "yes"; then
+if test -f $PHP_MIME_MAGIC; then
+  PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
+else
+  AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
+fi
   else
-   PHP_MIME_MAGIC_FILE_PATH="" 
-  fi
+MAGIC_MIME_LOCATIONS="/usr/share/magic.mime /usr/share/misc/magic.mime 
+/etc/magic.mime"
 
+for i in $MAGIC_MIME_LOCATIONS; do
+  if test -f $i; then
+PHP_MIME_MAGIC_FILE_PATH=$i
+break
+  fi
+done
+  fi
+  
   AC_DEFINE_UNQUOTED(PHP_MIME_MAGIC_FILE_PATH,"$PHP_MIME_MAGIC_FILE_PATH",[magic file 
path])
 
 fi



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main php_scandir.c php_scandir.h

2003-01-27 Thread Ilia Alshanetsky 
iliaa   Mon Jan 27 19:42:54 2003 EDT

  Modified files:  
/php4/main  php_scandir.c php_scandir.h 
  Log:
  2nd part of Sebastian's patch.
  
  
Index: php4/main/php_scandir.c
diff -u php4/main/php_scandir.c:1.1 php4/main/php_scandir.c:1.2
--- php4/main/php_scandir.c:1.1 Mon Jan 27 15:39:31 2003
+++ php4/main/php_scandir.c Mon Jan 27 19:42:54 2003
@@ -18,7 +18,11 @@
  */
 
 #include "php_scandir.h"
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#else
 #include "php_config.h"
+#endif
 
 #ifndef HAVE_SCANDIR
  #include 
Index: php4/main/php_scandir.h
diff -u php4/main/php_scandir.h:1.1 php4/main/php_scandir.h:1.2
--- php4/main/php_scandir.h:1.1 Mon Jan 27 15:39:31 2003
+++ php4/main/php_scandir.h Mon Jan 27 19:42:54 2003
@@ -1,12 +1,14 @@
 #include 
-#include "php_config.h"
 
 #ifdef HAVE_DIRENT_H
 # include 
 #endif
 
 #ifdef PHP_WIN32
+#include "config.w32.h"
 #include "win32/readdir.h"
+#else
+#include "php_config.h"
 #endif
 
 #ifndef HAVE_ALPHASORT 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /win32 php4dllts.dsp

2003-01-27 Thread Edin Kadribasic 
edink   Mon Jan 27 19:32:16 2003 EDT

  Modified files:  
/php4/win32 php4dllts.dsp 
  Log:
  Adding new files to the project.
  # First half of Sebastian's patch, Ilia will commit the second part shortly
  
  
Index: php4/win32/php4dllts.dsp
diff -u php4/win32/php4dllts.dsp:1.100 php4/win32/php4dllts.dsp:1.101
--- php4/win32/php4dllts.dsp:1.100  Thu Jan 23 04:35:02 2003
+++ php4/win32/php4dllts.dspMon Jan 27 19:32:15 2003
@@ -214,6 +214,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\main\php_scandir.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\main\php_ticks.c
 # End Source File
 # Begin Source File
@@ -355,6 +359,10 @@
 # Begin Source File
 
 SOURCE=..\main\php_regex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\main\php_scandir.h
 # End Source File
 # Begin Source File
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/dba config.m4

2003-01-27 Thread Marcus Boerger 
helly   Mon Jan 27 19:12:19 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/dba   config.m4 
  Log:
  MFH: --without-flatfile, Berkeley DB version check
  
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.29.2.4 php4/ext/dba/config.m4:1.29.2.5
--- php4/ext/dba/config.m4:1.29.2.4 Sat Jan 25 14:51:05 2003
+++ php4/ext/dba/config.m4  Mon Jan 27 19:12:19 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.29.2.4 2003/01/25 19:51:05 helly Exp $
+dnl $Id: config.m4,v 1.29.2.5 2003/01/28 00:12:19 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -141,34 +141,28 @@
   for LIB in $2; do
 PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
   AC_CHECK_LIB($LIB, $3, [
-AC_TRY_RUN([
+  AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
-int main() {
-  return (DB_VERSION_MAJOR == $1) ? 0 : 1;
-}
+  yes
+#endif
 ],[
   THIS_LIBS=$LIB
   break
-],[ ],[
-  THIS_LIBS=$LIB
-  break
-])
+],[ ])
   ])
 ])
   done
   if test "$1" = "4"; then
 AC_MSG_CHECKING(for db4 minor version and patch level)
-AC_TRY_RUN([
+AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
-int main() {
-  return (DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25) ? 0 : 1;
-}
+#if DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25
+  yes
+#endif
 ],[
   AC_MSG_RESULT(ok)
 ],[
   AC_MSG_ERROR(Version 4.1 requires patch level 25)
-],[
-  AC_MSG_RESULT(crosscompiling)
 ])
   fi
   if test -n "$THIS_LIBS"; then
@@ -366,7 +360,7 @@
 AC_DEFUN(PHP_DBA_BUILTIN_FLATFILE,[
   PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
   AC_DEFINE(DBA_FLATFILE, 1, [ ])
-  flat_sources="dba_flatfile.c libflatfile/flatfile.c"
+  flat_sources="libflatfile/flatfile.c"
   THIS_RESULT="builtin"
 ])
 
@@ -389,7 +383,7 @@
 if test "$HAVE_DBA" = "1"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_DBA, 1, [ ])
-  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c 
dba_db3.c dba_db4.c $cdb_sources $flat_sources, $ext_shared)
+  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c 
+dba_db3.c dba_db4.c dba_flatfile.c $cdb_sources $flat_sources, $ext_shared)
   PHP_SUBST(DBA_SHARED_LIBADD)
 else
   AC_MSG_RESULT(no)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/dba config.m4

2003-01-27 Thread Marcus Boerger 
helly   Mon Jan 27 19:10:06 2003 EDT

  Modified files:  
/php4/ext/dba   config.m4 
  Log:
  - fix "--without-flatfile"
  - simplify Berkley DB verison check
  
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.35 php4/ext/dba/config.m4:1.36
--- php4/ext/dba/config.m4:1.35 Sat Jan 25 14:46:58 2003
+++ php4/ext/dba/config.m4  Mon Jan 27 19:10:05 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.35 2003/01/25 19:46:58 helly Exp $
+dnl $Id: config.m4,v 1.36 2003/01/28 00:10:05 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -141,34 +141,28 @@
   for LIB in $2; do
 PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[
   AC_CHECK_LIB($LIB, $3, [
-AC_TRY_RUN([
+  AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
-int main() {
-  return (DB_VERSION_MAJOR == $1) ? 0 : 1;
-}
+  yes
+#endif
 ],[
   THIS_LIBS=$LIB
   break
-],[ ],[
-  THIS_LIBS=$LIB
-  break
-])
+],[ ])
   ])
 ])
   done
   if test "$1" = "4"; then
 AC_MSG_CHECKING(for db4 minor version and patch level)
-AC_TRY_RUN([
+AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
-int main() {
-  return (DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25) ? 0 : 1;
-}
+#if DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25
+  yes
+#endif
 ],[
   AC_MSG_RESULT(ok)
 ],[
   AC_MSG_ERROR(Version 4.1 requires patch level 25)
-],[
-  AC_MSG_RESULT(crosscompiling)
 ])
   fi
   if test -n "$THIS_LIBS"; then
@@ -366,7 +360,7 @@
 AC_DEFUN(PHP_DBA_BUILTIN_FLATFILE,[
   PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
   AC_DEFINE(DBA_FLATFILE, 1, [ ])
-  flat_sources="dba_flatfile.c libflatfile/flatfile.c"
+  flat_sources="libflatfile/flatfile.c"
   THIS_RESULT="builtin"
 ])
 
@@ -389,7 +383,7 @@
 if test "$HAVE_DBA" = "1"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_DBA, 1, [ ])
-  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c 
dba_db3.c dba_db4.c $cdb_sources $flat_sources, $ext_shared)
+  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c 
+dba_db3.c dba_db4.c dba_flatfile.c $cdb_sources $flat_sources, $ext_shared)
   PHP_SUBST(DBA_SHARED_LIBADD)
 else
   AC_MSG_RESULT(no)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 / configure.in /main php_ini.c php_scandir.c php_scandir.h /win32 readdir.c readdir.h

2003-01-27 Thread Ilia Alshanetsky 
iliaa   Mon Jan 27 15:39:31 2003 EDT

  Added files: 
/php4/main  php_scandir.c php_scandir.h 

  Modified files:  
/php4/win32 readdir.h readdir.c 
/php4   configure.in 
/php4/main  php_ini.c 
  Log:
  Moved the scandir code into it's own files so that it can be used by other
  OSes where libc does not have a native scandir() implementation.
  
  
Index: php4/win32/readdir.h
diff -u php4/win32/readdir.h:1.7 php4/win32/readdir.h:1.8
--- php4/win32/readdir.h:1.7Sat Jan 25 20:39:18 2003
+++ php4/win32/readdir.hMon Jan 27 15:39:30 2003
@@ -39,10 +39,5 @@
 int readdir_r(DIR *, struct dirent *, struct dirent **);
 int closedir(DIR *);
 int rewinddir(DIR *);
-int scandir(const char *dirname,
-   struct dirent **namelist[],
-   int (*selector) (const struct dirent *entry),
-   int (*compare) (const struct dirent **a, const struct dirent 
**b));
-int alphasort(const struct dirent **a, const struct dirent **b);
 
 #endif /* READDIR_H */
Index: php4/win32/readdir.c
diff -u php4/win32/readdir.c:1.9 php4/win32/readdir.c:1.10
--- php4/win32/readdir.c:1.9Sat Jan 25 20:39:18 2003
+++ php4/win32/readdir.cMon Jan 27 15:39:30 2003
@@ -141,83 +141,3 @@
 
 return 0;
 }
-
-int alphasort(const struct dirent **a, const struct dirent **b)
-{
-   return strcoll((*a)->d_name,(*b)->d_name);
-}
-
-int scandir(const char *dirname,
-   struct dirent **namelist[],
-   int (*selector) (const struct dirent *entry),
-   int (*compare) (const struct dirent **a, const struct dirent 
**b))
-{
-   DIR *dirp = NULL;
-   struct dirent **vector = NULL;
-   struct dirent *dp = NULL;
-   int vector_size = 0;
-
-   int nfiles = 0;
-   int fail = 0;
-
-   if (namelist == NULL)
-   return -1;
-
-   dirp = opendir(dirname);
-   if (dirp == NULL)
-   return -1;
-
-   for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp))
-   {
-   int dsize = 0;
-   struct dirent *newdp = NULL;
-
-   if (selector && (*selector)(dp) == 0)
-   continue;
-
-   if (nfiles == vector_size)
-   {
-   struct dirent **newv;
-   if (vector_size == 0)
-   vector_size = 10;
-   else
-   vector_size *= 2;
-
-   newv = (struct dirent **) realloc (vector, vector_size * 
sizeof (struct dirent *));
-   if (newv == NULL)
-   {
-   fail = 1;
-   break;
-   }
-   vector = newv;
-   }
-
-   dsize = sizeof (struct dirent) + ((strlen(dp->d_name) + 1) * 
sizeof(char));
-   newdp = (struct dirent *) malloc(dsize);
-
-   if (newdp == NULL)
-   {
-   fail = 1;
-   break;
-   }
-
-   vector[nfiles++] = (struct dirent *) memcpy(newdp, dp, dsize);
-   }
-
-   closedir(dirp);
-
-   if (fail)
-   {
-   while (nfiles-- > 0) free(vector[nfiles]);
-   free(vector);
-   return -1;
-   }
-
-
-   *namelist = vector;
-
-   if (compare)
-   qsort (*namelist,nfiles,sizeof (struct dirent *),compare);
-
-   return nfiles;
-}
Index: php4/configure.in
diff -u php4/configure.in:1.415 php4/configure.in:1.416
--- php4/configure.in:1.415 Thu Jan 23 01:42:43 2003
+++ php4/configure.in   Mon Jan 27 15:39:30 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.415 2003/01/23 06:42:43 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.416 2003/01/27 20:39:30 iliaa Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -445,6 +445,7 @@
 
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(
+alphasort \
 asctime_r \
 chroot \
 ctime_r \
@@ -480,6 +481,7 @@
 rand_r \
 regcomp \
 res_search \
+scandir \
 setitimer \
 setlocale \
 localeconv \
@@ -1093,7 +1095,7 @@
 PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
 
 PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \
-   safe_mode.c fopen_wrappers.c alloca.c \
+   safe_mode.c fopen_wrappers.c alloca.c  php_scandir.c \
php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
streams.c network.c php_open_temporary_file.c php_logos.c \
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.111 php4/main/php_ini.c:1.112
--- php4/main/php_ini.c:1.111   Sat Jan 25 20:39:18 2003
+++ php4/main/php_ini.c Mon Jan 27 15:39:30 2003
@@ -16,7 +16,7 @@
+

[PHP-CVS] cvs: php4 /ext/oci8 oci8.c

2003-01-27 Thread Maxim Maletsky 
maxim   Mon Jan 27 15:05:48 2003 EDT

  Modified files:  
/php4/ext/oci8  oci8.c 
  Log:
  This fixes "warning C4101: 'charsetid' : unreferenced local variable" on VC6
  
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.202 php4/ext/oci8/oci8.c:1.203
--- php4/ext/oci8/oci8.c:1.202  Mon Jan 27 14:52:11 2003
+++ php4/ext/oci8/oci8.cMon Jan 27 15:05:48 2003
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.202 2003/01/27 19:52:11 maxim Exp $ */
+/* $Id: oci8.c,v 1.203 2003/01/27 20:05:48 maxim Exp $ */
 
 /* TODO list:
  *
@@ -640,7 +640,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
-   php_info_print_table_row(2, "Revision", "$Revision: 1.202 $");
+   php_info_print_table_row(2, "Revision", "$Revision: 1.203 $");
 #ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -2152,7 +2152,9 @@
oci_session *session = 0, *psession = 0;
OCISvcCtx *svchp = 0;
char *hashed_details;
+#ifdef HAVE_OCI9
ub2 charsetid;
+#endif
TSRMLS_FETCH();
 
/* 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/oci8 oci8.c

2003-01-27 Thread Maxim Maletsky 
maxim   Mon Jan 27 14:52:11 2003 EDT

  Modified files:  
/php4/ext/oci8  oci8.c 
  Log:
  @- Fixed bug #17448 (Print the message when OCI_SUCCESS_WITH_INFO is returned).
  (Maxim)
  
  
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.201 php4/ext/oci8/oci8.c:1.202
--- php4/ext/oci8/oci8.c:1.201  Sun Jan 19 03:32:22 2003
+++ php4/ext/oci8/oci8.cMon Jan 27 14:52:11 2003
@@ -20,7 +20,7 @@
+--+
  */
 
-/* $Id: oci8.c,v 1.201 2003/01/19 08:32:22 iliaa Exp $ */
+/* $Id: oci8.c,v 1.202 2003/01/27 19:52:11 maxim Exp $ */
 
 /* TODO list:
  *
@@ -640,7 +640,7 @@
 
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
-   php_info_print_table_row(2, "Revision", "$Revision: 1.201 $");
+   php_info_print_table_row(2, "Revision", "$Revision: 1.202 $");
 #ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -974,7 +974,16 @@
case OCI_SUCCESS:
break;
case OCI_SUCCESS_WITH_INFO:
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s: 
OCI_SUCCESS_WITH_INFO", what);
+   CALL_OCI(OCIErrorGet(
+   err_p, 
+   (ub4)1, 
+   NULL, 
+   &errcode, 
+   errbuf,
+   (ub4)sizeof(errbuf), 
+   (ub4)OCI_HTYPE_ERROR));
+
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s: 
+OCI_SUCCESS_WITH_INFO: %s", what, errbuf);
break;
case OCI_NEED_DATA:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s: OCI_NEED_DATA", what);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/ftp ftp.c ftp.h php_ftp.c

2003-01-27 Thread Sara Golemon 
pollita Mon Jan 27 14:51:51 2003 EDT

  Modified files:  
/php4/ext/ftp   php_ftp.c ftp.h ftp.c 
  Log:
  Fix potential buffer overflow.
  
  
Index: php4/ext/ftp/php_ftp.c
diff -u php4/ext/ftp/php_ftp.c:1.80 php4/ext/ftp/php_ftp.c:1.81
--- php4/ext/ftp/php_ftp.c:1.80 Sun Jan 26 21:54:12 2003
+++ php4/ext/ftp/php_ftp.c  Mon Jan 27 14:51:50 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_ftp.c,v 1.80 2003/01/27 02:54:12 pollita Exp $ */
+/* $Id: php_ftp.c,v 1.81 2003/01/27 19:51:50 pollita Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -396,7 +396,7 @@
 
ZEND_FETCH_RESOURCE(ftp, ftpbuf_t*, &z_ftp, -1, le_ftpbuf_name, le_ftpbuf);
 
-   if (!ftp_chmod(ftp, mode, filename)) {
+   if (!ftp_chmod(ftp, mode, filename, filename_len)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", ftp->inbuf);
RETURN_FALSE;
}
Index: php4/ext/ftp/ftp.h
diff -u php4/ext/ftp/ftp.h:1.34 php4/ext/ftp/ftp.h:1.35
--- php4/ext/ftp/ftp.h:1.34 Sun Jan 26 21:54:12 2003
+++ php4/ext/ftp/ftp.h  Mon Jan 27 14:51:50 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: ftp.h,v 1.34 2003/01/27 02:54:12 pollita Exp $ */
+/* $Id: ftp.h,v 1.35 2003/01/27 19:51:50 pollita Exp $ */
 
 #ifndefFTP_H
 #defineFTP_H
@@ -136,7 +136,7 @@
 intftp_rmdir(ftpbuf_t *ftp, const char *dir);
 
 /* Set permissions on a file */
-intftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename);
+intftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const 
+int filename_len);
 
 /* returns a NULL-terminated array of filenames in the given path
  * or NULL on error.  the return array must be freed (but don't
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.74 php4/ext/ftp/ftp.c:1.75
--- php4/ext/ftp/ftp.c:1.74 Sun Jan 26 21:54:12 2003
+++ php4/ext/ftp/ftp.c  Mon Jan 27 14:51:50 2003
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: ftp.c,v 1.74 2003/01/27 02:54:12 pollita Exp $ */
+/* $Id: ftp.c,v 1.75 2003/01/27 19:51:50 pollita Exp $ */
 
 #include "php.h"
 
@@ -538,23 +538,31 @@
 /* {{{ ftp_chmod
  */
 int
-ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename)
+ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int filename_len)
 {
-   char buffer[1024];
+   char *buffer;
 
-   if (ftp == NULL) {
+   if (ftp == NULL || filename_len <= 0) {
+   return 0;
+   }
+
+   if (!(buffer = emalloc(32 + filename_len + 1))) {
return 0;
}
 
sprintf(buffer, "CHMOD %o %s", mode, filename);
 
if (!ftp_putcmd(ftp, "SITE", buffer)) {
+   efree(buffer);
return 0;
}
 
+   efree(buffer);
+
if (!ftp_getresp(ftp) || ftp->resp != 200) {
return 0;
}
+   
return 1;
 }
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 /ext/mime_magic config.m4

2003-01-27 Thread Marcus Börger 
At 10:23 27.01.2003, Jani Taskinen wrote:


It still looks for '/usr/share/magic' file thus
your fix doesn't fix anything.

Attached is a bit better version of the config.m4,
please let me know if it's ok to commit.

--Jani


Looks good to me

marcus


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /main output.c

2003-01-27 Thread Ilia Alshanetsky 
iliaa   Mon Jan 27 12:22:23 2003 EDT

  Modified files:  
/php4/main  output.c 
  Log:
  Removed pointless checks.
  
  
Index: php4/main/output.c
diff -u php4/main/output.c:1.145 php4/main/output.c:1.146
--- php4/main/output.c:1.145Tue Dec 31 10:58:52 2002
+++ php4/main/output.c  Mon Jan 27 12:22:22 2003
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.145 2002/12/31 15:58:52 sebastian Exp $ */
+/* $Id: output.c,v 1.146 2003/01/27 17:22:22 iliaa Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -527,10 +527,7 @@
RETURN_FALSE;
}
 
-   if (array_init(return_value) == FAILURE) {
-   php_error_docref("ref.outcontrol" TSRMLS_CC, E_ERROR, "Unable to 
initialize array");
-   RETURN_FALSE;
-   }
+   array_init(return_value);
if (OG(ob_nesting_level)) {
if (OG(ob_nesting_level)>1) {
zend_stack_apply_with_argument(&OG(ob_buffers), 
ZEND_STACK_APPLY_BOTTOMUP, (int (*)(void *element, void *)) php_ob_list_each, 
return_value);
@@ -913,9 +910,7 @@
zval *elem;
 
MAKE_STD_ZVAL(elem);
-   if (array_init(elem) == FAILURE) {
-   return FAILURE;
-   }
+   array_init(elem);
 
add_assoc_long(elem, "chunk_size", ob_buffer->chunk_size);
if (!ob_buffer->chunk_size) {
@@ -949,9 +944,7 @@
if (zend_parse_parameters(argc TSRMLS_CC, "|b", &full_status) == FAILURE )
RETURN_FALSE;

-   if (array_init(return_value) == FAILURE) {
-   RETURN_FALSE;
-   }
+   array_init(return_value);
 
if (full_status) {
if (OG(ob_nesting_level)>1) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) / NEWS /ext/standard dir.c /win32 glob.c

2003-01-27 Thread Edin Kadribasic 
edink   Mon Jan 27 11:32:50 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  dir.c 
/php4/win32 glob.c 
/php4   NEWS 
  Log:
  MFH: Fixed bug #21597 (made glob() understand Windows paths).
  
  
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.109.2.3 php4/ext/standard/dir.c:1.109.2.4
--- php4/ext/standard/dir.c:1.109.2.3   Tue Dec 31 11:35:26 2002
+++ php4/ext/standard/dir.c Mon Jan 27 11:32:47 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.109.2.3 2002/12/31 16:35:26 sebastian Exp $ */
+/* $Id: dir.c,v 1.109.2.4 2003/01/27 16:32:47 edink Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -378,7 +378,7 @@
cwd[0] = '\0';
}
cwd_skip = strlen(cwd)+1;
-   snprintf(work_pattern, MAXPATHLEN, "%s/%s", cwd, pattern);
+   snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, 
+pattern);
pattern = work_pattern;
} 
 #endif
Index: php4/win32/glob.c
diff -u php4/win32/glob.c:1.3 php4/win32/glob.c:1.3.4.1
--- php4/win32/glob.c:1.3   Tue Jun  4 17:26:06 2002
+++ php4/win32/glob.c   Mon Jan 27 11:32:48 2003
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: glob.c,v 1.3 2002/06/04 21:26:06 edink Exp $ */
+/* $Id: glob.c,v 1.3.4.1 2003/01/27 16:32:48 edink Exp $ */
 
 /*
  * glob(3) -- a superset of the one defined in POSIX 1003.2.
@@ -99,7 +99,7 @@
 #defineQUOTE   '\\'
 #defineRANGE   '-'
 #defineRBRACKET']'
-#defineSEP '/'
+#defineSEP DEFAULT_SLASH
 #defineSTAR'*'
 #defineTILDE   '~'
 #defineUNDERSCORE  '_'
@@ -171,6 +171,13 @@
int c;
Char *bufnext, *bufend, patbuf[MAXPATHLEN];
 
+#ifdef PHP_WIN32
+   /* Force skipping escape sequences on windows
+* due to the ambiguity with path backslashes
+*/
+   flags |= GLOB_NOESCAPE;
+#endif
+
patnext = (u_char *) pattern;
if (!(flags & GLOB_APPEND)) {
pglob->gl_pathc = 0;
@@ -558,7 +565,7 @@
return(0);
 
if (((pglob->gl_flags & GLOB_MARK) &&
-   pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) ||
+   !IS_SLASH(pathend[-1])) && (S_ISDIR(sb.st_mode) ||
(S_ISLNK(sb.st_mode) &&
(g_stat(pathbuf, &sb, pglob) == 0) &&
S_ISDIR(sb.st_mode {
@@ -574,7 +581,7 @@
/* Find end of next segment, copy tentatively to pathend. */
q = pathend;
p = pattern;
-   while (*p != EOS && *p != SEP) {
+   while (*p != EOS && !IS_SLASH(*p)) {
if (ismeta(*p))
anymeta = 1;
if (q+1 > pathend_last)
@@ -585,7 +592,7 @@
if (!anymeta) { /* No expansion, do next segment. */
pathend = q;
pattern = p;
-   while (*pattern == SEP) {
+   while (IS_SLASH(*pattern)) {
if (pathend+1 > pathend_last)
return (1);
*pathend++ = *pattern++;
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.51 php4/NEWS:1.1247.2.52
--- php4/NEWS:1.1247.2.51   Fri Jan 24 04:54:30 2003
+++ php4/NEWS   Mon Jan 27 11:32:48 2003
@@ -9,6 +9,7 @@
   . Disallow linkage of Berkeley db submodules against libraries with
 different major version.
   . Disallow configuring of more than one Berkeley db handler. 
+- Fixed bug #21597 (made glob() understand Windows paths). (Edin)
 - Fixed bug #20857 (snmpset() failed always, patch by: [EMAIL PROTECTED]). (Jani)
 - Fixed bug #14532 (fixed connection_status() to return 2 for timeouts). (Jani)
 - Fixed bug #21525 (bind_textdomain_codeset() now available on Windows). (Edin)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/standard dir.c /win32 glob.c

2003-01-27 Thread Edin Kadribasic 
edink   Mon Jan 27 11:29:47 2003 EDT

  Modified files:  
/php4/ext/standard  dir.c 
/php4/win32 glob.c 
  Log:
  Fixed bug #21597 (made glob() understand windows paths)
  
  
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.113 php4/ext/standard/dir.c:1.114
--- php4/ext/standard/dir.c:1.113   Tue Dec 31 11:07:35 2002
+++ php4/ext/standard/dir.c Mon Jan 27 11:29:47 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.113 2002/12/31 16:07:35 sebastian Exp $ */
+/* $Id: dir.c,v 1.114 2003/01/27 16:29:47 edink Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -378,7 +378,7 @@
cwd[0] = '\0';
}
cwd_skip = strlen(cwd)+1;
-   snprintf(work_pattern, MAXPATHLEN, "%s/%s", cwd, pattern);
+   snprintf(work_pattern, MAXPATHLEN, "%s%c%s", cwd, DEFAULT_SLASH, 
+pattern);
pattern = work_pattern;
} 
 #endif
Index: php4/win32/glob.c
diff -u php4/win32/glob.c:1.3 php4/win32/glob.c:1.4
--- php4/win32/glob.c:1.3   Tue Jun  4 17:26:06 2002
+++ php4/win32/glob.c   Mon Jan 27 11:29:47 2003
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: glob.c,v 1.3 2002/06/04 21:26:06 edink Exp $ */
+/* $Id: glob.c,v 1.4 2003/01/27 16:29:47 edink Exp $ */
 
 /*
  * glob(3) -- a superset of the one defined in POSIX 1003.2.
@@ -99,7 +99,7 @@
 #defineQUOTE   '\\'
 #defineRANGE   '-'
 #defineRBRACKET']'
-#defineSEP '/'
+#defineSEP DEFAULT_SLASH
 #defineSTAR'*'
 #defineTILDE   '~'
 #defineUNDERSCORE  '_'
@@ -171,6 +171,13 @@
int c;
Char *bufnext, *bufend, patbuf[MAXPATHLEN];
 
+#ifdef PHP_WIN32
+   /* Force skipping escape sequences on windows
+* due to the ambiguity with path backslashes
+*/
+   flags |= GLOB_NOESCAPE;
+#endif
+
patnext = (u_char *) pattern;
if (!(flags & GLOB_APPEND)) {
pglob->gl_pathc = 0;
@@ -558,7 +565,7 @@
return(0);
 
if (((pglob->gl_flags & GLOB_MARK) &&
-   pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) ||
+   !IS_SLASH(pathend[-1])) && (S_ISDIR(sb.st_mode) ||
(S_ISLNK(sb.st_mode) &&
(g_stat(pathbuf, &sb, pglob) == 0) &&
S_ISDIR(sb.st_mode {
@@ -574,7 +581,7 @@
/* Find end of next segment, copy tentatively to pathend. */
q = pathend;
p = pattern;
-   while (*p != EOS && *p != SEP) {
+   while (*p != EOS && !IS_SLASH(*p)) {
if (ismeta(*p))
anymeta = 1;
if (q+1 > pathend_last)
@@ -585,7 +592,7 @@
if (!anymeta) { /* No expansion, do next segment. */
pathend = q;
pattern = p;
-   while (*pattern == SEP) {
+   while (IS_SLASH(*pattern)) {
if (pathend+1 > pathend_last)
return (1);
*pathend++ = *pattern++;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) /ext/standard string.c

2003-01-27 Thread Andrey Hristov 
andrey  Mon Jan 27 11:22:33 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4/ext/standard  string.c 
  Log:
  MFH
  
  
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.333.2.10 php4/ext/standard/string.c:1.333.2.11
--- php4/ext/standard/string.c:1.333.2.10   Sun Jan 19 07:56:25 2003
+++ php4/ext/standard/string.c  Mon Jan 27 11:22:33 2003
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: string.c,v 1.333.2.10 2003/01/19 12:56:25 moriyoshi Exp $ */
+/* $Id: string.c,v 1.333.2.11 2003/01/27 16:22:33 andrey Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -202,7 +202,7 @@
 static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior)
 {
char *s11, *s22;
-   long len1, len2, start, len;
+   int len1, len2, start, len;

start = 0;
len = 0;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) / configure.in

2003-01-27 Thread Jani Taskinen 
sniper  Mon Jan 27 07:44:56 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   configure.in 
  Log:
  revert previous commit
  
Index: php4/configure.in
diff -u php4/configure.in:1.396.2.25 php4/configure.in:1.396.2.26
--- php4/configure.in:1.396.2.25Mon Jan 27 06:33:47 2003
+++ php4/configure.in   Mon Jan 27 07:44:56 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.25 2003/01/27 11:33:47 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.26 2003/01/27 12:44:56 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -888,7 +888,7 @@
 
 dnl Build extension directory path
 
-ZEND_MODULE_API_NO=`grep -E '#define ZEND_MODULE_API_NO ' 
$srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
+ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' 
+$srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
 
 if test -z "$EXTENSION_DIR"; then
   extbasedir=$ZEND_MODULE_API_NO



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4(PHP_4_3) / configure.in

2003-01-27 Thread Jani Taskinen 
sniper  Mon Jan 27 06:33:47 2003 EDT

  Modified files:  (Branch: PHP_4_3)
/php4   configure.in 
  Log:
  MFH: use grep -E instead of egrep. the latter is not defined by POSIX anymore
  
Index: php4/configure.in
diff -u php4/configure.in:1.396.2.24 php4/configure.in:1.396.2.25
--- php4/configure.in:1.396.2.24Thu Jan 23 01:42:51 2003
+++ php4/configure.in   Mon Jan 27 06:33:47 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.24 2003/01/23 06:42:51 sniper Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.25 2003/01/27 11:33:47 sniper Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -888,7 +888,7 @@
 
 dnl Build extension directory path
 
-ZEND_MODULE_API_NO=`egrep '#define ZEND_MODULE_API_NO ' 
$srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
+ZEND_MODULE_API_NO=`grep -E '#define ZEND_MODULE_API_NO ' 
+$srcdir/Zend/zend_modules.h|sed 's/#define ZEND_MODULE_API_NO //'`
 
 if test -z "$EXTENSION_DIR"; then
   extbasedir=$ZEND_MODULE_API_NO



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 /ext/hyperwave hw.c

2003-01-27 Thread Derick Rethans 
On Mon, 27 Jan 2003, Uwe Steinmann wrote:

> steinmMon Jan 27 04:11:15 2003 EDT
> 
>   Modified files:  
> /php4/ext/hyperwave   hw.c 
>   Log:
>   - fixed several bugs in hw_document_xx() functions. The macro to access
> the document was the same as for a link to the sever.

MFH? (the branch is PHP_4_3).

Derick

-- 

-
 Derick Rethans http://derickrethans.nl/ 
 PHP Magazine - PHP Magazine for Professionals   http://php-mag.net/
-


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 /ext/mime_magic config.m4

2003-01-27 Thread Jani Taskinen 

It still looks for '/usr/share/magic' file thus
your fix doesn't fix anything.
 
Attached is a bit better version of the config.m4,
please let me know if it's ok to commit.

--Jani


On Sat, 25 Jan 2003, Hartmut Holzgraefe wrote:

>hholzgra   Sat Jan 25 05:51:04 2003 EDT
>
>  Modified files:  
>/php4/ext/mime_magic   config.m4 
>  Log:
>  suggesting a plain magic file insteat of a mime one is a bad idea
>  
>  
>Index: php4/ext/mime_magic/config.m4
>diff -u php4/ext/mime_magic/config.m4:1.6 php4/ext/mime_magic/config.m4:1.7
>--- php4/ext/mime_magic/config.m4:1.6  Tue Sep 24 02:37:17 2002
>+++ php4/ext/mime_magic/config.m4  Sat Jan 25 05:51:04 2003
>@@ -1,4 +1,4 @@
>-dnl $Id: config.m4,v 1.6 2002/09/24 06:37:17 sas Exp $
>+dnl $Id: config.m4,v 1.7 2003/01/25 10:51:04 hholzgra Exp $
> dnl config.m4 for extension mime_magic
> 
> PHP_ARG_ENABLE(mime-magic, whether to enable mime_magic support,
>@@ -18,7 +18,7 @@
>   elif test -f /usr/share/misc/magic.mime ; then
>   PHP_MIME_MAGIC_FILE_PATH=/usr/share/misc/magic.mime
>   elif test -f /etc/magic ; then
>-  PHP_MIME_MAGIC_FILE_PATH=/etc/magic
>+  PHP_MIME_MAGIC_FILE_PATH=/etc/magic.mime
>   else
>   PHP_MIME_MAGIC_FILE_PATH="" 
>   fi
>
>
>
>

-- 
<- For Sale! ->

dnl
dnl $Id: config.m4,v 1.7 2003/01/25 10:51:04 hholzgra Exp $
dnl

PHP_ARG_WITH(mime-magic, whether to include mime_magic support,
[  --with-mime-magic[=FILE]  Include mime_magic support. FILE is the optional
pathname to the magic.mime file.])

if test "$PHP_MIME_MAGIC" != "no"; then

  PHP_NEW_EXTENSION(mime_magic, mime_magic.c, $ext_shared)

  PHP_MIME_MAGIC_FILE_PATH=

  dnl
  dnl Try to see if we can find the path of the magic file in its default locations.
  dnl
  if test "$PHP_MIME_MAGIC" = "yes"; then
if test -f $PHP_MIME_MAGIC; then
  PHP_MIME_MAGIC_FILE_PATH=$PHP_MIME_MAGIC
else
  AC_MSG_ERROR([File '$PHP_MIME_MAGIC' not found!])
fi
  else
MAGIC_MIME_LOCATIONS="/usr/share/magic.mime /usr/share/misc/magic.mime 
/etc/magic.mime"

for i in $MAGIC_MIME_LOCATIONS; do
  if test -f $i; then
PHP_MIME_MAGIC_FILE_PATH=$i
break
  fi
done
  fi
  
  AC_DEFINE_UNQUOTED(PHP_MIME_MAGIC_FILE_PATH,"$PHP_MIME_MAGIC_FILE_PATH",[magic file 
path])

fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php4 /ext/hyperwave hw.c

2003-01-27 Thread Uwe Steinmann 
steinm  Mon Jan 27 04:11:15 2003 EDT

  Modified files:  
/php4/ext/hyperwave hw.c 
  Log:
  - fixed several bugs in hw_document_xx() functions. The macro to access
the document was the same as for a link to the sever.
  
  
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.117 php4/ext/hyperwave/hw.c:1.118
--- php4/ext/hyperwave/hw.c:1.117   Fri Jan 24 11:39:48 2003
+++ php4/ext/hyperwave/hw.c Mon Jan 27 04:11:15 2003
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: hw.c,v 1.117 2003/01/24 16:39:48 iliaa Exp $ */
+/* $Id: hw.c,v 1.118 2003/01/27 09:11:15 steinm Exp $ */
 
 #include 
 #include 
@@ -154,8 +154,8 @@
 #define HW_FETCH_ID(hw_zval) \
convert_to_long_ex(hw_zval); \
id = Z_LVAL_PP(hw_zval); \
-   ptr = zend_list_find(id, &type); \
-   if(!ptr || (type != le_socketp && type != le_psocketp)) { \
+   ptr = (hw_document *) zend_list_find(id, &type); \
+   if(!ptr || (type != le_document)) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find file 
identifier %d", id); \
RETURN_FALSE; \
}
@@ -983,14 +983,14 @@
 PHP_FUNCTION(hw_close)
 {
zval **arg1;
-   int id, type;
+   int link, type;
hw_connection *ptr;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
}
-   HW_FETCH_ID(arg1);
-   zend_list_delete(id);
+   HW_FETCH_LINK(arg1);
+   zend_list_delete(link);
RETURN_TRUE;
 }
 /* }}} */
@@ -1000,14 +1000,14 @@
 PHP_FUNCTION(hw_info)
 {
pval **arg1;
-   int id, type;
+   int link, type;
hw_connection *ptr;
char *str;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
}
-   HW_FETCH_ID(arg1);
+   HW_FETCH_LINK(arg1);
if(NULL != (str = get_hw_info(ptr))) {
/*
php_printf("%s\n", str);
@@ -1027,13 +1027,13 @@
 PHP_FUNCTION(hw_error)
 {
pval **arg1;
-   int id, type;
+   int link, type;
hw_connection *ptr;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
}
-   HW_FETCH_ID(arg1);
+   HW_FETCH_LINK(arg1);
RETURN_LONG(ptr->lasterror);
 }
 /* }}} */
@@ -1043,14 +1043,14 @@
 PHP_FUNCTION(hw_errormsg)
 {
pval **arg1;
-   int id, type;
+   int link, type;
hw_connection *ptr;
char errstr[100];
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
WRONG_PARAM_COUNT;
}
-   HW_FETCH_ID(arg1);
+   HW_FETCH_LINK(arg1);
 
switch (ptr->lasterror) {
case 0:



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php4 /ext/standard string.c

2003-01-27 Thread Jani Taskinen 

MFH??

--Jani


On Fri, 24 Jan 2003, Andrey Hristov wrote:

>andrey Fri Jan 24 08:18:09 2003 EDT
>
>  Modified files:  
>/php4/ext/standard string.c 
>  Log:
>  Resolving problem on OSF1 and probably other
>  64 bit platforms. Thanks for the feedback of Magnus (novell kiruna se).
>  
>  
>Index: php4/ext/standard/string.c
>diff -u php4/ext/standard/string.c:1.350 php4/ext/standard/string.c:1.351
>--- php4/ext/standard/string.c:1.350   Fri Jan 24 07:19:59 2003
>+++ php4/ext/standard/string.c Fri Jan 24 08:18:08 2003
>@@ -18,7 +18,7 @@
>+--+
>  */
> 
>-/* $Id: string.c,v 1.350 2003/01/24 12:19:59 andrey Exp $ */
>+/* $Id: string.c,v 1.351 2003/01/24 13:18:08 andrey Exp $ */
> 
> /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
> 
>@@ -199,7 +199,7 @@
> static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior)
> {
>   char *s11, *s22;
>-  long len1, len2, start, len;
>+  int len1, len2, start, len;
>   
>   start = 0;
>   len = 0;
>
>
>
>

-- 
<- For Sale! ->


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php