This commit was manufactured by cvs2svn to create tag 'php_4_1_0'.

call_user_function_ex()

.gdbinit

@@ -1,285 +0,0 @@
-define dump_bt
-    set $t = $arg0
-    while $t
-		printf "[0x%08x] ", $t
-		if $t->function_state.function->common.function_name
-			printf "%s() ", $t->function_state.function->common.function_name
-		else
-			printf "??? "
-		end
-		if $t->op_array != 0
-			printf "%s:%d ", $t->op_array->filename, $t->opline->lineno
-		end
-		set $t = $t->prev_execute_data
-		printf "\n"
-    end
-end
-
-document dump_bt
-	dumps the current execution stack. usage: dump_bt executor_globals.current_execute_data
-end
-
-define printzv
-	set $ind = 0
-	____printzv $arg0 0 
-end
-
-document printzv
-	prints content of zval 
-end
-
-define ____printzv
-	set $zvalue = $arg0
-
-	if $zvalue->type == 0
-		set $typename = "NULL"
-	end
-	if $zvalue->type == 1
-		set $typename = "long"
-	end
-	if $zvalue->type == 2
-		set $typename = "double"
-	end
-	if $zvalue->type == 3
-		set $typename = "string"
-	end
-	if $zvalue->type == 4
-		set $typename = "array"
-	end
-	if $zvalue->type == 5
-		set $typename = "object"
-	end
-	if $zvalue->type == 6
-		set $typename = "bool"
-	end
-	if $zvalue->type == 7
-		set $typename = "resource"
-	end
-	if $zvalue->type == 8 
-		set $typename = "constant"
-	end
-	if $zvalue->type == 9
-		set $typename = "const_array"
-	end
-
-	printf "[0x%08x] ", $zvalue
-
-	if $zvalue == executor_globals.uninitialized_zval_ptr
-		printf "*uninitialized* "
-	end
-	printf "(refcount=%d) %s: ", $zvalue->refcount, $typename
-	if $zvalue->type == 1
-		printf "%ld", $zvalue->value.lval
-	end
-	if $zvalue->type == 2
-		printf "%lf", $zvalue->value.dval
-	end
-	if $zvalue->type == 3
-		printf "\"%s\"(%d)", $zvalue->value.str.val, $zvalue->value.str.len
-	end
-	if $zvalue->type == 4
-		if ! $arg1
-			printf "{\n"
-			set $ind = $ind + 1
-			____print_ht $zvalue->value.ht
-			set $ind = $ind - 1
-			set $i = $ind
-			while $i > 0
-				printf "  "
-				set $i = $i - 1
-			end
-			printf "}"
-		end
-	end
-	if $zvalue->type == 5
-		if ! $arg1
-			printf "(prop examination disabled due to a gdb bug)"
-#			set $ht = $zvalue->value.obj.handlers->get_properties($zvalue)
-#			printf "{\n"
-#			set $ind = $ind + 1
-#			____print_ht $ht
-#			set $ind = $ind - 1
-#			set $i = $ind
-#			while $i > 0
-#				printf "  "
-#				set $i = $i - 1
-#			end
-#			printf "}"
-		end
-	end
-	if $zvalue->type == 6
-		if $zvalue->lval
-			printf "true"
-		else
-			printf "false"
-		end
-	end
-	if $zvalue->type == 7
-		printf "#%d", $zvalue->value.lval
-	end
-	printf "\n"
-end
-
-define ____print_ht
-	set $ht = $arg0
-	set $p = $ht->pListHead
-
-	while $p != 0
-		set $zval = *(struct _zval_struct **)$p->pData
-
-		set $i = $ind
-		while $i > 0
-			printf "  "
-			set $i = $i - 1
-		end
-
-		if $p->nKeyLength > 0 
-			printf "\"%s\" => ", $p->arKey
-		else
-			printf "%d => ", $p->h
-		end
-
-		____printzv $zval 1
-		set $p = $p->pListNext
-	end
-end
-
-define print_ht
-	set $ind = 1
-	printf "[0x%08x] {\n", $arg0
-	____print_ht $arg0
-	printf "}\n"
-end
-
-document print_ht
-	dumps elements of HashTable made of zval
-end
-
-define printzn
-	set $ind = 0
-	set $znode = $arg0
-	if $znode->op_type == 1
-		set $optype = "IS_CONST"
-	end
-	if $znode->op_type == 2 
-		set $optype = "IS_TMP_VAR"
-	end
-	if $znode->op_type == 4 
-		set $optype = "IS_VAR"
-	end
-	if $znode->op_type == 8
-		set $optype = "IS_UNUSED"
-	end
-
-	printf "[0x%08x] %s", $znode, $optype
-
-	if $znode->op_type == 1
-		printf ": "
-		____printzv &$znode->u.constant
-	end
-	if $znode->op_type == 2
-		printf ": "
-		set $tvar = (union _temp_variable *)((char *)executor_globals.current_execute_data->Ts + $znode->u.var)
-		____printzv ((union _temp_variable *)$tvar)->tmp_var
-	end
-	if $znode->op_type == 4
-		printf ": "
-		set $tvar = (union _temp_variable *)((char *)executor_globals.current_execute_data->Ts + $znode->u.var)
-		____printzv *$tvar->var.ptr_ptr
-	end
-	if $znode->op_type == 8
-		printf "\n"
-	end
-end
-
-document printzn
-	print type and content of znode.
-	usage: printzn &opline->op1 
-end
-
-define printzops
-	printf "op1 => " 
-	printzn &execute_data->opline.op1
-	printf "op2 => "
-	printzn &execute_data->opline.op2
-	printf "result => "
-	printzn &execute_data->opline.result
-end
-
-document printzops
-	dump operands of the current opline
-end
-
-define zmemcheck
-	set $p = alloc_globals.head
-	set $stat = "?"
-	set $total_size = 0
-	if $arg0 != 0
-		set $not_found = 1
-	else
-		set $not_found = 0
-	end
-	printf " block      size      status file:line\n"
-	printf "-------------------------------------------------------------------------------\n"
-	while $p
-		set $aptr = $p + sizeof(struct _zend_mem_header) + sizeof(align_test)
-		if $arg0 == 0 || (void *)$aptr == (void *)$arg0
-			if $p->magic == 0x7312f8dc 
-				set $stat = "OK"
-			end
-			if $p->magic == 0x99954317
-				set $stat = "FREED"
-			end
-			if $p->magic == 0xfb8277dc
-				set $stat = "CACHED"
-			end
-			set $filename = strrchr($p->filename, '/')
-			if !$filename
-				set $filename = $p->filename
-			else
-				set $filename = $filename + 1
-			end
-			printf " 0x%08x ", $aptr
-			if $p->size == sizeof(struct _zval_struct) && ((struct _zval_struct *)$aptr)->type >= 0 && ((struct _zval_struct *)$aptr)->type < 10
-				printf "ZVAL?(%-2d) ", $p->size
-			else
-				printf "%-9d ", $p->size
-			end
-			set $total_size = $total_size + $p->size
-			printf "%-06s %s:%d", $stat, $filename, $p->lineno
-			if $p->orig_filename
-				set $orig_filename = strrchr($p->orig_filename, '/')
-				if !$orig_filename
-					set $orig_filename = $p->orig_filename
-				else
-					set $orig_filename = $orig_filename + 1
-				end
-				printf " <= %s:%d\n", $orig_filename, $p->orig_lineno
-			else
-				printf "\n"
-			end
-			if $arg0 != 0
-				set $p = 0
-				set $not_found = 0
-			else
-				set $p = $p->pNext
-			end
-		else
-			set $p = $p->pNext
-		end
-	end
-	if $not_found
-		printf "no such block that begins at 0x%08x.\n", $aptr 
-	end
-	if $arg0 == 0
-		printf "-------------------------------------------------------------------------------\n"
-		printf "     total: %d bytes\n", $total_size
-	end
-end
-
-document zmemcheck
-	show status of a memory block.
-	usage: zmemcheck [ptr].
-	if ptr is 0, all blocks will be listed.
-end
-

CODING_STANDARDS

@@ -13,8 +13,6 @@ these rules.
 Code Implementation
 -------------------
 
-[0] Document your code in source files and the manual. [tm]
-
 [1] Functions that are given pointers to resources should not free them
 
 For instance, function int mail(char *to, char *from) should NOT free
@@ -48,92 +46,20 @@ Exceptions:
     doing so, should return that new length, so it doesn't have to be
     recalculated with strlen() (e.g. php_addslashes())
 
-[5] Use php_error_docref() group of functions to report any errors/warnings 
-    during code execution. Use descriptive error messages, and try to avoid 
-    using identical error strings for different stages of an error. For 
-    example, if in order to obtain a URL you have to parse the URL, connect,
-    and retreive the text, assuming something can go wrong at each of these 
-    stages, don't report an error "Unable to get URL" on all of them, but 
-    instead, write something like "Unable to parse URL", "Unable to connect 
-    to URL server" and "Unable to fetch URL text", respectively.
-
-    It has been silently agreed to prefix every php_error() message with the
-    name of the current function if applicable:
-
-    php_error(E_WHATEVER, "%s(): Desc.", get_active_function_name(TSRMLS_C));
-
-    This can be done automatically using php_error_docref(). The first
-    parameter, docref, is either NULL or the URL of a page describing the 
-    error in detail. In most cases you will pass NULL, to generate the URL
-    from the name of the function being executed:
-
-    php_error_docref(NULL TSRMLS_CC, E_WHATEVER, "Desc.");
-
-    If you pass a URL, it can either be a full URL beginning with "http://":
-
-    php_error_docref("http://externalsite.tld/page.ext#error" 
-                     TSRMLS_CC, E_WHATEVER, "Desc.");
-
-    Or the name of a manual page without file extension, but with an optional 
-    target anchor. Or simply the anchor within the manual page of the current
-    function. When using function names you must replace '_' by '-':
-
-    php_error_docref("function.ext-func#error" TSRMLS_CC, E_WHATEVER, "Desc.");
-
-    To display one or two important parameters after the function name, use 
-    php_error_docref1() or php_error_docref2(). For example, file functions 
-    should display the name of the file opened:
-
-    php_error_docref1("function.fopen" TSRMLS_CC, filename, 
-                      E_WHATEVER, "Desc.");
-
-    php_error_docref2("function.fopen" TSRMLS_CC, filename, openmode, 
-                      E_WHATEVER, "Desc.");
-
-    Fixing ("unifying") existing php_error() message is a good thing [tm].
+[5] Use php_error() to report any errors/warnings during code execution.
+    Use descriptive error messages, and try to avoid using identical
+    error strings for different stages of an error.  For example,
+    if in order to obtain a URL you have to parse the URL, connect,
+    and retreive the text, assuming something can go wrong at each
+    of these stages, don't report an error "Unable to get URL"
+    on all of them, but instead, write something like "Unable
+    to parse URL", "Unable to connect to URL server" and "Unable
+    to fetch URL text", respectively.
 
 [6] NEVER USE strncat().  If you're absolutely sure you know what you're doing,
     check its man page again, and only then, consider using it, and even then,
     try avoiding it.
 
-[7] Use PHP_* macros in the PHP source, and ZEND_* macros in the Zend
-    part of the source. Although the PHP_* macro's are mostly aliased to the
-    ZEND_* macros it gives a better understanding on what kind of macro you're
-    calling.
-
-[8] Use assert(). assert.h is included in php.h if it is available.  Not only
-    does good assertion catch bugs, but it also helps with code readability.
-     - Do not use assert for error handling. Use assert only for the 
-       condition that must be always true.
-     - Do not use assignments in assert conditions.  If you assign inside an 
-       assert condition, you risk an elusive bug that would be very difficult 
-       to spot in a debug build, due to the side effect of the assignment.  
-       Function calls in assert conditions may also cause this problem, if 
-       they modify one of their arguments or global variables.
-
-[9] When commenting out code using a #if statement, do NOT use 0 only. Instead
-    use "<cvs username here>_0". For example, #if FOO_0, where FOO is your
-    cvs user foo.  This allows easier tracking of why code was commented out, 
-    especially in bundled libraries.  
-
-[10] Do not define functions that are not available.  For instance, if a
-     library is missing a function, do not define the PHP version of the
-     function, and do not raise a run-time error about the function not
-     existing.  End users should use function_exists() to test for the
-     existence of a function
-
-[11] Prefer emalloc(), efree(), estrdup(), etc. to their standard C library
-     counterparts.  These functions implement an internal "safety-net"
-     mechanism that ensures the deallocation of any unfreed memory at the
-     end of a request.  They also provide useful allocation and overflow
-     information while running in debug mode.
-
-     In almost all cases, memory returned to the engine must be allocated
-     using emalloc().
-
-     The use of malloc() should be limited to cases where a third-party
-     library may need to control or free the memory, or when the memory in
-     question needs to survive between multiple requests.
 
 Naming Conventions
 ------------------
@@ -185,7 +111,7 @@ Naming Conventions
     avoided, except for places where the variable has no real meaning or
     a trivial meaning (e.g. for (i=0; i<100; i++) ...).
 
-[5] Variable names should be in lowercase.  Use underscores to separate
+[5] Variable names should be in lowercase;  Use underscores to seperate
     between words.
 
 
@@ -206,22 +132,20 @@ Syntax and indentation
     at the very least, when you write code that goes into the core
     of PHP or one of its standard modules, please maintain the K&R
     style.  This applies to just about everything, starting with
-    indentation and comment styles and up to function declaration
+    indentation and comment styles and up to function decleration
     syntax.
-
-    (see also http://www.tuxedo.org/~esr/jargon/html/entry/indent-style.html)
     
 [3] Be generous with whitespace and braces.  Always prefer:
 
-    if (foo) {
-        bar;
-    }
+	if (foo) {
+		bar;
+	}
 
-    to:
+	to:
 
-    if(foo)bar;
+	if(foo)bar;
 
-    Keep one empty line between the variable declaration section and
+    Keep one empty line between the variable decleration section and
     the statements in a block, as well as between logical statement
     groups in a block.  Maintain at least one empty line between
     two functions, preferably two.
@@ -239,7 +163,7 @@ prototype before it along with a brief one-line description of what the
 function does.  It would look like this:
 
 /* {{{ proto int abs(int number)
-   Returns the absolute value of the number */
+   Return the absolute value of the number */
 PHP_FUNCTION(abs)
 {
    ...
@@ -260,7 +184,7 @@ messing up the function summary.
 Optional arguments are written like this:
 
 /* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length [, string default_host]]])
-   Returns a header object with the defined parameters */
+   Returns a header object with the defined parameters. */
 
 And yes, please keep the prototype on a single line, even if that line
 is massive.
@@ -275,14 +199,14 @@ standard prefixing conventions during their initial implementation.
 
 The file labelled 'EXPERIMENTAL' should include the following
 information:
-   Any authoring information (known bugs, future directions of the module).
+   Any authoring infomration (known bugs, future directions of the module).
    Ongoing status notes which may not be appropriate for CVS comments.
 
 Aliases & Legacy Documentation
 -----------------------------------
 You may also have some deprecated aliases with close to duplicate
 names, for example, somedb_select_result and somedb_selectresult. For
-documentation purposes, these will only be documented by the most
+documentation puposes, these will only be documented by the most
 current name, with the aliases listed in the documentation for
 the parent function. For ease of reference, user-functions with
 completely different names, that alias to the same function (such as
@@ -291,4 +215,4 @@ proto should still be included, describing which function is aliased.
 
 Backwards compatible functions and names should be maintained as long
 as the code can be reasonably be kept as part of the codebase. See
-/phpdoc/README for more information on documentation.
+/phpdoc/README for me information on documentation.

CREDITS

@@ -1,2 +1,2 @@
-For the list of people who've put work into PHP, please see
+For the list of people who've put work into PHP 4.0, please see
 http://www.php.net/credits.php

EXTENSIONS

@@ -36,11 +36,6 @@ PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           apache2
-PRIMARY MAINTAINER:  Aaron Bannert <aaron@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
--------------------------------------------------------------------------------
 EXTENSION:           cgi
 MAINTENANCE:         Unknown
 STATUS:              Working
@@ -78,11 +73,6 @@ EXTENSION:           thttpd
 MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           webjames
-PRIMARY MAINTAINER:  Alex Waugh <alex@alexwaugh.com>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
--------------------------------------------------------------------------------
 
 
 == Database extensions ==
@@ -98,13 +88,6 @@ PRIMARY MAINTAINER:  Jim Winstead <jimw@php.net>
 MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           dbx
-PRIMARY MAINTAINER:  Marc Boeren <M.Boeren@guidance.nl>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               4.0.6
-COMMENT:             DB abstraction for odbc, mysql, pgsql, mssql, fbsql and more, see documentation
--------------------------------------------------------------------------------
 EXTENSION:           filepro
 MAINTENANCE:         Unknown
 STATUS:              Unknown
@@ -134,12 +117,6 @@ EXTENSION:           msql
 MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           msession
-PRIMARY MAINTAINER   Mark L. Woodward mlwmohawk@mohawksoft.com
-MAINTENANCE:         Maintained
-STATUS:              Working/Experimental
-COMMENT:             Tested on Linux, should work on other UNIX platforms. Backend server code can compile under Windows.
--------------------------------------------------------------------------------
 EXTENSION:           mssql
 PRIMARY MAINTAINER:  Frank M. Kromann <fmk@swwwing.com>
 MAINTENANCE:         Maintained
@@ -147,15 +124,13 @@ STATUS:              Working
 COMMENT:             Tested on phpts and isapi versions
 -------------------------------------------------------------------------------
 EXTENSION:           mysql
-PRIMARY MAINTAINER:  Zak Greant <zak@mysql.com>, Georg Richter <georg@php.net>
-MAINTENANCE:         Maintained
+MAINTENANCE:         Unknown
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           pgsql
-PRIMARY MAINTAINER:  Yasuo Ohgaki <yohgaki@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Jouni Ahto <jouni.ahto@exdec.fi>
+MAINTENANCE:         Odd fixes
 STATUS:              Working
-COMMENT:             Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less have fatal bug.
 -------------------------------------------------------------------------------
 EXTENSION:           sybase
 MAINTENANCE:         Unknown
@@ -171,10 +146,10 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           odbc
-PRIMARY MAINTAINER:  Daniel R. Kalowsky <kalowsky@php.net>
+PRIMARY MAINTAINER:  Andreas Karajannis <Karajannis@gmd.de>
 MAINTENANCE:         Maintained
 STATUS:              Working
-COMMENT:             Working 
+COMMENT:             Working except for persistent connections
 -------------------------------------------------------------------------------
 EXTENSION:           oracle
 PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
@@ -197,32 +172,18 @@ MAINTENANCE:         Unknown
 STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           bz2
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
-MAINTENANCE:         Odd Fixes
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Maintained
 STATUS:              Working
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
-EXTENSION:           dio
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Orphaned
-STATUS:              Working
-SINCE:               4.0.6
--------------------------------------------------------------------------------
-EXTENSION:           cyrus
-PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Orphaned
-STATUS:              Working
-SINCE:               4.0.6
--------------------------------------------------------------------------------
 EXTENSION:           calendar
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           com
-PRIMARY MAINTAINER:  Harald Radi <h.radi@nme.at>
-MAINTENANCE:         Maintained
-STATUS:              Working
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           cpdf
 PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
@@ -234,11 +195,6 @@ MAINTENANCE:         Unknown
 STATUS:              Experimental
 SINCE:               4.0.5
 -------------------------------------------------------------------------------
-EXTENSION:           ctype
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
 EXTENSION:           curl
 PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
 MAINTENANCE:         Maintained
@@ -261,25 +217,18 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 -------------------------------------------------------------------------------
 EXTENSION:           exif
-PRIMARY MAINTAINER:  Marcus Boerger <helly@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
-SINCE:               4.2
+MAINTENANCE:         Unknown
+STATUS:              Unknown
+SINCE:               4.0.1
 -------------------------------------------------------------------------------
 EXTENSION:           fdf
 PRIMARY MAINTAINER:  Uwe Steinmann <steinm@php.net>
 MAINTENANCE:         Maintained
 STATUS:              Unknown
 -------------------------------------------------------------------------------
-EXTENSION:           fribidi
-PRIMARY MAINTAINER:  Tal Peer <tal@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
 EXTENSION:           ftp
-PRIMARY MAINTAINER:  Stefan Esser (sesser@php.net)
-MAINTENANCE:         Maintained
-STATUS:              Working
+MAINTENANCE:         Unknown
+STATUS:              Unknown
 -------------------------------------------------------------------------------
 EXTENSION:           gd
 PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
@@ -299,11 +248,6 @@ EXTENSION:           icap
 MAINTENANCE:         Unknown
 STATUS:              Obsolete
 -------------------------------------------------------------------------------
-EXTENSION:           iconv
-PRIMARY MAINTAINER:  Moriyoshi Koizumi <moriyoshi@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
 EXTENSION:           imap
 PRIMARY MAINTAINER:  Chuck Hagenbuch <chuck@horde.org>
 MAINTENANCE:         Odd Fixes
@@ -315,13 +259,8 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           ldap
-PRIMARY MAINTAINER:  Stig Venaas <venaas@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Working
--------------------------------------------------------------------------------
-EXTENSION:           mbstring
-PRIMARY MAINTAINER:  Rui Hirokawa <hirokawa@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Rasmus Lerdorf <rasmus@php.net>
+MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mcal
@@ -330,7 +269,7 @@ MAINTENANCE:         Odd Fixes
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           mcrypt
-PRIMARY MAINTAINER:  Derick Rethans <d.rethans@jdimedia.nl>
+PRIMARY MAINTAINER:  Sascha Schumann <sascha@schumann.cx>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -352,13 +291,8 @@ MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.4
 -------------------------------------------------------------------------------
-EXTENSION:           overload
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
-MAINTENANCE:         Maintained
-STATUS:              Experimental
--------------------------------------------------------------------------------
 EXTENSION:           pcre
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -407,7 +341,7 @@ STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           sablot
 PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Obsolete
+MAINTENANCE:         Maintained
 STATUS:              Experimental
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
@@ -423,8 +357,8 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           shmop
-PRIMARY MAINTAINER:  Ilia Alshanetsky <iliaa@php.net>
-MAINTENANCE:         Maintained
+PRIMARY MAINTAINER:  Unknown
+MAINTENANCE:         Unknown
 STATUS:              Experimental
 SINCE:               4.0.3
 -------------------------------------------------------------------------------
@@ -441,8 +375,8 @@ SINCE:               4.0.2
 -------------------------------------------------------------------------------
 EXTENSION:           swf
 PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
-MAINTENANCE:         Orphaned
-STATUS:              Deprecated (Use the ming swf extension instead)
+MAINTENANCE:         Maintained
+STATUS:              Depreciated (Use the ming swf extension instead)
 COMMENT:             Only for Unix (won't change)
 -------------------------------------------------------------------------------
 EXTENSION:           sysvsem
@@ -459,7 +393,7 @@ STATUS:              Experimental
 SINCE:               4.0.5
 -------------------------------------------------------------------------------
 EXTENSION:           wddx
-PRIMARY MAINTAINER:  Andrei Zmievski <andrei@php.net>
+PRIMARY MAINTAINER:  Andrei Zmievski <andrei@ispi.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
@@ -468,11 +402,6 @@ PRIMARY MAINTAINER:  Thies C. Arntzen <thies@thieso.net>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
-EXTENSION:           xslt
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working (mostly)
--------------------------------------------------------------------------------
 EXTENSION:           yaz
 PRIMARY MAINTAINER:  Adam Dickmeiss <adam@indexdata.dk>
 MAINTENANCE:         Maintained
@@ -489,9 +418,9 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
 EXTENSION:           zziplib
-PRIMARY MAINTAINER:  Hartmut Holzgraefe <hartmut@six.de>
-MAINTENANCE:         Odd Fixes
-STATUS:              Working
+PRIMARY MAINTAINER:  Sterling Hughes <sterling@php.net>
+MAINTENANCE:         Maintained
+STATUS:              Experimental
 SINCE:               4.0.5
 -------------------------------------------------------------------------------
 # iptc?

INSTALL

@@ -1,22 +1,9 @@
-Installation Instructions for PHP 4
------------------------------------
+Installation Instructions for PHP 4.0
+-------------------------------------
 
-STOP!
-
-Before going any further, please remember you are going to find more 
-up to date instructions in the online manual, located here:
-
-http://www.php.net/manual/en/install.apache.php
-
-For Apache 2, instructions and up-to-date information regarding it's
-support status, is available here:
-
-http://www.php.net/manual/en/install.apache2.php
-
-It is strongly recommended that you read the manual page before going
-further. However, for the impatient, here is a quick set of steps that 
-will build PHP as (first) a dynamic Apache module (DSO) for Apache 1.3.x 
-with MySQL support and then a static module.  A more verbose explanation follows.  
+For the impatient here is a quick set of steps that will build PHP as
+first a dynamic Apache module (DSO) for Apache 1.3.x with MySQL support 
+and then a static module.  A more verbose explanation follows.  
 
 For installing PHP on other web servers, refer to one of the following
 files:
@@ -27,26 +14,24 @@ files:
     sapi/thttpd/README
     README.Zeus
 
-Some notes:
+Note!  Only install either the static module or the dynamic one.  Do not
+install both.  
 
-1: Only install either the static module or the dynamic one.  Do not
-   install both.  
+Note 2!  If you are recompiling PHP to add new extensions or upgrading
+something like GD, remove the config.cache file before you re-run 
+configure.
 
-2:  If you are recompiling PHP to add new extensions or upgrading
-    something like GD, remove the config.cache file before you re-run 
-    configure.
+Note 3!  If you are on Linux and have installed shared libraries, make
+sure the location of these shared libraries are listed in your 
+/etc/ld.so.conf file.  For example, if you have:
 
-3:  If you are on Linux and have installed shared libraries, make
-    sure the location of these shared libraries are listed in your 
-    /etc/ld.so.conf file.  For example, if you have:
+  /usr/local/lib/mysql/libmysqlclient.so
 
-       /usr/local/lib/mysql/libmysqlclient.so
+Make sure /etc/ld.so.conf contains:
 
-    Make sure /etc/ld.so.conf contains:
+  /usr/local/lib/mysql
 
-      /usr/local/lib/mysql
-
-    Then run ldconfig.
+Then run ldconfig.
 
 If you want both PHP 3 and 4 modules in the same Apache server, check the
 bottom of this file for instructions.
@@ -67,8 +52,8 @@ Compiled-in modules:
 Chances are you will see a lot more modules than these two. That's ok, 
 as long as mod_so.c shows up you can proceed with the following steps:
 
-$ gunzip -c php-4.x.y.tar.gz | tar xf -
-$ cd php-4.x.y
+$ gunzip -c php-4.0.x.tar.gz | tar xf -
+$ cd php-4.0.x
 $ ./configure --with-mysql --with-apxs
 $ make
 $ make install
@@ -77,9 +62,6 @@ If you get an error telling you that the apxs script could not be found,
 look for it on your system and if you find it, provide the full path to it
 as: --with-apxs=/path/to/apxs
 
-Make sure you specify the version of apxs that is actually installed on
-your system and NOT the one that is in the apache source tarball.
-
 Next you must copy php.ini-dist to the appropriate place (normally
 /usr/local/lib/php.ini) and edit it as necessary to set PHP options.
 
@@ -101,9 +83,9 @@ $ cd apache_1.3.x
 $ ./configure
 $ cd ..
 
-$ gunzip -c php-4.x.y.tar.gz | tar xf -
-$ cd php-4.x.y
-$ ./configure --with-mysql --with-apache=../apache_1.3.x
+$ gunzip -c php-4.0.x.tar.gz | tar xf -
+$ cd php-4.0.x
+$ ./configure --with-mysql --with-apache=../apache_1.3.x --enable-track-vars
 $ make
 $ make install
 
@@ -114,7 +96,7 @@ $ ./configure --prefix=/www --activate-module=src/modules/php4/libphp4.a
 $ make
  (you should now have an httpd binary which you can copy to your Apache bin dir if
   is is your first install then you need to "make install" as well)
-$ cd ../php-4.x.y
+$ cd ../php-4.0.x
 $ cp php.ini-dist /usr/local/lib/php.ini
 You can edit /usr/local/lib/php.ini file to set PHP options.
 Edit your httpd.conf or srm.conf file and add:
@@ -133,12 +115,12 @@ Installing PHP can be done in four simple steps:
 
 1. Unpack your distribution file.  
 
-   You will have downloaded a file named something like php-4.x.y.tar.gz.
-   Unzip this file with a command like: gunzip php-4.x.y.tar.gz
+   You will have downloaded a file named something like php-4.0.x.tar.gz.
+   Unzip this file with a command like: gunzip php-4.0.x.tar.gz
 
-   Next you have to untar it with: tar -xvf php-4.x.y.tar
+   Next you have to untar it with: tar -xvf php-4.0.x.tar
 
-   This will create a php-4.x.y directory.  cd into this new directory.
+   This will create a php-4.0.x directory.  cd into this new directory.
 
 2a. Configure PHP (Dynamic Module) - Skip to 2b if you wish to build
     a static module
@@ -168,9 +150,6 @@ Installing PHP can be done in four simple steps:
    look for it on your system and if you find it, provide the full path to it
    as: --with-apxs=/path/to/apxs
 
-   Make sure you specify the version of apxs that is actually installed on
-   your system and NOT the one that is in the apache source tarball.
-   
    You might also want other flags on this configure line.  --with-mysql
    is just an example.  
 
@@ -401,11 +380,16 @@ WHY DISABLING -fPIC WORKS ON LINUX
 
 USING PHP 3 AND PHP 4 AS CONCURRENT APACHE MODULES
 
-   With some (newer) installations of Apache, it's possible to compile both
-   PHP 3 and PHP 4, and run them concurrently. 
+   Recent operating systems provide the ability to perform versioning and
+   scoping. This features make it possible to let PHP 3 and PHP 4 run as
+   concurrent modules in one Apache server. 
+   
+   This feature is known to work on the following platforms:
 
-   Note, it's only really wise to do this if you need to use the PHP 3 engine
-   to maintain backwards compatibility. 
+   - Linux with recent binutils (binutils 2.9.1.0.25 tested)
+   - Solaris 2.5 or better
+   - FreeBSD (3.2, 4.0 tested)
+   - IRIX64 6.5
    
    To enable it, configure PHP 3 and PHP 4 to use APXS (--with-apxs) and the
    necessary link extensions (--enable-versioning). Otherwise, all standard
@@ -415,8 +399,8 @@ USING PHP 3 AND PHP 4 AS CONCURRENT APACHE MODULES
 				--with-apxs=/apache/bin/apxs \
 				--enable-versioning \
 				--with-mysql \
+				--enable-track-vars
 
-
-
-
+   If this also works on your platform or if you know a way to do it, please
+   report it to our bug database at http://bugs.php.net
 

LICENSE

@@ -1,6 +1,6 @@
 -------------------------------------------------------------------- 
-                  The PHP License, version 3.0
-Copyright (c) 1999 - 2002 The PHP Group. All rights reserved.
+                  The PHP License, version 2.02
+Copyright (c) 1999, 2000 The PHP Group. All rights reserved.
 -------------------------------------------------------------------- 
 
 Redistribution and use in source and binary forms, with or without
@@ -8,38 +8,48 @@ modification, is permitted provided that the following conditions
 are met:
 
   1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
+     notice, this list of conditions and the following disclaimer. 
  
-  2. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in
-     the documentation and/or other materials provided with the
-     distribution.
+  2. Redistributions in binary form must reproduce the above 
+     copyright notice, this list of conditions and the following 
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
  
-  3. The name "PHP" must not be used to endorse or promote products
-     derived from this software without prior written permission. For
-     written permission, please contact group@php.net.
-  
-  4. Products derived from this software may not be called "PHP", nor
-     may "PHP" appear in their name, without prior written permission
-     from group@php.net.  You may indicate that your software works in
-     conjunction with PHP by saying "Foo for PHP" instead of calling
-     it "PHP Foo" or "phpfoo"
+  3. The name "PHP" must not be used to endorse or promote products 
+     derived from this software without prior permission from the 
+     PHP Group.  This does not apply to add-on libraries or tools
+     that work in conjunction with PHP.  In such a case the PHP
+     name may be used to indicate that the product supports PHP.
  
-  5. The PHP Group may publish revised and/or new versions of the
+  4. The PHP Group may publish revised and/or new versions of the
      license from time to time. Each version will be given a
      distinguishing version number.
      Once covered code has been published under a particular version
-     of the license, you may always continue to use it under the terms
-     of that version. You may also choose to use such covered code
-     under the terms of any subsequent version of the license
+     of the license, you may always continue to use it under the
+     terms of that version. You may also choose to use such covered
+     code under the terms of any subsequent version of the license
      published by the PHP Group. No one other than the PHP Group has
      the right to modify the terms applicable to covered code created
      under this License.
 
-  6. Redistributions of any form whatsoever must retain the following
+  5. Redistributions of any form whatsoever must retain the following
      acknowledgment:
      "This product includes PHP, freely available from
-     <http://www.php.net/>".
+     http://www.php.net/".
+
+  6. The software incorporates the Zend Engine, a product of Zend
+     Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the
+     PHP Association (pursuant to a grant from Zend that can be
+     found at http://www.php.net/license/ZendGrant/) for
+     distribution to you under this license agreement, only as a
+     part of PHP.  In the event that you separate the Zend Engine
+     (or any portion thereof) from the rest of the software, or
+     modify the Zend Engine, or any portion thereof, your use of the
+     separated or modified Zend Engine software shall not be governed
+     by this license, and instead shall be governed by the license
+     set forth at http://www.zend.com/license/ZendLicense/. 
+
+
 
 THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
 ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -63,6 +73,3 @@ The PHP Group can be contacted via Email at group@php.net.
 
 For more information on the PHP Group and the PHP project, 
 please see <http://www.php.net>.
-
-This product includes the Zend Engine, freely available at
-<http://www.zend.com>.

Makefile.frag

@@ -1,23 +0,0 @@
-
-#
-# Zend
-#
-
-$(builddir)/zend_language_scanner.lo: $(builddir)/zend_language_parser.h
-$(builddir)/zend_ini_scanner.lo: $(builddir)/zend_ini_parser.h
-
-$(builddir)/zend_language_scanner.c: $(srcdir)/zend_language_scanner.l
-	$(LEX) -Pzend -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_language_scanner.l
-
-$(builddir)/zend_language_parser.h: $(builddir)/zend_language_parser.c
-$(builddir)/zend_language_parser.c: $(srcdir)/zend_language_parser.y
-	$(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o $@
-
-$(builddir)/zend_ini_parser.h: $(builddir)/zend_ini_parser.c
-$(builddir)/zend_ini_parser.c: $(srcdir)/zend_ini_parser.y
-	$(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o $@
-
-$(builddir)/zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l
-	$(LEX) -Pini_ -S$(srcdir)/flex.skl -o$@ -i $(srcdir)/zend_ini_scanner.l
-
-$(builddir)/zend_indent.lo $(builddir)/zend_highlight.lo $(builddir)/zend_compile.lo: $(builddir)/zend_language_parser.h

Makefile.global

@@ -1,68 +0,0 @@
-mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
-INSTALL = $(top_srcdir)/build/shtool install -c
-INSTALL_DATA = $(INSTALL) -m 644
-
-DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
-COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
-
-
-all: $(all_targets) 
-
-build-modules: $(PHP_MODULES)
-
-libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
-
-libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-	$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so
-
-install: $(install_targets)
-
-install-sapi: libphp4.la
-	@echo "Installing PHP SAPI module"
-	-@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
-	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
-		for i in 0.0.0 0.0 0; do \
-			if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
-				$(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
-				break; \
-			fi; \
-		done; \
-	fi
-	@$(INSTALL_IT)
-
-install-modules: build-modules
-	@test -d modules && \
-	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) && \
-	echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/" && \
-	rm -f modules/*.la && \
-	$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) >/dev/null 2>&1 || true
-
-install-tester:
-	@echo "Installing regression tester:     $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/"
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
-	@$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR)
-
-install-su: install-pear install-tester
-
-test: $(SAPI_CLI_PATH)
-	@TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
-	 TEST_PHP_SRCDIR=$(top_srcdir) \
-	 CC="$(CC)" \
-			$(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS)
-
-clean:
-	find . -name \*.lo -o -name \*.o | xargs rm -f
-	find . -name \*.la -o -name \*.a | xargs rm -f 
-	find . -name \*.so | xargs rm -f
-	find . -name .libs -a -type d|xargs rm -rf
-	rm -f libphp4.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
-
-distclean: clean
-	rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php4.spec sapi/apache/libphp4.module buildmk.stamp
-	egrep define'.*include/php' configure|sed 's/.*>//'|xargs rm -f
-	find . -name Makefile | xargs rm -f
-
-.PHONY: all clean install distclean test
-.NOEXPORT:

Makefile.in

@@ -0,0 +1,62 @@
+
+ZEND_DIR = $(srcdir)/Zend
+SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+
+LTLIBRARY_NAME = libphp4.la
+LTLIBRARY_SOURCES = stub.c
+
+LTLIBRARY_DEPENDENCIES = \
+		Zend/libZend.la \
+		sapi/$(PHP_SAPI)/libsapi.la \
+		main/libmain.la \
+		$(REGEX_LIB) \
+		$(EXT_LTLIBS) \
+		$(TSRM_LIB)
+
+LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
+LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
+
+PROGRAM_NAME         = php
+PROGRAM_SOURCES      = stub.c
+PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
+PROGRAM_LDFLAGS      = -export-dynamic	
+PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
+
+targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
+
+install_targets = install-sapi install-modules
+
+include $(top_srcdir)/build/rules.mk
+include $(top_srcdir)/build/library.mk
+include $(top_srcdir)/build/program.mk
+
+install-sapi:
+	@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
+	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+		for i in 0.0.0 0.0 0; do \
+			if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
+				$(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
+				break; \
+			fi; \
+		done; \
+	fi
+	$(INSTALL_IT)
+
+install-modules:
+	@test -d modules && \
+	$(mkinstalldirs) $(INSTALL_ROOT)$(moduledir) && \
+	echo "installing shared modules into $(moduledir)" && \
+	rm -f modules/*.la && \
+	cp modules/* $(INSTALL_ROOT)$(moduledir) >/dev/null 2>&1 || true
+
+install-tester:
+	-$(mkinstalldirs) $(datadir)
+	$(INSTALL) -m 755 $(srcdir)/run-tests.php $(INSTALL_ROOT)$(datadir)
+
+install-pear: install-modules
+	(cd pear && $(MAKE) install)
+
+install-su: install-pear install-tester
+
+.NOEXPORT:

README.CVS-RULES

@@ -1,7 +1,6 @@
 This is the first file you should be reading after you get your CVS account.
 We'll assume you're basically familiar with CVS, but feel free to post
-your questions on the mailing list. Please have a look at 
-http://cvsbook.red-bean.com/ for more detailed information on CVS.
+your questions on the mailing list.
 
 PHP is developed through the efforts of a large number of people.
 Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following
@@ -84,21 +83,12 @@ For datetime.c:
 For string.c:
 (php_trim) Fixed a memory leak resulting from improper use of zval_dtor().
 # Man, that thing was leaking all over the place!
-@- Fixed memory leak in trim(). (Bob)
+@- Memory leak in trim() function has finally been fixed. (Bob)
 
 The lines above marked with @ will go into NEWS file automagically, and the
 # lines will be omitted from the ChangeLog. Alternatively, you might want
 to modify NEWS file directly and not use the @ lines.
 
-If you fix some bugs, you should note the bug ID numbers in your
-commit message. Bug ID should be prefixed by "#" for easier access to
-bug report when developers are browsing CVS via. LXR or Bonsai.
-
-Example:
-
-Fixed pgsql notice handler double free crash bug. Bug #14016
-@ Fixed pgsql notice handler double free crash bug. Bug #14016
-
 If you don't see your messages in ChangeLog and NEWS right away, don't worry!
 These files are updated once a day, so your stuff will not show up until
 somewhat later. Don't go adding stuff to NEWS by hand if you already put @

README.EXT_SKEL

@@ -7,22 +7,17 @@ WHAT IT IS
 
 HOW TO USE IT
 
-  Very simple. First, change to the ext/ directory of the PHP 4 sources. If
-  you just need the basic framework and will be writing all the code in your
-  functions yourself, you can now do
+  Very simple. First, cd do directory ext/ in PHP 4 sources. If you just need
+  the basic framework and will be writing all the code in your functions
+  yourself, you can now do
 
    ./ext_skel --extname=module_name
 
-  and everything you need is placed in directory module_name. 
-
-  [ Note that GNU awk is likely required for this script to work.  Debian 
-    systems seem to default to using mawk, so you may need to change the 
-    #! line in skeleton/create_stubs to use gawk explicitly. ]
-
-  If you don't need to test the existence of any external header files, 
-  libraries or functions in them, the module is already almost ready to be 
-  compiled in PHP.  Just remove 3 comments in your_module_name/config.m4, 
-  change back up to PHP sources top directory, and do
+  and everything you need is placed in directory module_name. In fact, if you
+  don't need to test the existence of any external header files, libraries or
+  functions in them, the module is already almost ready to be compiled in PHP.
+  Just remove 3 comments in your_module_name/config.m4, cd back up to PHP
+  sources top directory, and do
 
     ./buildconf; ./configure --enable-module_name; make
 
@@ -38,7 +33,7 @@ HOW TO USE IT
 FORMAT OF FUNCTION DEFINITIONS FILE
 
   All the definitions must be on one line. In it's simplest form, it's just
-  the function name, e.g.
+  the function name, ie.
 
     my_function
 

README.PARAMETER_PARSING_API

@@ -1,127 +0,0 @@
-New parameter parsing functions
-===============================
-
-It should be easier to parse input parameters to an extension function.
-Hence, borrowing from Python's example, there are now a set of functions
-that given the string of type specifiers, can parse the input parameters
-and store the results in the user specified variables. This avoids most
-of the IS_* checks and convert_to_* conversions. The functions also
-check for the appropriate number of parameters, and try to output
-meaningful error messages.
-
-
-Prototypes
-----------
-/* Implemented. */
-int zend_parse_parameters(int num_args TSRMLS_DC, char *type_spec, ...);
-int zend_parse_parameters_ex(int flags, int num_args TSRMLS_DC, char *type_spec, ...);
-
-The zend_parse_parameters() function takes the number of parameters
-passed to the extension function, the type specifier string, and the
-list of pointers to variables to store the results in. The _ex() version
-also takes 'flags' argument -- current only ZEND_PARSE_PARAMS_QUIET can
-be used as 'flags' to specify that the function should operate quietly
-and not output any error messages.
-
-Both functions return SUCCESS or FAILURE depending on the result.
-
-The auto-conversions are performed as necessary. Arrays, objects, and
-resources cannot be auto-converted.
-
-
-Type specifiers
----------------
- l	- long
- d	- double
- s	- string (with possible null bytes) and its length
- b	- boolean, stored in zend_bool
- r	- resource (stored in zval)
- a	- array
- o	- object (of any type)
- O	- object (of specific type, specified by class entry)
- z	- the actual zval
-
- The following characters also have a meaning in the specifier string:
-     | - indicates that the remaining parameters are optional, they
-		 should be initialized to default values by the extension since they
-		 will not be touched by the parsing function if they are not
-		 passed to it.
-	 / - use SEPARATE_ZVAL_IF_NOT_REF() on the parameter it follows
-	 ! - the parameter it follows can be of specified type or NULL (only applies
-	     to 'a', 'o', 'O', 'r', and 'z'). If NULL is passed, the results
-		 pointer is set to NULL as well.
-
-Examples
---------
-/* Gets a long, a string and its length, and a zval */
-long l;
-char *s;
-int s_len;
-zval *param;
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
-						  &l, &s, &s_len, &param) == FAILURE) {
-	return;
-}
-
-
-/* Gets an object of class specified by my_ce, and an optional double. */
-zval *obj;
-double d = 0.5;
-zend_class_entry my_ce;
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|d",
-						  &obj, my_ce, &d) == FAILURE) {
-	return;
-}
-
-
-/* Gets an object or null, and an array.
-   If null is passed for object, obj will be set to NULL. */
-zval *obj;
-zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o!a",
-						  &obj, &arr) == FAILURE) {
-	return;
-}
-
-
-/* Gets a separated array which can also be null. */
-zval *arr;
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
-						  &arr) == FAILURE) {
-	return;
-}
-
-
-/* Get only the first three parameters (useful for varargs functions). */
-zval *z;
-zend_bool b;
-zval *r;
-if (zend_parse_parameters(3 TSRMLS_CC, "zbr!",
-						  &z, &b, &r) == FAILURE) {
-	return;
-}
-
-
-/* Get either a set of 3 longs or a string. */
-long l1, l2, l3;
-char *s;
-/* 
- * The function expects a pointer to a integer in this case, not a long
- * or any other type.  If you specify a type which is larger
- * than a 'int', the upper bits might not be initialized
- * properly, leading to random crashes on platforms like
- * Tru64 or Linux/Alpha.
- */
-int length;
-
-if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
-							 "lll", &l1, &l2, &l3) == SUCCESS) {
-	/* manipulate longs */
-} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
-									"s", &s, &length) == SUCCESS) {
-	/* manipulate string */
-} else {
-	/* output error */
-
-	return;
-}

README.SELF-CONTAINED-EXTENSIONS

@@ -4,9 +4,10 @@ $Id$
 HOW TO CREATE A SELF-CONTAINED PHP EXTENSION
 
   A self-contained extension can be distributed independently of
-  the PHP source. To create such an extension, two things are
+  the PHP source. To create such an extension, three things are
   required:
 
+  - Makefile template (Makefile.in)
   - Configuration file (config.m4)
   - Source code for your module
 
@@ -73,9 +74,28 @@ DEFINING THE NEW EXTENSION
   need to specify anything).
 
 
+CREATING THE MAKEFILE TEMPLATE 
+  
+  The Makefile Template (Makefile.in) contains three lines:
+
+------------------------------------------------------------------------------
+LTLIBRARY_SHARED_NAME = foobar.la
+LTLIBRARY_SOURCES     = foo.c bar.c
+
+include $(top_srcdir)/build/dynlib.mk
+------------------------------------------------------------------------------
+
+  LTLIBRARY_SHARED_NAME specifies the name of the extension.
+  It must be of the form `ext-name.la'.
+
   LTLIBRARY_SOURCES specifies the names of the sources files. You can
   name an arbitrary number of source files here.
 
+  The final include directive includes the build rules (you usually
+  don't need to care about what happens there). rules.mk and other
+  files are installed by phpize which we will cover later.
+
+
 CREATING THE M4 CONFIGURATION FILE
 
   The m4 configuration can perform additional checks. For a 
@@ -87,17 +107,13 @@ PHP_ARG_ENABLE(foobar,whether to enable foobar,
 [  --enable-foobar            Enable foobar])
 
 if test "$PHP_FOOBAR" != "no"; then
-  PHP_NEW_EXTENSION(foobar, foo.c bar.c, $ext_shared)
+  PHP_EXTENSION(foobar, $ext_shared)
 fi
 ------------------------------------------------------------------------------
 
   PHP_ARG_ENABLE will automatically set the correct variables, so
-  that the extension will be enabled by PHP_NEW_EXTENSION in shared mode.
+  that the extension will be enabled by PHP_EXTENSION in shared mode.
 
-  The first argument of PHP_NEW_EXTENSION describes the name of the
-  extension.  The second names the source-code files.  The third passes
-  $ext_shared which is set by PHP_ARG_ENABLE/WITH to PHP_NEW_EXTENSION.
-  
   Please use always PHP_ARG_ENABLE or PHP_ARG_WITH. Even if you do not
   plan to distribute your module with PHP, these facilities allow you
   to integrate your module easily into the main PHP module framework.
@@ -115,9 +131,8 @@ CREATING SOURCE FILES
 
 CREATING THE SELF-CONTAINED EXTENSION
 
-  Put config.m4 and the source files into one directory. Then, run phpize
-  (this is installed during make install by PHP 4.0).
-
+  Put Makefile.in, config.m4 and the source files into one directory.
+  Then run phpize (this is installed during make install by PHP 4.0).
   For example, if you configured PHP with --prefix=/php, you would run
 
      $ /php/bin/phpize
@@ -142,13 +157,17 @@ ADDING SHARED MODULE SUPPORT TO A MODULE
   support to an existing module called foo.
 
   1. In config.m4, use PHP_ARG_WITH/PHP_ARG_ENABLE. Then you will
-     automatically be able to use --with-foo=shared[,..] or
-     --enable-foo=shared[,..].
+     automatically be able to use --with-foo=shared or
+     --enable-foo=shared.
 
-  2. In config.m4, use PHP_NEW_EXTENSION(foo,.., $ext_shared) to enable
+  2. In config.m4, use PHP_EXTENSION(foo, $ext_shared) to enable
      building the extension.
 
-  3. Add the following lines to your C source file:
+  3. Add the following line to Makefile.in:
+
+        LTLIBRARY_SHARED_NAME = foo.la
+
+  4. Add the following lines to your C source file:
 
         #ifdef COMPILE_DL_FOO
         ZEND_GET_MODULE(foo)

README.STREAMS

@@ -2,17 +2,16 @@ An Overview of the PHP Streams abstraction
 ==========================================
 $Id$
 
-WARNING: some prototypes in this file are out of date.
-The information contained here is being integrated into
-the PHP manual - stay tuned...
-
 Please send comments to: Wez Furlong <wez@thebrainroom.com>
 
+Note: this doc is preliminary and is intended to give the reader an idea of
+how streams work and should be used.
+
 Why Streams?
 ============
 You may have noticed a shed-load of issock parameters flying around the PHP
 code; we don't want them - they are ugly and cumbersome and force you to
-special case sockets and files every time you need to work with a "user-level"
+special case sockets and files everytime you need to work with a "user-level"
 PHP file pointer.
 Streams take care of that and present the PHP extension coder with an ANSI
 stdio-alike API that looks much nicer and can be extended to support non file
@@ -27,9 +26,7 @@ The main functions are:
 
 PHPAPI size_t php_stream_read(php_stream * stream, char * buf, size_t count);
 PHPAPI size_t php_stream_write(php_stream * stream, const char * buf, size_t
-        count);
-PHPAPI size_t php_stream_printf(php_stream * stream TSRMLS_DC, 
-        const char * fmt, ...);
+	  	count);
 PHPAPI int php_stream_eof(php_stream * stream);
 PHPAPI int php_stream_getc(php_stream * stream);
 PHPAPI char *php_stream_gets(php_stream * stream, char *buf, size_t maxlen);
@@ -39,123 +36,20 @@ PHPAPI int php_stream_seek(php_stream * stream, off_t offset, int whence);
 PHPAPI off_t php_stream_tell(php_stream * stream);
 
 These (should) behave in the same way as the ANSI stdio functions with similar
-names: fread, fwrite, fprintf, feof, fgetc, fgets, fclose, fflush, fseek, ftell.
+names: fread, fwrite, feof, fgetc, fgets, fclose, fflush, fseek, ftell.
 
 Opening Streams
 ===============
-In most cases, you should use this API:
+Ultimately, I aim to implement an fopen_wrapper-like call to do this with
+minimum fuss.
+Currently, mostly for testing purposes, you can use php_stream_fopen to open a
+stream on a regular file.
 
-PHPAPI php_stream *php_stream_open_wrapper(char *path, char *mode,
-    int options, char **opened_path TSRMLS_DC);
+PHPAPI php_stream * php_stream_fopen(const char * filename, const char *
+		mode);
 
-Where:
-    path is the file or resource to open.
-    mode is the stdio compatible mode eg: "wb", "rb" etc.
-    options is a combination of the following values:
-        IGNORE_PATH  (default) - don't use include path to search for the file
-        USE_PATH        - use include path to search for the file
-        IGNORE_URL      - do not use plugin wrappers
-        REPORT_ERRORS   - show errors in a standard format if something
-                          goes wrong.
-        STREAM_MUST_SEEK - If you really need to be able to seek the stream
-                           and don't need to be able to write to the original
-                           file/URL, use this option to arrange for the stream
-                           to be copied (if needed) into a stream that can
-                           be seek()ed.
-                           
-    opened_path is used to return the path of the actual file opened,
-    but if you used STREAM_MUST_SEEK, may not be valid.  You are
-    responsible for efree()ing opened_path.  opened_path may be (and usually
-    is) NULL.
-
-If you need to open a specific stream, or convert standard resources into
-streams there are a range of functions to do this defined in php_streams.h.
-A brief list of the most commonly used functions:
-
-PHPAPI php_stream *php_stream_fopen_from_file(FILE *file, const char *mode);
-    Convert a FILE * into a stream.
-
-PHPAPI php_stream *php_stream_fopen_tmpfile(void);
-    Open a FILE * with tmpfile() and convert into a stream.
-
-PHPAPI php_stream *php_stream_fopen_temporary_file(const char *dir,
-    const char *pfx, char **opened_path TSRMLS_DC);
-    Generate a temporary file name and open it.
-
-There are some network enabled relatives in php_network.h:
-
-PHPAPI php_stream *php_stream_sock_open_from_socket(int socket, int persistent);
-    Convert a socket into a stream.
-
-PHPAPI php_stream *php_stream_sock_open_host(const char *host, unsigned short port,
-		int socktype, int timeout, int persistent);
-    Open a connection to a host and return a stream.
-
-PHPAPI php_stream *php_stream_sock_open_unix(const char *path, int persistent,
-    struct timeval *timeout);
-    Open a UNIX domain socket.
-   
-
-Stream Utilities
-================
-
-If you need to copy some data from one stream to another, you will be please
-to know that the streams API provides a standard way to do this:
-
-PHPAPI size_t php_stream_copy_to_stream(php_stream *src,
-    php_stream *dest, size_t maxlen);
-
-If you want to copy all remaining data from the src stream, pass
-PHP_STREAM_COPY_ALL as the maxlen parameter, otherwise maxlen indicates the
-number of bytes to copy.
-This function will try to use mmap where available to make the copying more
-efficient.
-
-If you want to read the contents of a stream into an allocated memory buffer,
-you should use:
-
-PHPAPI size_t php_stream_copy_to_mem(php_stream *src, char **buf,
-    size_t maxlen, int persistent);
-
-This function will set buf to the address of the buffer that it allocated,
-which will be maxlen bytes in length, or will be the entire length of the
-data remaining on the stream if you set maxlen to PHP_STREAM_COPY_ALL.
-The buffer is allocated using pemalloc(); you need to call pefree() to
-release the memory when you are done.
-As with copy_to_stream, this function will try use mmap where it can.
-
-If you have an existing stream and need to be able to seek() it, you
-can use this function to copy the contents into a new stream that can
-be seek()ed:
-
-PHPAPI int php_stream_make_seekable(php_stream *origstream, php_stream **newstream);
-
-It returns one of the following values:
-#define PHP_STREAM_UNCHANGED	0 /* orig stream was seekable anyway */
-#define PHP_STREAM_RELEASED		1 /* newstream should be used; origstream is no longer valid */
-#define PHP_STREAM_FAILED		2 /* an error occurred while attempting conversion */
-#define PHP_STREAM_CRITICAL		3 /* an error occurred; origstream is in an unknown state; you should close origstream */
-
-make_seekable will always set newstream to be the stream that is valid
-if the function succeeds.
-When you have finished, remember to close the stream.
-
-NOTE: If you only need to seek forward, there is no need to call this
-function, as the php_stream_seek can emulate forward seeking when the
-whence parameter is SEEK_CUR.
-
-NOTE: Writing to the stream may not affect the original source, so it
-only makes sense to use this for read-only use.
-
-NOTE: If the origstream is network based, this function will block
-until the whole contents have been downloaded.
-
-NOTE: Never call this function with an origstream that is referenced
-as a resource! It will close the origstream on success, and this
-can lead to a crash when the resource is later used/released.
-
-NOTE: If you are opening a stream and need it to be seekable, use the
-STREAM_MUST_SEEK option to php_stream_open_wrapper();
+This call behaves just like fopen(), except it returns a stream instead of a
+FILE *
 
 Casting Streams
 ===============
@@ -165,14 +59,14 @@ You need to "cast" the stream into a FILE*, and this is how you do it:
 FILE * fp;
 php_stream * stream; /* already opened */
 
-if (php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void*)&fp, REPORT_ERRORS) == FAILURE)    {
-    RETURN_FALSE;
+if (php_stream_cast(stream, PHP_STREAM_AS_STDIO, &fp, 1) == FAILURE)	{
+	RETURN_FALSE;
 }
 
 The prototype is:
 
 PHPAPI int php_stream_cast(php_stream * stream, int castas, void ** ret, int
-        show_err);
+		show_err);
 
 The show_err parameter, if non-zero, will cause the function to display an
 appropriate error message of type E_WARNING if the cast fails.
@@ -189,14 +83,8 @@ if you mix ANSI stdio calls on the FILE* with php stream calls on the stream.
 If your system has the fopencookie function, php streams can synthesize a
 FILE* on top of any stream, which is useful for SSL sockets, memory based
 streams, data base streams etc. etc.
-
-In situations where this is not desirable, you should query the stream
-to see if it naturally supports FILE *.  You can use this code snippet
-for this purpose:
-
-    if (php_stream_is(stream, PHP_STREAM_IS_STDIO)) {
-        /* can safely cast to FILE* with no adverse side effects */
-    }
+NOTE: There might be situations where this is not desireable, and we need to
+provide a flag to inform the casting routine of this.
 
 You can use:
 
@@ -205,15 +93,10 @@ PHPAPI int php_stream_can_cast(php_stream * stream, int castas)
 to find out if a stream can be cast, without actually performing the cast, so
 to check if a stream is a socket you might use:
 
-if (php_stream_can_cast(stream, PHP_STREAM_AS_SOCKETD) == SUCCESS)  {
-    /* it can be a socket */
+if (php_stream_can_cast(stream, PHP_STREAM_AS_SOCKETD) == SUCCESS)	{
+	/* it's a socket */
 }
 
-Please note the difference between php_stream_is and php_stream_can_cast;
-stream_is tells you if the stream is a particular type of stream, whereas
-can_cast tells you if the stream can be forced into the form you request.
-The former doesn't change anything, while the later *might* change some
-state in the stream.
 
 Stream Internals
 ================
@@ -226,10 +109,10 @@ underlying implementation.
 The php_streams ops struct consists of pointers to methods that implement
 read, write, close, flush, seek, gets and cast operations.  Of these, an
 implementation need only implement write, read, close and flush.  The gets
-method is intended to be used for streams if there is an underlying method
-that can efficiently behave as fgets.  The ops struct also contains a label
-for the implementation that will be used when printing error messages - the
-stdio implementation has a label of "STDIO" for example.
+method is intended to be used for non-buffered streams if there is an
+underlying method that can efficiently behave as fgets.  The ops struct also
+contains a label for the implementation that will be used when printing error
+messages - the stdio implementation has a label of "STDIO" for example.
 
 The idea is that a stream implementation defines a php_stream_ops struct, and
 associates it with a php_stream using php_stream_alloc.
@@ -238,17 +121,17 @@ As an example, the php_stream_fopen() function looks like this:
 
 PHPAPI php_stream * php_stream_fopen(const char * filename, const char * mode)
 {
-    FILE * fp = fopen(filename, mode);
-    php_stream * ret;
-    
-    if (fp) {
-        ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode);
-        if (ret)
-            return ret;
+	FILE * fp = fopen(filename, mode);
+	php_stream * ret;
+	
+	if (fp)	{
+		ret = php_stream_alloc(&php_stream_stdio_ops, fp, 0, 0, mode);
+		if (ret)
+			return ret;
 
-        fclose(fp);
-    }
-    return NULL;
+		fclose(fp);
+	}
+	return NULL;
 }
 
 php_stream_stdio_ops is a php_stream_ops structure that can be used to handle
@@ -260,7 +143,7 @@ to be passed back to fopen_wrapper (or it's yet to be implemented successor).
 The prototype for php_stream_alloc is this:
 
 PHPAPI php_stream * php_stream_alloc(php_stream_ops * ops, void * abstract,
-        size_t bufsize, int persistent, const char * mode)
+		size_t bufsize, int persistent, const char * mode)
 
 ops is a pointer to the implementation,
 abstract holds implementation specific data that is relevant to this instance
@@ -281,23 +164,10 @@ into a FILE*, so it should be compatible with the mode parameter of fopen().
 Writing your own stream implementation
 ======================================
 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-RULE #1: when writing your own streams: make sure you have configured PHP with
---enable-debug.
-I've taken some great pains to hook into the Zend memory manager to help track
-down allocation problems.  It will also help you spot incorrect use of the
-STREAMS_DC, STREAMS_CC and the semi-private STREAMS_REL_CC macros for function
-definitions.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-RULE #2: Please use the stdio stream as a reference; it will help you
-understand the semantics of the stream operations, and it will always
-be more up to date than these docs :-)
-
 First, you need to figure out what data you need to associate with the
 php_stream.  For example, you might need a pointer to some memory for memory
 based streams, or if you were making a stream to read data from an RDBMS like
-MySQL, you might want to store the connection and rowset handles.
+mysql, you might want to store the connection and rowset handles.
 
 The stream has a field called abstract that you can use to hold this data.
 If you need to store more than a single field of data, define a structure to
@@ -306,9 +176,9 @@ appropriately), and use the abstract pointer to refer to it.
 
 For structured state you might have this:
 
-struct my_state {
-    MYSQL conn;
-    MYSQL_RES * result;
+struct my_state	{
+	MYSQL conn;
+	MYSQL_RES * result;
 };
 
 struct my_state * state = pemalloc(sizeof(struct my_state), persistent);
@@ -327,36 +197,36 @@ Once you have that part figured out, you can write your implementation and
 define the your own php_stream_ops struct (we called it my_ops in the above
 example).
 
-For example, for reading from this weird MySQL stream:
+For example, for reading from this wierd mysql stream:
 
 static size_t php_mysqlop_read(php_stream * stream, char * buf, size_t count)
 {
-    struct my_state * state = (struct my_state*)stream->abstract;
+	struct my_state * state = (struct my_state*)stream->abstract;
 
-    if (buf == NULL && count == 0)  {
-        /* in this special case, php_streams is asking if we have reached the
-         * end of file */
-        if (... at end of file ...)
-            return EOF;
-        else
-            return 0;
-    }
-    
-    /* pull out some data from the stream and put it in buf */
-    ... mysql_fetch_row(state->result) ...
-    /* we could do something strange, like format the data as XML here,
-        and place that in the buf, but that brings in some complexities,
-        such as coping with a buffer size too small to hold the data,
-        so I won't even go in to how to do that here */
+	if (buf == NULL && count == 0)	{
+		/* in this special case, php_streams is asking if we have reached the
+		 * end of file */
+		if (... at end of file ...)
+			return EOF;
+		else
+			return 0;
+	}
+	
+	/* pull out some data from the stream and put it in buf */
+	... mysql_fetch_row(state->result) ...
+	/* we could do something strange, like format the data as XML here,
+		and place that in the buf, but that brings in some complexities,
+		such as coping with a buffer size too small to hold the data,
+		so I won't even go in to how to do that here */
 }
 
 Implement the other operations - remember that write, read, close and flush
 are all mandatory.  The rest are optional.  Declare your stream ops struct:
 
 php_stream_ops my_ops = {
-    php_mysqlop_write, php_mysqlop_read, php_mysqlop_close,
-    php_mysqlop_flush, NULL, NULL, NULL,
-    "Strange MySQL example"
+	php_mysqlop_write, php_mysqlop_read, php_mysqlop_close,
+	php_mysqlop_flush, NULL, NULL, NULL,
+	"Strange mySQL example"
 }
 
 Thats it!
@@ -370,4 +240,4 @@ connection and then use pefree to dispose of the struct you allocated.
 You may read the stream->persistent field to determine if your struct was
 allocated in persistent mode or not.
 
-vim:tw=78:et
+vim:tw=78

README.SUBMITTING_PATCH

@@ -1,126 +0,0 @@
-Submitting Patch for PHP
-========================
-
-This document describes how to submit a patch for PHP. Since you are
-reading this document, you are willing to submit a patch for PHP.
-Please keep reading! Submitting a patch for PHP is easy. The hard
-part is making it acceptable for inclusion into our repository. :-)
-
-How to create patch?  
--------------------- 
-We are working with CVS. You need to get CVS source to create a patch
-that we accept.  Visit http://www.php.net/anoncvs.php to get CVS
-source. You can check out older versions, but make sure you get
-the default branch (i.e. Do not use -r option when you check out the 
-CVS source)
-
-Read CODING_STANDARDS file before you start working.
-
-Now you are ready to create a patch. Modify source to fix a bug in PHP or
-add a new feature to PHP. After you finished editing, please test your
-patch. Read README.TESTING for testing.
-
-After you finish testing your patch, take diff file using 
-"cvs diff > your.patch" command.
-
-Read README.TESTING for submitting a test script for your patch. This is
-not strictly required, but it is preferred to submit a test script along
-with your patch. Making new test script is very easy. It also helps us
-to understand what you have been fixed or added to PHP.
-
-
-Tips for creating patch 
------------------------ 
-If you would like to fix multiple bugs. It is easier for us if you
-could create 1 patch for 1 bug, but this is not strictly required.
-Note though that you might get little response, if your patch is
-too hard to review.
-
-If you would like change/add many lines, it is better to ask module
-maintainer and/or php-dev@lists.php.net, or pear-dev@lists.php.net if
-you are patching PEAR. Official module maintainers can be found in
-EXTENSIONS file in PHP source.
-
-If you are new to CVS (Concurrent Versions System), visit 
-http://cvshome.org/ for details.
-
-
-Recommended CVS client settings for creating patch file
-------------------------------------------------------
-Recommended ~/.cvsrc file setting is:
-------
-cvs -z3
-update -d -P
-checkout -P
-diff -u
-
-------
-diff -u means:
- -u     Use the unified output format.
-
-With this CVS setting, you don't have to worry about adding/deleting
-newlines and spaces.
-
-
-Check list for submitting patch
--------------------------------
- - Did you run "make test" to check if your patch didn't break
-   other features?
- - Did you compile PHP with --enable-debug and check the PHP and
-   web server error logs when you test your patch?
- - Did you build PHP for multi-threaded web servers. (Optional)
- - Did you create test script for "make test"? (Recommended)
- - Did you check your patch is unified format and it does not 
-   contain white space changes? (If you are not using recommended 
-   cvs setting)
- - Did you update CVS source before you take final patch?
- - Did you read the patch again?
-
-
-Where to send your patch?
--------------------------
-If you are patching C source, send the patch to php-dev@lists.php.net. 
-If you are patching a module, you should also send the patch to the 
-maintainer. Official module maintainers are listed in EXTENSION file 
-in source.
-
-If you are patching PEAR, send the patch to pear-dev@lists.php.net.
-
-Please add the prefix "[PATCH]" to your email subject and make sure
-to include the patch as a MIME attachment even if it is short. 
-
-NOTE: only MIME attachments of type 'text/*' are accepted. The
-      easiest way to acclomplish this, is to make the extension
-      '.txt'.
-
-Test scripts should be included in the same email.
-Explain what has been fixed/added/changed by your patch.
-
-Finally, add the bug Id(s) which can be closed by your patch, if any.
-
-
-What happens after you submit your patch
--------------------------------------- 
-If your patch is easy to review and has obviously no side-effects,
-it might take up to a few hours until someone commits it.
-
-Because this is a volunteer-driven effort, more complex patches will
-require more patience on your side. 
-
-If you did not receive any feedback in a few days, please consider
-resubmitting the description of your patch, along-side with
-these questions:
-
-- Is my patch too hard to review? Because of which factors?
-- Should I split it up in multiple parts?
-- Are there any unwanted whitespace changes?
-
-
-What happens when your patch is applied?
----------------------------------------- 
-Your name will be included together with your email address in the CVS 
-commit log. If your patch affects end-users, a brief description
-and your name might be added to the NEWS file.
-
-
-Thank you for submitting patch for PHP!

README.TESTING

@@ -1,307 +0,0 @@
-[IMPORTANT NOTICE]
-------------------
- Do _not_ ask to developers why some or all tests are failed under
-your environment! Let us know if you find why it fails. Thank you.
-
-
-[Testing Basics] 
-----------------
- To execute test scripts, you must build PHP with some SAPI, then you
-type "make test" to execute all or some test scripts saved under
-"tests" directory under source root directory.
-
-Usage:
-make test
-
- "make test" basically executes "run-tests.php" script
-under the source root (parallel builds will not work). Therefore you
-can execute the script as follows:
-
-TEST_PHP_EXECUTABLE=sapi/cli/php \
-sapi/cli/php [-c /path/to/php.ini] run-tests.php [ext/foo/tests/GLOB]
-
-
-[Which "php" executable "make test" look for]
----------------------------------------------
- You must use TEST_PHP_EXECUTABLE environment variable to explicitly
-select the php executable to be used to run the tests. That can either
-be the CLI or CGI executable.
-
- "make test" executes "run-tests.php" script with "php" binary.  Some
-test scripts such as session must be executed by CGI SAPI. Therefore,
-you must build PHP with CGI SAPI to perform all tests.
-
-NOTE: PHP binary executing "run-tests.php" and php binary used for
-executing test scripts may differ. If you use different PHP binary for
-executing "run-tests.php" script, you may get errors.
-
-
-[Which php.ini is used]
------------------------
- "make test" uses the same php.ini file as it would once installed.
-The tests have been written to be independent of that php.ini file,
-so if you find a test that is affected by a setting, please report
-this, so we can address the issue.
-
-
-[Which test scripts are executed]
----------------------------------
- "run-tests.php" ("make test"), without any arguments executes all
-test scripts by extracting all directories named "tests"
-from the source root and any subdirectories below. If there are files,
-which have a "phpt" extension, "run-tests.php" looks at the sections
-in these files, determines whether it should run it, by evaluating
-the 'SKIP' section. If the test is eligible for execution, the 'FILE'
-section is extracted into a ".php" file (with the same name besides 
-the extension) and gets executed.
-When an argument is given or TESTS environment variable is set, the
-GLOB is expanded by the shell and any file with extension "*.phpt" is
-regarded as a test file.
-
- Tester can easily execute tests selectively with as follows.
-
-Examples:
-./sapi/cli/php run-tests.php ext/mbstring/*
-./sapi/cli/php run-tests.php ext/mbstring/020.phpt
-
-
-[Test results]
---------------
- Test results are printed to standard output. If there is a failed test, 
-the "run-tests.php" script saves the result, the expected result and the
-code executed to the test script directory. For example, if 
-ext/myext/tests/myext.phpt fails to pass, the following files are created:
-
-ext/myext/tests/myext.php   - actual test file executed
-ext/myext/tests/myext.log   - log of test execution (L)
-ext/myext/tests/myext.exp   - expected output (E)
-ext/myext/tests/myext.out   - output from test script (O)
-ext/myext/tests/myext.diff  - diff of .out and .exp (D)
-
- Failed tests are always bugs. Either the test is bugged or not considering
-factors applying to the tester's environment, or there is a bug in PHP.
-If this is a known bug, we strive to provide bug numbers, in either the
-test name or the file name. You can check the status of such a bug, by
-going to: http://bugs.php.net/12345 where 12345 is the bug number.
-For clarity and automated processing, bug numbers are prefixed by a hash
-sign '#' in test names and/or test cases are named bug12345.phpt.
-
-NOTE: The files generated by tests can be selected by setting the
-environment variable TEST_PHP_LOG_FORMAT. For each file you want to be
-generated use the character in brackets as shown above (default is LEOD).
-The php file will be generated always.
-
-NOTE: You can set environment variable TEST_PHP_DETAILED to enable
-detailed test information.
-
-[Automated testing]
- If you like to keep up to speed, with latest developments and quality
-assurance, setting the environment variable NO_INTERACTION to 1, will not
-prompt the tester for any user input.
-
-Normally, the exit status of "make test" is zero, regardless of the results
-of independent tests. Set the environment variable REPORT_EXIT_STATUS to 1,
-and "make test" will set the exit status ("$?") to non-zero, when an
-individual test has failed.
-
-Example script to be run by cron(1):
-========== qa-test.sh =============
-#!/bin/sh
-
-CO_DIR=$HOME/cvs/php4
-MYMAIL=qa-test@domain.com
-TMPDIR=/var/tmp
-TODAY=`date +"%Y%m%d"`
-
-# Make sure compilation enviroment is correct
-CONFIGURE_OPTS='--disable-all --enable-cli --with-pcre'
-export MAKE=gmake
-export CC=gcc
-
-# Set test environment
-export NO_INTERACTIVITY=1
-export REPORT_EXIT_STATUS=1
-
-cd $CO_DIR
-cvs update . >>$TMPDIR/phpqatest.$TODAY
-./cvsclean ; ./buildconf ; ./configure $CONFIGURE_OPTS ; $MAKE
-$MAKE test >>$TMPDIR/phpqatest.$TODAY 2>&1
-if test $? -gt 0
-then
-        cat $TMPDIR/phpqatest.$TODAY | mail -s"PHP-QA Test Failed for $TODAY" $MYMAIL
-fi
-========== end of qa-test.sh =============
-
-NOTE: the exit status of run-tests.php will be 1 when
-REPORT_EXIT_STATUS is set. The result of "make test" may be higher
-than that. At present, gmake 3.79.1 returns 2, so it is
-advised to test for non-zero, rather then a specific value.
-
-
-[Creating new test files]
--------------------------
- Writing test file is very easy if you are used to PHP. 
-
-Here is an actual test file from standard module.
-
-===== ext/standard/tests/strings/strtr.phpt =======
---TEST--
-strtr() function
---FILE--
-<?php
-/* Do not change this test it is a REATME.TESTING example. */
-$trans = array("hello"=>"hi", "hi"=>"hello", "a"=>"A", "world"=>"planet");
-var_dump(strtr("# hi all, I said hello world! #", $trans));
-?>
---EXPECT--
-string(32) "# hello All, I sAid hi planet! #"
-===== ext/standard/tests/strings/strtr.phpt =======
-
-As you can see the file is devided into several sections. Below is a
-list of all possible sections:
-
-"--TEST--"        is title of the test (required).
-"--SKIPIF--"      is condition when to skip this test (optional).
-"--POST--"        is POST variable passed to test script (optional).
-"--GET--"         is GET variable passed to test script (optional).
-"--INI--"         each line contains an ini setting e.g. foo=bar (optional).
-"--FILE--"        is the test script (required).
-"--EXPECT--"      is the expected output from the test script (required).
-"--EXPECTF--"     is an alternative of --EXPECT--. The difference is that
-                  this form uses sscanf for output validation (alternative).
-"--EXPECTREGEX--" is an alternative of --EXPECT--. This form allows the tester
-                  to specify the result in a regular expression (alternative).
-
-A test must at least contain the sections TEST, FILE and either EXPECT
-or EXPECTF. When a test is called run-test.php takes the name from the
-TEST section and writes the FILE section into a ".php" file with the 
-same name as the ".phpt" file. This ".php" file will then be executed
-and its output compared to the contents of the EXPECT section. It is a
-good idea to generate output with var_dump() calls.
-
-/ext/standard/tests/strings/str_shuffle.phpt is a good example for using 
-EXPECTF instead of EXPECT. From time to time the algorithm used for shuffle 
-changed and sometimes the machine used to execute the code has influence 
-on the result of shuffle. But it always returns a three character string 
-detectable by %s. Other scan-able forms are %i for integers, %d for numbers
-only, %f for floating point values, %c for single characters and %x for 
-hexadecimal values.
-
-==== /ext/standard/tests/strings/str_shuffle.phpt ===
---TEST--
-Testing str_shuffle.
---FILE--
-<?php
-/* Do not change this test it is a REATME.TESTING example. */
-$s = '123';
-var_dump(str_shuffle($s));
-var_dump($s);
-?>
---EXPECTF--
-string(3) %s
-string(3) "123"
-==== end of /ext/standard/tests/strings/str_shuffle.phpt ===
-
-/ext/standard/tests/strings/strings001.phpt is a good example for using 
-EXPECTREGEX instead of EXPECT. This test also shows that in EXPECTREGEX 
-some characters need to be escaped since otherwise they would be 
-interpreted as a regular expression.
-
-==== /ext/standard/tests/strings/strings001.phpt ===
---TEST--
-Test whether strstr() and strrchr() are binary safe.
---FILE--
-<?php
-/* Do not change this test it is a REATME.TESTING example. */
-$s = "alabala nica".chr(0)."turska panica";
-var_dump(strstr($s, "nic"));
-var_dump(strrchr($s," nic"));
-?>
---EXPECTREGEX--
-string\(18\) \"nica\x00turska panica\"
-string\(19\) \" nica\x00turska panica\"
-==== end of /ext/standard/tests/strings/strings001.phpt ===
-
-Some tests depend on modules or functions available only in certain versions 
-or they even require minimum version of php or zend. These tests should be 
-skipped when the requirement cannot be fullfilled. To achieve this you can
-use the SKIPIF section. To tell run-test.php that your test should be skipped
-the SKIPIF section must print out the word "skip" followed by a reason why
-the test should skip.
-
-==== /ext/exif/tests/exif005.phpt ===
---TEST--
-Check for exif_read_data, unusual IFD start
---SKIPIF--
-<?php 
-	if (!extension_loaded('exif')) print 'skip exif extension not available';
-?>
---FILE--
-<?php
-/* Do not change this test it is a REATME.TESTING example.
- * test5.jpg is a 1*1 image that contains an Exif section with ifd = 00000009h
- */
-$image  = exif_read_data('./ext/exif/tests/test5.jpg','',true,false);
-var_dump($image['IFD0']);
-?>
---EXPECT--
-array(2) {
-  ["ImageDescription"]=>
-  string(11) "Ifd00000009"
-  ["DateTime"]=>
-  string(19) "2002:10:18 20:06:00"
-}
-==== end of /ext/exif/tests/exif005.phpt ===
-
-Test script and SKIPIF code should be directly written into *.phpt. However, 
-it is recommended to use include files when more test scripts depend on the 
-same SKIPIF code or when certain test files need the same values for some 
-input. But no file used by any test should have one of the following 
-extensions: ".php", ".log", ".exp", ".out" or ".diff".
-
-Tests should be named according to the following list:
-
-Class:                       Name:                  Example:
-Tests for bugs               bug<bugid>.phpt        bug17123.phpt
-Tests for functions          <functionname>.phpt    dba_open.phpt
-General tests for extensions <extname><no>.phpt     dba3.phpt
-
-When you use an include file for the SKIPIF section it should be named
-"skipif.inc" and an include file used in the FILE section of many tests
-should be named "test.inc".
-
-NOTE: All tests should run correctly with error_reporting(E_ALL) and
-display_errors=1. This is the default when called from run-test.php.
-If you have a good reason for lowering the error reporting, use --INI--
-section and comment this in your testcode.
-
-NOTE: If your test intentionally generates a PHP warning message use 
-$php_errormsg variable, which you can then output. This will result 
-in a consistent error message output across all platforms and PHP 
-configurations, preventing your test from failing due inconsistencies 
-in the error message content.
-
-[How to help us]
-----------------
- If you find bug in PHP, you can submit bug report AND test script 
-for us. You don't have to write complete script, just give us test
-script with following format. Please test the script and make sure
-you write the correct ACTUAL OUTPUT and EXPECTED OUTPUT before you
-submit.
-
-<?php
-/* 
-Bug #12345
-substr() bug. Do not return expected string.
-
-ACTUAL OUTPUT
-XYXA
-
-EXPECTED OUTPUT
-ABCD
-*/
-
-$str = "XYZABCD";
-echo substr($str,3,7);
-
-?>

README.UNIX-BUILD-SYSTEM

@@ -1,123 +0,0 @@
-PHP Build System V5 Overview
-
-- supports Makefile.ins during transition phase
-- not-really-portable Makefile includes have been eliminated
-- supports separate build directories without VPATH by using
-  explicit rules only
-- does not waste disk-space/CPU-time for building temporary libraries
-  => especially noticeable on slower systems
-- slow recursive make replaced with one global Makefile
-- eases integration of proper dependencies
-- adds PHP_DEFINE(what[, value]) which creates a single include-file
-  per what.  This will allow more fine-grained dependencies.
-- abandoning the "one library per directory" concept
-- improved integration of the CLI
-- several new targets
-  build-modules: builds and copies dynamic modules into modules/
-  install-cli: installs the CLI only, so that the install-sapi
-               target does only what its name says
-- finally abandoned automake (still requires aclocal at this time)
-- changed some configure-time constructs to run at buildconf-time
-- upgraded shtool to 1.5.4
-- removed $(moduledir) (use EXTENSION_DIR)
-
-The Reason For a New System
-
-It became more and more apparent that there is a severe need
-for addressing the portability concerns and improving the chance
-that your build is correct (how often have you been told to
-"make clean"? When this is done, you won't need to anymore).
-
-
-If You Build PHP on a Unix System
-
-
-You, as a user of PHP, will notice no changes.  Of course, the build
-system will be faster, look better and work smarter.
-
-
-
-If You Are Developing PHP
-
-
-
-
-Extension developers:
-
-Makefile.ins are abandoned.  The files which are to be compiled
-are specified in the config.m4 now using the following macro:
-
-PHP_NEW_EXTENSION(foo, foo.c bar.c baz.cpp, $ext_shared)
-
-E.g. this enables the extension foo which consists of three source-code
-modules, two in C and one in C++.  And, depending on the user's wishes,
-the extension will even be built as a dynamic module.
-
-The full syntax:
-
-PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags]]])
-
-Please have a look at acinclude.m4 for the gory details and meanings
-of the other parameters.
-
-And that's basically it for the extension side.
-
-If you previously built sub-libraries for this module, add
-the source-code files here as well.  If you need to specify
-separate include directories, do it this way:
-
-PHP_NEW_EXTENSION(foo, foo.c mylib/bar.c mylib/gregor.c,,,-I@ext_srcdir@/lib)
-
-E.g. this builds the three files which are located relative to the
-extension source directory and compiles all three files with the
-special include directive (@ext_srcdir@ is automatically replaced).
-
-Now, you need to tell the build system that you want to build files
-in a directory called $ext_builddir/lib:
-
-PHP_ADD_BUILD_DIR($ext_builddir/lib)
-
-Make sure to call this after PHP_NEW_EXTENSION, because $ext_builddir
-is only set by the latter.
-
-If you have a complex extension, you might to need add special
-Make rules.  You can do this by calling PHP_ADD_MAKEFILE_FRAGMENT
-in your config.m4 after PHP_NEW_EXTENSION.
-
-This will read a file in the source-dir of your extension called
-Makefile.frag.  In this file, $(builddir) and $(srcdir) will be
-replaced by the values which are correct for your extension
-and which are again determined by the PHP_NEW_EXTENSION macro.
-
-Make sure to prefix *all* relative paths correctly with either
-$(builddir) or $(srcdir).  Because the build system does not
-change the working directory anymore, we must use either
-absolute paths or relative ones to the top build-directory.
-Correct prefixing ensures that.
-
-
-SAPI developers:
-
-Instead of using PHP_SAPI=foo/PHP_BUILD_XYZ, you will need to type
-
-PHP_SELECT_SAPI(name, type, sources.c)
-
-I.e. specify the source-code files as above and also pass the
-information regarding how PHP is supposed to be built (shared
-module, program, etc).
-
-For example for APXS:
-
-PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php4.c php_apache.c)
-
-
-
-General info
-
-The foundation for the new system is the flexible handling of
-sources and their contexts.  With the help of macros you
-can define special flags for each source-file, where it is
-located, in which target context it can work, etc.
-
-Have a look at the well documented macros
-PHP_ADD_SOURCES(_X) in acinclude.m4.

RELEASE_PROCESS

@@ -0,0 +1,186 @@
+	Advisory on the PHP Release Cycle
+
+
+Copyright & Liciencing
+
+  This Document is  (c)  Copyright 2000,2001 by The PHP Group 
+
+  This Document is distributed under the terms of the GNU General
+  Public License as published by the Free Software Foundation; 
+  either version 2 of the License, or (at your option) any later
+  version. 
+
+
+Table of Contents
+
+  1. Introduction
+  2. Dealing with bugs
+  2.1  As a QA Team Member
+  2.2  As a Developer
+  3. Releaseing another RC
+  4. CVS During the Release Process
+  4.1  Useful CVS Commands	  
+  5  The Final Release
+  6  Summary
+
+
+1. Introduction
+
+   This cycle should take place over roughly 10 days.  When it is
+   decided it is time for an Release to occur Andi/Zeev (Or 
+   Whoever) will tarball RC1, Tag & Branch CVS (see section 4)
+   and then announce the RC on PHP-QA and PHP-DEV.  At this 
+   point the build tracker and QA Bug System come into play.
+   If you successfully build PHP then report it in the build
+   tracker, If you then run and complete all the tests you
+   should report this too in the build tracker when
+   these features become avalible.
+
+2. Dealing with Bugs
+
+2.1 As a QA Team member
+
+   If you find a bug in an RC that you think is a showstopper
+   then, even if it is a known bug, you should report it in the
+   QA Bug system.  This marks the bug for discussion at least,
+   and preferably fixing before the actual release.  This system
+   is separate from the main bugs system so that important bugs
+   dont get lost in the midst if lots of feature/change request
+   in the approach to a release.  It is imperitive where 
+   appropraite that as a QA'er a test script, Configure options
+   and PHP.ini files are provided to enable the developer to
+   reproduce the bug, this is an important part of our job.  If
+   you have a serious bug then you should also create a test
+   script to be added to the tests dir of the php source so
+   that at the end of the process to enable us to make sure bug
+   does not return.  It is not difficult to create these test
+   scripts and a readme on it can be found in
+   php4/tests/README.
+
+
+2.2 As a Developer
+
+   What should happen is that when a bug is reported it
+   is send to php-dev and php-qa as with other bugs.  We should
+   have far stricter assignment system in this bug cycle rather
+   than just leaving them. Once again bugs should be able to be
+   marked as To Be Fixed Before release or moved to other bug
+   system. (This is currently the Release Masters responsibility)
+
+   Then before the actual release the qa bugs system can be
+   checked and if there are outstanding To Be Fixed Before
+   release bugs the Developers can see this easyly rather than
+   show stoppers being dismissed and not worried about.
+
+   When a bug is fixed the QAer who reported the bug is emailed
+   and asked to test again and see if the bug is fixed.
+
+3 Releasing another RC
+
+   If it is felt necessary that a 2nd RC is needed then it
+   should be packaged as before and announced to both lists
+   again. The testing process then starts again, the RC2 is 
+   added to the build tracker and QA'ers are asked to build and
+   retest the scripts as appropriate, espectially if you
+   reported a bug, you should test thourghly for your 
+   bug and make sure it no longer occurs. This will normally
+   add anouther 3 days to the cycle, giving QA'ers time to
+   build test and report back, then for developers to 
+   fix any problems.
+
+4 CVS during the release process
+
+   At the point where the first RC is create a branch is
+   formed. This branch is not altered form that point onward
+   other than major bug fixes. Minor non important bug 
+   fixes should not be applied to this branch but to the main
+   tree instead. Any major bug fixes should be applied to both
+   trees. The developer should test and check the RC tree then
+   also test and check the MAIN tree. This is their
+   responsibility to make sure (as far as possible) that the
+   bug fix works on both trees.
+
+4.1 Useful CVS Commands
+
+   To create a Branch <Should only be done by person tarballing
+   the RC (The Release Master)>:
+
+	$ cvs tag -b php_4_0_<Version>RC<NUMBER> 
+   IE:
+	$ cvs tag -b php_4_0_1RC1
+
+   This should be executed in the PHP directory of an up to
+   date checkout. Remember to also tag the Zend and TSRM repositories.
+
+   You can retrieve a branch in one of two ways: by checking it
+   out fresh from the repository, or by switching an existing
+   working copy over to the branch, I would suggest you
+   checkout a new copy.
+
+   To check out a new copy:
+	$ cvs checkout -r php_4_0_<Version>RC<NUMBER> php4
+   IE:
+	$ cvs checkout -r php_4_0_1RC1 php4
+
+
+   To switch a working copy (Not recomended due to possible
+   commiting to wrong branch)
+	$ cvs update -r php_4_0_<Version>RC<NUMBER> php4
+   IE:
+	$ cvs update -r php_4_0_1RC1 php4
+
+   This should be done in the PHP4 directory itself.
+
+   To revert back to normal branch you should use the
+   following:
+	$ cvs update -A
+
+   To Commit to the branch you follow exactly the same
+   procedure as normal
+	$ cvs commit file.c
+
+   MAKE SURE YOU DO NOT COMMIT TO THE WRONG BRANCH.
+
+5 The Final Release
+
+   When it is time to make the final release the following
+   proceedure should be followed. The person who is tarballing
+   the final release should check the QA bugs system and make
+   sure there are no showstoppers left unfixed. If there are
+   then bug the person the bug is assigned to until they fix
+   it. If there are no more qa bugs then they should tag the
+   branch as  php_4_0_<Version> and tarball as usual. An email
+   should be sent to PHP-GEN, PHP_DEV and PHP-QA about the new
+   release and it should be added to php.net. The windows
+   binaries and servelets should be built as soon as possible
+   and added too, as should the windows installer.
+
+6 Summary
+
+   Here is a summary of what a release cycle might look like:
+
+   Thurs: RC is agreed on and packaged, an email is sent to   
+          PHP_QA and PHP-DEV, the CVS is Branched and the     
+          Release Cycle Begins. 
+
+   Mon:   After a weekends testing most show stoppers should  
+          have been found (Hopefully) and the developers get to
+          work on fixing them.
+
+   Thurs: A second RC is released if needed with the new bug  
+          fixes in and the QAers test again.
+
+   Sun:   A review is made of all outstanding bugs and any show
+          stoppers should be fixed. if there are no show      
+          stoppers then the final release is packaged and     
+          released on the monday morning on php.net
+
+   Mon:   Release is made.
+
+
+James
+--  
+James Moore
+PHP QA Team
+jmoore@php.net
+

TODO

@@ -3,167 +3,134 @@ parenthesis means that person has taken on this project.
 
 Zend
 ----
-    For PHP 4.3.0:
-    * Allow foreach ($array as $k => &$val) syntax. right now we cannot 
+    * allow foreach ($array as $k => &$val) syntax. right now we cannot 
       traverse an array without copying each element.
-    * Allow foreach ($array as $k => list($a, $b)) syntax for multi
+    * allow foreach ($array as $k => list($a, $b)) syntax for multi
       dimensional arrays.
-    * Look at replacing c-lib call tolower().
-    * Make hash API functions work with HASH_OF() to save time.
-    * Allow to set a default value for call-by-reference-parameters. 
-      eg: function hello (&$pallo = NULL) {} 
-    * Disallow function(method) redefinition in class.
-    * Add configure test to determine if dlsym() requires underscore and set
-      DLSYM_NEEDS_UNDERSCORE accordingly. Perl and zsh have it in configure, 
-      for example. (DONE?)
-
-    For PHP 5.0.0:
-    * Native large number support (probably with GNU GMP)
+    * look at replacing c-lib call tolower().
+    * make hash API functions work with HASH_OF() to save time.
+    * native large number support (probably with GNU GMP)
     * Const'ify APIs. Right now, many functions leave parameters untouched,
       but don't declare those as const. This makes interaction with other
-      interfaces difficult which pass const parameters to us.
-
+      interfaces difficult which pass const parameters to us. 
+    * add try..catch/throw exception handling
 
 global
 ------
-    For PHP 4.3.0:
-    * Add aliases to functions to conform to new naming conventions, e.g.
-      str_to_upper().
-    * Make all extensions thread-safe.
-    * Make everything on the language-level independent of your locale 
-      settings.
-    * Change PHP error messages, so that they point to pages or sections 
-      in the PHP Manual.
-    * Make sure that all ZTS globals get destructed. Most ts_allocate_id()
+    * when used in standalone (skell-script like) mode don't urldecode
+      arguments passed to php. right now it's not possible to say
+        /usr/local/bin/php somescript.php dog+cat.txt
+      as "dog+cat.txt" will arrive in php as "dog cat.txt". 
+    * make everything on the language-level independent of your locale setings.
+    * always build the standalone executable as well as the chosen SAPI 
+      target.
+    * make sure all source files have the "right" copyright.
+    * the following modules still use PHP3_TLS_*() macros (and thereby don't 
+      work in ZTS mode): ext/db/db.c, ext/gd/gd.c
+    * make sure that all ZTS globals get destructed. Most ts_allocate_id()
       calls should have a dtor entry.
-    * Activate all extensions by default that don't rely on external
-      dependencies. (eg ftp) (DONE?)
-    * on some platforms unimplemented function will just do nothing 
-      (e.g. symlink) they should print a warning or not even be defined!
-      (DONE ?)
-    * Use arg_separator.input to implode args in the CGI sapi extension
-      and arg_separator.input to explode in php_build_argv(). (DONE?)
-
-    For PHP 5.0.0
-    * bundle and use curl lib for fopen wrapper.
+    * activate all extensions by default that don't rely on external
+      dependices. (eg ftp)
     * --enable-all in configure. (--enable-shared=max ...)
     * make configure print out a summary when it's done (like XEmacs)
     * replace standard functions which work on static data with 
       reentrancy-safe functions (DONE?).
+    * on some platforms unimplemented function will just do nothing (e.g. symlink)
+      they should print a warning or not even be defined!
+    * implement javadoc based function docs template system.
+    * use thread-safe resolver functions (either require BIND 8 or adns).
+    * provide optional IPv6 support.
     * make SAPI conform to CGI/1.1. Currently, all SAPI modules
       define REMOTE_ADDR etc. themselves and reach only various level
       of compliance.
-    * see what functions might need to be changed to use HashPosition, so
-      that the internal array pointer is not affected.
-    * Move most extensions and PEAR packages out of the PHP CVS tree,
-      include them again during release packaging.
-
-
-    Other
-    * use thread-safe resolver functions (either require BIND 8 or adns).
-    * implement javadoc based function docs template system.
-    * provide optional IPv6 support.
     * find a better way to implement script timeouts. SIGVTALRM is used
       by some POSIX threads implementations (i.e. OpenBSD) and is not
       available in ZTS mode.
-    * Implement flush feature suitable for nested output buffers.
-
+    * add aliases to functions to conform to new naming conventions, e.g.
+      str_to_upper().
+    * see what functions might need to be changed to use HashPosition, so
+      that the internal array pointer is not affected.
 
 documentation
 -------------
-    * Add remarks in the documentation which functions are not implemented 
-      on win32. 
-    * Add remarks in the documentation which functions are not binary-safe.
-    * Update curl documentation (DONE?)
-    * Add developer documentation.
-    * Add detailed documentation for Java extension.
-
-ext/bz2
--------
-    * Add ini setting for decompression buffer size. The default 4k is to small
-      for big files and takes ages to decompress. However, 40k which perform
-      quite good with big files may be to much under certain environments as
-      default setting. There should be consideren different default sizes for
-      different SAPIS (e.g. apache and cli).
+    * add remarks in the documentation which functions are not implemented on win32.
+    * add remarks in the documentation which functions are not binary-safe.
+    * improve documentation for the sablotron extension
+    * update curl documentation
+    * write documentation for the bzip2 extension
+    * write documentation for the zziplib extension
 
 ext/curl
 --------
+    * Use the cURL write handler to save data for use when returning data or outputting
+      data.
     * Have a warning scheme for when people use unsupported features.
 
+ext/dav
+--------
+    * rewrite.
+
 ext/oci8
 --------
-    * All OCIFetch*() functions should return 0 for no more data and false on 
-      error.
-    * Have a flag that trims trailing spaces from CHAR fields on retrieval.
-    * Make allow_call_time_pass_reference=Off working.
-    * For additional todo information, see oci8.c, in ext/oci8
-
-ext/odbc
---------
-    For PHP 4.3.0:
-    * update all php_error calls to php_error_docref where valid
-    * integrate EXPERIMENTAL ODBC update for use in PHP 5.0, use for
-      testing purposes only.
-
-    For PHP 5.0.0
-    * Activate EXPERIMENTAL ODBC codebase update
+    * all OCIFetch*() functions should return 0 for no more data and false on error.
+    * have a flag that trims trailing spaces from CHAR fields on retrieval.
+    * make allow_call_time_pass_reference=Off working.
+    * for additional todo information, see oci8.c, in ext/oci8
 
 ext/pcre
 --------
     * Allow user to set PCRE_NOTEMPTY, PCRE_ANCHORED at execution time, maybe
+    * add option to preg_grep() to return entries that _don't_ match
 
-ext/pcntl
----------
-    * Change internal callback handler to use TICKS
-    * Remove all zend_extension code
-    * Add object callback support to pcntl_signal()
-
-ext/pgsql
----------
-    For PHP 4.3.0:
-    * Add pg_metadata() with metadata cache feature.
-    * Add pg_convert() to check and convert array value for query.
-    * Add pg_insert/pg_update/pg_delete/pg_select for simple query.
+ext/sablot
+----------
+    * Re-write the error handling and reporting interface
+    * Cleanup the underlying code a bit
+    * Add proper support for the message handlers
 
 ext/session
 -----------
-    For PHP 4.3.0:
-    * session_abort() to abort session. ie: Do not save session data.
-    * Allow unset($_SESSION) or unset($HTTP_SESSION_VARS) to unset
-      session vars regardless of register_globals setting.
-
-    Other:
-    * Maybe implement finer-grained session variables that could be 
+    * maybe implement finer-grained session variables that could be 
       locked individually.
-    * Write a network-transparent storage back-end with fallover
+    * write a network-transparent storage back-end with fallover
       facilities
-    * Provide a callback facility which is executed upon encountering
-      an unknown class name during deserialization
+    * provide a callback facility which is executed upon encountering
+      an unknown classname during deserialization
 
 ext/sockets
 -----------
-    * Implement IPv6
-    * Review/Fix vectors
+    * Make the extension work on windows (Daniel Beulshausen)
+    * Make the extension work with Solaris and the Sun GCC
 
 ext/standard
 ------------
-    * Add a version number to data serialized via serialize().
-    * Possibly modify parsing of GPC data to automatically create arrays if
+    * add a version number to data serialized via serialize().
+    * array_add(). (Andrei)
+    * possibly modify parsing of GPC data to automatically create arrays if
       variable name is seen more than once.
-    * Implement regex-cache for url-functions.
+    * implement regex-cache for url-functions.
     * stri_replace(). (Andrei)
-    * Move socket related functions to fsock.c.
+    * move socket related functions to fsock.c.
     * NOT binary safe:
         strtok()
         basename()
         dirname()
         strrpos()
+        strrchr()
+        strip_tags()
+    * rewrite win32 SMTP code to be useable for *ix to, maybe as a (default)
+      module of its own (Hartmut)
+
+ext/zziplib
+------------
+    * more fully support the zziplib api
 
 ext/wddx
 --------
-    * See if we can support the remaining data types:
+    * See if we can support the remaining datatypes:
         dateTime
         binary
+        recordset
 
         http://www.wddx.org/WDDX_SDK_10a/7__References/WDDX_DTD.htm
         (Andrei)

TODO-4.2.txt

@@ -0,0 +1,35 @@
+* Change the odbc_fetch_into() function to require ALWAYS the first two
+  parameters ($conn_id and $array), and make the third (row) be optional.
+
+* Remove --with-openlink configure option (--with-iodbc replaces it).
+
+* Always build CGI (--disable-cgi option to disable).
+
+* Move most extensions and PEAR packages out of the PHP CVS tree,
+  include them again during release packaging.
+
+* Renaming functions, so that they all are conform to one standard form.
+
+* Allow foreach($array as $key => &$value).
+
+* Allow foreach($array as list($var1, $var2)).
+
+* Clean up "$instance = &new object" syntax (default to the =& behaviour?).
+
+* Allow to set a default value for call-by-reference-parameters. eg:
+  function hallo (&$pallo = NULL) {}
+
+* Change PHP error messages, so that they point to pages or sections in the
+  PHP Manual.
+
+* Fix Zend shallow copy issues with objects and arrays.
+
+* Make all extensions thread-safe.
+
+* Finish PHP streams abstraction, nuke all that issock stuff, implement SSL
+  socket support. (wez)
+  - ext/ftp/ -> all FILEs to streams
+  - ext/bz2/ -> convert to stream impl.
+
+* Using arg_separator.input to implode args in the CGI sapi extension
+  and arg_separator.input to explode in php_build_argv().

TODO.BUILDv5

@@ -1,3 +0,0 @@
-- clean up .cvsignores
-- purge Makefile.ins and replace PHP_EXTENSION in config.m4s
-  with appropiate calls to PHP_NEW_EXTENSION

TODO_SEGFAULTS

@@ -1,146 +0,0 @@
-    This is an overview over existing segfaults in the current PHP source
-    tree.
-
-
-Fixed:
-
-    mb_convert_encoding (Moriyoshi)
-    socket_iovec_alloc (Rasmus)
-    exif_imagetype,exif_thumbnail (Rasmus)
-    dbase_open (Rasmus)
-    array_pad (Rasmus)
-    setlocale (Rasmus)
-    unregister_tick_function (Rasmus)
-    bcsub (Rasmus)
-    str_repeat (Ilia)
-    imagecopyresized (Ilia)
-    mhash_keygen_s2k (Ilia)
-    mb_ereg, mb_ereg_match, mb_eregi, mb_split (Moriyoshi)
-    xml_parser_create (Moriyoshi)
-    ob_start (Sascha)
-    imagecreate/-truecolor (Sascha)
-    flock (Sascha)
-    register_shutdown_function (Sascha)
-    mb_strcut('', [number greater than the length of first arg]) (Moriyoshi)
-    ext/exif, ext/dba (7) (Marcus)
-	
-Open:
-
-    the dbase extension         (1)
-    chunk_split                 (2)
-    socket_select               (3)
-    php_imagepolygon            (4)
-    imagesetstyle               (5)
-    bundled gd                  (6)
-    php_base64_encode		(8)
-    pack			(9)
-	
-(1) heap corruption, mostly visible in malloc-related calls.  Whether you see 
-    this or not might depend on your libc/compiler.  Hard to track down,
-    because the result of the corruption might be quite delayed.
-
-    Reproducable with glibc-2.3/gcc 3.2.2 by:
-	
-cat <<X | php do_crash
-dbase_add_record
-dbase_close
-dbase_create
-dbase_delete_record
-dbase_get_record
-dbase_get_record_with_names
-dbase_numfields
-dbase_numrecords
-dbase_open
-X 
-
-(2) integer overflow in php_chunk_split
-
-(3) heap corruption, dies in efree()/execute()
-
-Methodology
-
-    1. Use a plain PHP_4_3 tree
-    2. Use the config.nice from ammendment 1.
-    3. Download the test script from:
-
-        <URL:http://schumann.cx/do_crash.txt>
-
-    4a. Use the scripts funcparse.awk/genfunclist.sh from phpdoc/scripts
-        for creating a plain text function list.  Feed that list to
-        the script.  Avoid calls like pcntl_fork.  Manually remove functions
-        which take too long to finish/eat up all memory.
-    
-    4b. For testing a single function, echo the name of the function to
-        the script like this:
-
-        echo dbase_open | php do_crash.txt
-
-(4) integer overflow inside php_imagepolygon and possible subsequent 
-    integer overflows inside gdlib's gdImageFilledPolygon().
-
-(5) integer overflow if the number of elements in the array passed as
-    second argument * sizeof(int) result in an overflow.
-    gdImageSetStyle function called by this php wrapper can die for the
-    same reason.  
-
-(6) multiple integer overflows that can occur when trying to allocate a buffer
-    for a new image. Affected functions:
-    gdImageCreateFromJpegCtx
-    readwbmp
-    gdImageCreateFromXpm
-    gdImageCreateFromPngCtx
-    gdImagePngCtx
-    gdImageCreateFromJpegCtx
-    gdImageJpegCtx
-    gdImageCreateFromGd2Ctx
-    gdImageCreateFromGd2PartCtx
-    _gdImageGd2
-    GetDataBlock (gd_gif_in.c)
-
-(7) few possible integer overflows, once safe_emalloc() or something similar
-    is implemented they can all be addressed.
-
-(8) integer overflow if the specified string is longer then ~1.1 billion bytes.
-
-(9) multiple integer overflows, ex. pack("d4294967297", 2);
-
-Ammendment 1.
-
-CFLAGS='-O0 -g' \
-'../src/php4/configure' \
-'--enable-pcntl' \
-'--enable-shmop' \
-'--enable-sysvsem' \
-'--enable-sysvshm' \
-'--enable-wddx' \
-'--enable-yp' \
-'--enable-filepro' \
-'--enable-ftp' \
-'--enable-dba' \
-'--enable-dbase' \
-'--enable-dio' \
-'--enable-exif' \
-'--enable-mbstring' \
-'--enable-mbregex' \
-'--enable-sockets' \
-'--enable-bcmath' \
-'--enable-calendar' \
-'--enable-pcntl' \
-'--enable-shmop' \
-'--enable-sysvsem' \
-'--enable-sysvshm' \
-'--enable-wddx' \
-'--enable-yp' \
-'--enable-filepro' \
-'--enable-ftp' \
-'--enable-dba' \
-'--enable-dbase' \
-'--enable-dio' \
-'--enable-exif' \
-'--enable-mbstring' \
-'--enable-mbregex' \
-'--enable-sockets' \
-'--enable-bcmath' \
-'--enable-calendar' \
-"$@"
-

TSRM/TSRM.c

@@ -15,6 +15,7 @@
 #ifdef ZTS
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #if HAVE_STDARG_H
 #include <stdarg.h>
@@ -79,7 +80,7 @@ static FILE *tsrm_error_file;
 		}																												\
 	}
 #else
-#define TSRM_ERROR(args)
+#define TSRM_ERROR
 #define TSRM_SAFE_RETURN_RSRC(array, offset, range)		\
 	if (offset==0) {									\
 		return &array;									\
@@ -95,10 +96,9 @@ static pthread_key_t tls_key;
 static int tls_key;
 #elif defined(TSRM_WIN32)
 static DWORD tls_key;
-#elif defined(BETHREADS)
-static int32 tls_key;
 #endif
 
+
 /* Startup TSRM (call once for the entire process) */
 TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debug_level, char *debug_filename)
 {
@@ -111,8 +111,6 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu
 	st_key_create(&tls_key, 0);
 #elif defined(TSRM_WIN32)
 	tls_key = TlsAlloc();
-#elif defined(BETHREADS)
-	tls_key = tls_allocate();
 #endif
 
 	tsrm_error_file = stderr;
@@ -261,8 +259,6 @@ static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_
 	st_thread_setspecific(tls_key, (void *) *thread_resources_ptr);
 #elif defined(TSRM_WIN32)
 	TlsSetValue(tls_key, (void *) *thread_resources_ptr);
-#elif defined(BETHREADS)
-	tls_set(tls_key, (void*) *thread_resources_ptr);
 #endif
 
 	if (tsrm_new_thread_begin_handler) {
@@ -302,8 +298,6 @@ TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 		thread_resources = st_thread_getspecific(tls_key);
 #elif defined(TSRM_WIN32)
 		thread_resources = TlsGetValue(tls_key);
-#elif defined(BETHREADS)
-		thread_resources = (tsrm_tls_entry*)tls_get(tls_key);
 #else
 		thread_resources = NULL;
 #endif
@@ -418,8 +412,6 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 {
 #ifdef TSRM_WIN32
 	return GetCurrentThreadId();
-#elif defined(NETWARE)
-	return NXThreadGetId();
 #elif defined(GNUPTH)
 	return pth_self();
 #elif defined(PTHREADS)
@@ -430,8 +422,6 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 	return PIThread_getCurrent();
 #elif defined(TSRM_ST)
 	return st_thread_self();
-#elif defined(BETHREADS)
-	return find_thread(NULL);
 #endif
 }
 
@@ -439,18 +429,11 @@ TSRM_API THREAD_T tsrm_thread_id(void)
 /* Allocate a mutex */
 TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 {
-	MUTEX_T mutexp;
-#ifdef NETWARE
-	long flags = 0;  /* Don't require NX_MUTEX_RECURSIVE, I guess */
-	NXHierarchy_t order = 0;
-	NX_LOCK_INFO_ALLOC (lockInfo, "PHP-TSRM", 0);
-#endif    
+    MUTEX_T mutexp;
 
 #ifdef TSRM_WIN32
-	mutexp = malloc(sizeof(CRITICAL_SECTION));
+    mutexp = malloc(sizeof(CRITICAL_SECTION));
 	InitializeCriticalSection(mutexp);
-#elif defined(NETWARE)
-	mutexp = NXMutexAlloc(flags, order, &lockInfo); /* return value ignored for now */
 #elif defined(GNUPTH)
 	mutexp = (MUTEX_T) malloc(sizeof(*mutexp));
 	pth_mutex_init(mutexp);
@@ -463,26 +446,20 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void)
 	mutexp = PIPlatform_allocLocalMutex();
 #elif defined(TSRM_ST)
 	mutexp = st_mutex_new();
-#elif defined(BETHREADS)
-	mutexp = (beos_ben*)malloc(sizeof(beos_ben));
-	mutexp->ben = 0;
-	mutexp->sem = create_sem(1, "PHP sempahore"); 
 #endif
 #ifdef THR_DEBUG
-	printf("Mutex created thread: %d\n",mythreadid());
+		printf("Mutex created thread: %d\n",mythreadid());
 #endif
-	return( mutexp );
+    return( mutexp );
 }
 
 
 /* Free a mutex */
 TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 {
-	if (mutexp) {
+    if (mutexp) {
 #ifdef TSRM_WIN32
 		DeleteCriticalSection(mutexp);
-#elif defined(NETWARE)
-		NXMutexFree(mutexp);
 #elif defined(GNUPTH)
 		free(mutexp);
 #elif defined(PTHREADS)
@@ -494,13 +471,10 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp)
 		PISync_delete(mutexp);
 #elif defined(TSRM_ST)
 		st_mutex_destroy(mutexp);
-#elif defined(BETHREADS)
-		delete_sem(mutexp->sem);
-		free(mutexp);  
 #endif
-	}
+    }
 #ifdef THR_DEBUG
-	printf("Mutex freed thread: %d\n",mythreadid());
+		printf("Mutex freed thread: %d\n",mythreadid());
 #endif
 }
 
@@ -512,8 +486,6 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 	EnterCriticalSection(mutexp);
 	return 1;
-#elif defined(NETWARE)
-	return NXLock(mutexp);
 #elif defined(GNUPTH)
 	return pth_mutex_acquire(mutexp, 0, NULL);
 #elif defined(PTHREADS)
@@ -524,10 +496,6 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp)
 	return PISync_lock(mutexp);
 #elif defined(TSRM_ST)
 	return st_mutex_lock(mutexp);
-#elif defined(BETHREADS)
-	if (atomic_add(&mutexp->ben, 1) != 0)  
-		return acquire_sem(mutexp->sem);   
-	return 0;
 #endif
 }
 
@@ -539,8 +507,6 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 #ifdef TSRM_WIN32
 	LeaveCriticalSection(mutexp);
 	return 1;
-#elif defined(NETWARE)
-	return NXUnlock(mutexp);
 #elif defined(GNUPTH)
 	return pth_mutex_release(mutexp);
 #elif defined(PTHREADS)
@@ -551,10 +517,6 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp)
 	return PISync_unlock(mutexp);
 #elif defined(TSRM_ST)
 	return st_mutex_unlock(mutexp);
-#elif defined(BETHREADS)
-	if (atomic_add(&mutexp->ben, -1) != 1) 
-		return release_sem(mutexp->sem);
-	return 0;   
 #endif
 }
 

TSRM/TSRM.h

@@ -13,14 +13,12 @@
 #ifndef TSRM_H
 #define TSRM_H
 
-/* #ifndef WIN32 */
-#if !defined(WIN32) && !defined(NETWARE)
+#ifdef HAVE_CONFIG_H
 # include "tsrm_config.h"
 #endif
 
 #ifdef WIN32
 # define TSRM_WIN32
-# include "tsrm_config.w32.h"
 #endif
 
 #ifdef TSRM_WIN32
@@ -38,18 +36,12 @@
 
 #ifdef TSRM_WIN32
 # include <windows.h>
-#elif defined(NETWARE)
-# include <nks/thread.h>
-# include <nks/synch.h>
 #elif defined(GNUPTH)
 # include <pth.h>
 #elif defined(PTHREADS)
 # include <pthread.h>
 #elif defined(TSRM_ST)
 # include <st.h>
-#elif defined(BETHREADS)
-#include <kernel/OS.h> 
-#include <TLS.h>
 #endif
 
 typedef int ts_rsrc_id;
@@ -58,9 +50,6 @@ typedef int ts_rsrc_id;
 #ifdef TSRM_WIN32
 # define THREAD_T DWORD
 # define MUTEX_T CRITICAL_SECTION *
-#elif defined(NETWARE)
-# define THREAD_T NXThreadId_t
-# define MUTEX_T NXMutex_t *
 #elif defined(GNUPTH)
 # define THREAD_T pth_t
 # define MUTEX_T pth_mutex_t *
@@ -76,13 +65,6 @@ typedef int ts_rsrc_id;
 #elif defined(TSRM_ST)
 # define THREAD_T st_thread_t
 # define MUTEX_T st_mutex_t
-#elif defined(BETHREADS)
-# define THREAD_T thread_id
-typedef struct {
-  sem_id sem;
-  int32 ben;
-} beos_ben;
-# define MUTEX_T beos_ben * 
 #endif
 
 typedef void (*ts_allocate_ctor)(void *, void ***);

TSRM/threads.m4

@@ -31,27 +31,24 @@ dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
 AC_DEFUN(PTHREADS_FLAGS,[
-  if test -z "$host_alias" && test -n "$host"; then
-    host_alias=$host
-  fi
   if test -z "$host_alias"; then
     AC_MSG_ERROR(host_alias is not set. Make sure to run config.guess)
   fi
-  case $host_alias in
+  case "$host_alias" in
   *solaris*)
     PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";;
   *freebsd*)
     PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";;
   *linux*)
-    PTHREAD_FLAGS=-D_REENTRANT;;
+    PTHREAD_FLAGS="-D_REENTRANT";;
   *aix*)
-    PTHREAD_FLAGS=-D_THREAD_SAFE;;
+    PTHREAD_FLAGS="-D_THREAD_SAFE";;
   *irix*)
-    PTHREAD_FLAGS=-D_POSIX_THREAD_SAFE_FUNCTIONS;;
+    PTHREAD_FLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS";;
   *hpux*)
-    PTHREAD_FLAGS=-D_REENTRANT;;
+    PTHREAD_FLAGS="-D_REENTRANT";;
   *sco*)
-    PTHREAD_FLAGS=-D_REENTRANT;;
+    PTHREAD_FLAGS="-D_REENTRANT";;
 dnl Solves sigwait() problem, creates problems with u_long etc.
 dnl    PTHREAD_FLAGS="-D_REENTRANT -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE_EXTENDED=1";;
   esac
@@ -80,11 +77,11 @@ int main() {
     int data = 1;
     pthread_mutexattr_init(&mattr);
     return pthread_create(&thd, NULL, thread_routine, &data);
-} ], [
-  pthreads_working=yes
+} ], [ 
+  pthreads_working="yes"
   ], [
-  pthreads_working=no
-  ], pthreads_working=no ) ] )dnl
+  pthreads_working="no"
+  ], pthreads_working="no" ) ] )dnl
 dnl
 dnl PTHREADS_CHECK()
 dnl
@@ -102,44 +99,39 @@ dnl  -threads          gcc (HP-UX)
 dnl
 AC_DEFUN(PTHREADS_CHECK,[
 
-if test "$beos_threads" = "1"; then
-  pthreads_working="yes"
-  ac_cv_pthreads_cflags=""
-else
-  save_CFLAGS=$CFLAGS
-  save_LIBS=$LIBS
-  PTHREADS_ASSIGN_VARS
-  PTHREADS_CHECK_COMPILE
-  LIBS=$save_LIBS
-  CFLAGS=$save_CFLAGS
+save_CFLAGS="$CFLAGS"
+save_LIBS="$LIBS"
+PTHREADS_ASSIGN_VARS
+PTHREADS_CHECK_COMPILE
+LIBS="$save_LIBS"
+CFLAGS="$save_CFLAGS"
 
-  AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
-  ac_cv_pthreads_cflags=
-  if test "$pthreads_working" != "yes"; then
-    for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
-      ac_save=$CFLAGS
-      CFLAGS="$CFLAGS $flag"
-      PTHREADS_CHECK_COMPILE
-      CFLAGS=$ac_save
-      if test "$pthreads_working" = "yes"; then
-        ac_cv_pthreads_cflags=$flag
-        break
-      fi
-    done
-  fi
+AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[
+ac_cv_pthreads_cflags=""
+if test "$pthreads_working" != "yes"; then
+  for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do 
+    ac_save="$CFLAGS"
+    CFLAGS="$CFLAGS $flag"
+    PTHREADS_CHECK_COMPILE
+    CFLAGS="$ac_save"
+    if test "$pthreads_working" = "yes"; then
+      ac_cv_pthreads_cflags="$flag"
+      break
+    fi
+  done
 fi
 ])
 
 AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[
-ac_cv_pthreads_lib=
+ac_cv_pthreads_lib=""
 if test "$pthreads_working" != "yes"; then
   for lib in pthread pthreads c_r; do
-    ac_save=$LIBS
+    ac_save="$LIBS"
     LIBS="$LIBS -l$lib"
     PTHREADS_CHECK_COMPILE
-    LIBS=$ac_save
+    LIBS="$ac_save"
     if test "$pthreads_working" = "yes"; then
-      ac_cv_pthreads_lib=$lib
+      ac_cv_pthreads_lib="$lib"
       break
     fi
   done
@@ -147,9 +139,9 @@ fi
 ])
 
 if test "$pthreads_working" = "yes"; then
-  threads_result="POSIX-Threads found"
+  threads_result="POSIX Threads found"
 else
-  threads_result="POSIX-Threads not found"
+  threads_result="POSIX Threads not found"
 fi
 ])dnl
 dnl

TSRM/tsrm.m4

@@ -58,7 +58,7 @@ AC_DEFUN(TSRM_CHECK_ST,[
     CPPFLAGS="$CPPFLAGS -I$1"
     LDFLAGS="$LDFLAGS -L$1"
   fi
-  AC_CHECK_HEADERS(st.h,[],[
+  AC_CHECK_HEADERS(st.h,[ ],[
     AC_MSG_ERROR([Sorry[,] I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix])
   ])
   LIBS="$LIBS -lst"
@@ -73,19 +73,15 @@ sinclude(TSRM/threads.m4)
 AC_DEFUN(TSRM_CHECK_PTHREADS,[
 		
 PTHREADS_CHECK
-
-if test "$beos_threads" = "1"; then 
-  AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads)
-else		
-  if test "$pthreads_working" != "yes"; then
-    AC_MSG_ERROR(Your system seems to lack POSIX threads.)
-  fi
-
-  AC_DEFINE(PTHREADS, 1, Whether to use Pthreads)
-
-  AC_MSG_CHECKING(for POSIX threads)
-  AC_MSG_RESULT(yes)
+		
+if test "$pthreads_working" != "yes"; then
+  AC_MSG_ERROR(Your system seems to lack POSIX threads.)
 fi
+		
+AC_DEFINE(PTHREADS, 1, Whether to use Pthreads)
+
+AC_MSG_CHECKING(for POSIX threads)
+AC_MSG_RESULT(yes)
 ])
 
 

TSRM/tsrm_config.nw.h

@@ -1,9 +0,0 @@
-#ifndef TSRM_CONFIG_NW_H
-#define TSRM_CONFIG_NW_H
-
-#define HAVE_UTIME 1
-
-/* Though we have alloca(), this seems to be causing some problem with the stack pointer -- hence not using it */
-/* #define HAVE_ALLOCA 1 */
-
-#endif

TSRM/tsrm_config.w32.h

@@ -4,10 +4,6 @@
 #define HAVE_UTIME 1
 #define HAVE_ALLOCA 1
 
-#include <malloc.h>
-#include <stdlib.h>
-#include <crtdbg.h>
-
 #undef inline
 #ifdef ZEND_WIN32_FORCE_INLINE
 # define inline __forceinline

TSRM/tsrm_config_common.h

@@ -5,30 +5,19 @@
 # define TSRM_WIN32
 #endif
 
-#ifdef TSRM_WIN32
-# include "tsrm_config.w32.h"
-#elif defined(NETWARE)
-# include "tsrm_config.nw.h"
-#else
+#ifndef TSRM_WIN32
 # include "tsrm_config.h"
 # include <sys/param.h>
+#else
+# include "tsrm_config.w32.h"
 #endif
 
-#if HAVE_ALLOCA_H && !defined(_ALLOCA_H)
-#  include <alloca.h>
+#ifdef TSRM_WIN32
+#include <malloc.h>
 #endif
 
-/* AIX requires this to be the first thing in the file.  */
-#ifndef __GNUC__
-# ifndef HAVE_ALLOCA_H
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
+#if HAVE_ALLOCA_H
+#include <alloca.h>
 #endif
 
 #if HAVE_UNISTD_H

TSRM/tsrm_nw.c

@@ -1,260 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.02 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_02.txt.                                 |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Authors: Venkat Raghavan S <rvenkat@novell.com>                      |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#include "TSRM.h"
-
-#ifdef NETWARE
-
-#ifdef USE_MKFIFO
-#include <sys/stat.h>
-#elif !defined(USE_PIPE_OPEN)   /* NXFifoOpen */
-#include <nks/fsio.h>
-#endif
-
-#include <nks/vm.h>
-#include <nks/memory.h>
-
-#include <string.h>
-
-#include "mktemp.h"
-
-/* strtok() call in LibC is abending when used in a different address space -- hence using
-   PHP's version itself for now : Venkat (30/4/02) */
-#include "tsrm_strtok_r.h"
-#define tsrm_strtok_r(a,b,c) strtok((a),(b))
-
-#define WHITESPACE  " \t"
-#define MAX_ARGS    10
-
-
-TSRM_API FILE* popen(const char *commandline, const char *type)
-{
-    char *command = NULL, *argv[MAX_ARGS] = {'\0'}, **env = NULL;
-	char *tempName = "sys:/php/temp/phpXXXXXX.tmp";
-    char *filePath = NULL;
-    char *ptr = NULL;
-    int ptrLen = 0, argc = 0, i = 0, envCount = 0, err = 0;
-	FILE *stream = NULL;
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-    int pipe_handle;
-    int mode = O_RDONLY;
-#else
-    NXHandle_t pipe_handle;
-    NXMode_t mode = NX_O_RDONLY;
-#endif
-    NXExecEnvSpec_t envSpec;
-    NXNameSpec_t nameSpec;
-    NXVmId_t newVM = 0;
-
-    /* Check for validity of input parameters */
-    if (!commandline || !type)
-        return NULL;
-
-    /* Get temporary file name */
-    filePath = mktemp(tempName);
-/*consoleprintf ("PHP | popen: file path = %s, mode = %s\n", filePath, type);*/
-	if (!filePath)
-		return NULL;
-
-    /* Set pipe mode according to type -- for now allow only "r" or "w" */
-    if (strcmp(type, "r") == 0)
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-        mode = O_RDONLY;
-#else
-        mode = NX_O_RDONLY;
-#endif
-    else if (strcmp(type, "w") == 0)
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-        mode = O_WRONLY;
-#else
-        mode = NX_O_WRONLY;
-#endif
-    else
-        return NULL;
-
-#ifdef USE_PIPE_OPEN
-    pipe_handle = pipe_open(filePath, mode);
-/*consoleprintf ("PHP | popen: pipe_open() returned %d\n", pipe_handle);*/
-    if (pipe_handle == -1)
-        return NULL;
-#elif defined(USE_MKFIFO)
-    pipe_handle = mkfifo(filePath, mode);
-consoleprintf ("PHP | popen: mkfifo() returned %d\n", pipe_handle);
-    if (pipe_handle == -1)
-        return NULL;
-#else
-    /*
-        - NetWare doesn't require first parameter
-        - Allowing LibC to choose the buffer size for now
-    */
-    err = NXFifoOpen(0, filePath, mode, 0, &pipe_handle);
-/*consoleprintf ("PHP | popen: NXFifoOpen() returned %d\n", err);*/
-    if (err)
-        return NULL;
-#endif
-
-    /* Copy the environment variables in preparation for the spawn call */
-
-    envCount = NXGetEnvCount() + 1;  /* add one for NULL */
-    env = (char**)NXMemAlloc(sizeof(char*) * envCount, 0);
-    if (!env)
-        return NULL;
-
-    err = NXCopyEnv(env, envCount);
-consoleprintf ("PHP | popen: NXCopyEnv() returned %d\n", err);
-    if (err)
-    {
-        NXMemFree (env);
-        return NULL;
-    }
-
-    /* Separate commandline string into words */
-consoleprintf ("PHP | popen: commandline = %s\n", commandline);
-    ptr = tsrm_strtok_r((char*)commandline, WHITESPACE, NULL);
-    ptrLen = strlen(ptr);
-
-    command = (char*)malloc(ptrLen + 1);
-    if (!command)
-    {
-        NXMemFree (env);
-        return NULL;
-    }
-
-    strcpy (command, ptr);
-
-    ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
-    while (ptr && (argc < MAX_ARGS))
-    {
-        ptrLen = strlen(ptr);
-
-        argv[argc] = (char*)malloc(ptrLen + 1);
-        if (!argv[argc])
-        {
-            NXMemFree (env);
-
-            if (command)
-                free (command);
-
-            for (i = 0; i < argc; i++)
-            {
-                if (argv[i])
-                free (argv[i]);
-            }
-
-            return NULL;
-        }
-
-        strcpy (argv[argc], ptr);
-
-        argc++;
-
-        ptr = tsrm_strtok_r(NULL, WHITESPACE, NULL);
-    }
-consoleprintf ("PHP | popen: commandline string parsed into tokens\n");
-    /* Setup the execution environment and spawn new process */
-
-    envSpec.esFlags = 0;    /* Not used */
-    envSpec.esArgc = argc;
-    envSpec.esArgv = (void**)argv;
-    envSpec.esEnv = (void**)env;
-
-    envSpec.esStdin.ssType =
-    envSpec.esStdout.ssType = NX_OBJ_FIFO;
-    envSpec.esStderr.ssType = NX_OBJ_FILE;
-/*
-    envSpec.esStdin.ssHandle =
-    envSpec.esStdout.ssHandle =
-    envSpec.esStderr.ssHandle = -1;
-*/
-    envSpec.esStdin.ssPathCtx =
-    envSpec.esStdout.ssPathCtx =
-    envSpec.esStderr.ssPathCtx = NULL;
-
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-    if (mode == O_RDONLY)
-#else
-    if (mode == NX_O_RDONLY)
-#endif
-    {
-        envSpec.esStdin.ssPath = filePath;
-        envSpec.esStdout.ssPath = stdout;
-    }
-    else /* Write Only */
-    {
-        envSpec.esStdin.ssPath = stdin;
-        envSpec.esStdout.ssPath = filePath;
-    }
-
-    envSpec.esStderr.ssPath = stdout;
-
-    nameSpec.ssType = NX_OBJ_FIFO;
-/*    nameSpec.ssHandle = 0; */ /* Not used */
-    nameSpec.ssPathCtx = NULL;  /* Not used */
-    nameSpec.ssPath = argv[0];
-consoleprintf ("PHP | popen: environment setup\n");
-    err = NXVmSpawn(&nameSpec, &envSpec, 0, &newVM);
-consoleprintf ("PHP | popen: NXVmSpawn() returned %d\n", err);
-    if (!err)
-        /* Get file pointer corresponding to the pipe (file) opened */
-        stream = fdopen(pipe_handle, type);
-
-    /* Clean-up */
-
-    if (env)
-        NXMemFree (env);
-
-    if (pipe_handle)
-#if defined(USE_PIPE_OPEN) || defined(USE_MKFIFO)
-        close(pipe_handle);
-#else
-        NXClose(pipe_handle);
-#endif
-
-    if (command)
-        free (command);
-
-    for (i = 0; i < argc; i++)
-    {
-        if (argv[i])
-            free (argv[i]);
-    }
-consoleprintf ("PHP | popen: all clean-up done, returning...\n");
-    return stream;
-}
-
-TSRM_API int pclose(FILE* stream)
-{
-    int err = 0;
-    NXHandle_t fd = 0;
-
-    /* Get the process associated with this pipe (file) handle and terminate it */
-    fd = fileno(stream);
-    NXClose (fd);
-
-    err = fclose(stream);
-
-    return err;
-}
-
-#endif

TSRM/tsrm_virtual_cwd.c

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
+   | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
+   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -36,21 +36,12 @@
 #include "tsrm_win32.h"
 #endif
 
-#ifdef NETWARE
-/*#include "pipe.h"*/
-#include "tsrm_nw.h"
-#endif
-
-#ifndef HAVE_REALPATH
-#define realpath(x,y) strcpy(y,x)
-#endif
-
 #define VIRTUAL_CWD_DEBUG 0
 
 #include "TSRM.h"
 
-/* Only need mutex for popen() in Windows and NetWare, because it doesn't chdir() on UNIX */
-#if (defined(TSRM_WIN32) || defined(NETWARE)) && defined(ZTS)
+/* Only need mutex for popen() in Windows because it doesn't chdir() on UNIX */
+#if defined(TSRM_WIN32) && defined(ZTS)
 MUTEX_T cwd_mutex;
 #endif
 
@@ -77,8 +68,7 @@ cwd_state main_cwd_state; /* True global */
 #endif
 
 #ifdef TSRM_WIN32
-#include <tchar.h>
-#define tsrm_strtok_r(a,b,c) _tcstok((a),(b))
+#define tsrm_strtok_r(a,b,c) strtok((a),(b))
 #define TOKENIZER_STRING "/\\"
 	
 static int php_check_dots(const char *element, int n) 
@@ -94,13 +84,6 @@ static int php_check_dots(const char *element, int n)
 #define IS_DIRECTORY_CURRENT(element, len) \
 	(len == 1 && ptr[0] == '.')
 
-#elif defined(NETWARE)
-/* NetWare has strtok() (in LibC) and allows both slashes in paths, like Windows --
-   but rest of the stuff is like Unix */
-/* strtok() call in LibC is abending when used in a different address space -- hence using
-   PHP's version itself for now */
-/*#define tsrm_strtok_r(a,b,c) strtok((a),(b))*/
-#define TOKENIZER_STRING "/\\"
 
 #else
 #define TOKENIZER_STRING "/"
@@ -137,15 +120,9 @@ static int php_check_dots(const char *element, int n)
 	
 static int php_is_dir_ok(const cwd_state *state) 
 {
-#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 	struct stat buf;
 
 	if (stat(state->cwd, &buf) == 0 && S_ISDIR(buf.st_mode))
-#else
-    struct stat_libc buf;
-
-    if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISDIR(buf.st_mode))
-#endif
 		return (0);
 
 	return (1);
@@ -153,15 +130,9 @@ static int php_is_dir_ok(const cwd_state *state)
 
 static int php_is_file_ok(const cwd_state *state) 
 {
-#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 	struct stat buf;
 
 	if (stat(state->cwd, &buf) == 0 && S_ISREG(buf.st_mode))
-#else
-    struct stat_libc buf;
-
-    if (stat(state->cwd, (struct stat*)(&buf)) == 0 && S_ISREG(buf.st_mode))
-#endif
 		return (0);
 
 	return (1);
@@ -284,7 +255,7 @@ CWD_API char *virtual_getcwd(char *buf, size_t size TSRMLS_DC)
 
 /* Resolve path relatively to state and put the real path into state */
 /* returns 0 for ok, 1 for error */
-CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath)
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path)
 {
 	int path_length = strlen(path);
 	char *ptr, *path_copy;
@@ -302,12 +273,9 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	if (path_length == 0) 
 		return (0);
 
-#if !defined(TSRM_WIN32) && !defined(NETWARE)
-	/* cwd_length can be 0 when getcwd() fails.
-	 * This can happen under solaris when a dir does not have read permissions
-	 * but *does* have execute permissions */
-	if (IS_ABSOLUTE_PATH(path, path_length) || (state->cwd_length < 1)) {
-		if (use_realpath && realpath(path, resolved_path)) {
+#if !defined(TSRM_WIN32) && !defined(__BEOS__)
+	if (IS_ABSOLUTE_PATH(path, path_length)) {
+		if (realpath(path, resolved_path)) {
 			path = resolved_path;
 			path_length = strlen(path);
 		}
@@ -325,7 +293,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 		memcpy(ptr, path, path_length);
 		ptr += path_length;
 		*ptr = '\0';
-		if (use_realpath && realpath(tmp, resolved_path)) {
+		if (realpath(tmp, resolved_path)) {
 			path = resolved_path;
 			path_length = strlen(path);
 		}
@@ -340,7 +308,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	fprintf(stderr,"cwd = %s path = %s\n", state->cwd, path);
 #endif
 	if (IS_ABSOLUTE_PATH(path_copy, path_length)) {
-        copy_amount = COPY_WHEN_ABSOLUTE(path_copy);
+		copy_amount = COPY_WHEN_ABSOLUTE;
 		is_absolute = 1;
 #ifdef TSRM_WIN32
 	} else if (IS_UNC_PATH(path_copy, path_length)) {
@@ -366,64 +334,52 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 	}
 
 
-	if (state->cwd_length > 0 || IS_ABSOLUTE_PATH(path, path_length)) {
-		ptr = tsrm_strtok_r(path_copy, TOKENIZER_STRING, &tok);
-		while (ptr) {
-			ptr_length = strlen(ptr);
+	ptr = tsrm_strtok_r(path_copy, TOKENIZER_STRING, &tok);
+	while (ptr) {
+		ptr_length = strlen(ptr);
 
-			if (IS_DIRECTORY_UP(ptr, ptr_length)) {
-				char save;
+		if (IS_DIRECTORY_UP(ptr, ptr_length)) {
+			char save;
 
-				save = DEFAULT_SLASH;
+			save = DEFAULT_SLASH;
 
 #define PREVIOUS state->cwd[state->cwd_length - 1]
 
-				while (IS_ABSOLUTE_PATH(state->cwd, state->cwd_length) &&
-						!IS_SLASH(PREVIOUS)) {
-					save = PREVIOUS;
-					PREVIOUS = '\0';
-					state->cwd_length--;
-				}
-
-				if (!IS_ABSOLUTE_PATH(state->cwd, state->cwd_length)) {
-					state->cwd[state->cwd_length++] = save;
-					state->cwd[state->cwd_length] = '\0';
-				} else {
-					PREVIOUS = '\0';
-					state->cwd_length--;
-				}
-			} else if (!IS_DIRECTORY_CURRENT(ptr, ptr_length)) {
-				state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
-#ifdef TSRM_WIN32
-				/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
-				if ((state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') || 
-						IsDBCSLeadByte(state->cwd[state->cwd_length-2])) {
-					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
-				}
-#elif defined(NETWARE)
-				/* If the token is a volume name, it will have colon at the end -- so, no slash before it */
-				if (ptr[ptr_length-1] != ':') {
-					state->cwd[state->cwd_length++] = DEFAULT_SLASH;
-				}
-#else
-				state->cwd[state->cwd_length++] = DEFAULT_SLASH;
-#endif
-				memcpy(&state->cwd[state->cwd_length], ptr, ptr_length+1);
-				state->cwd_length += ptr_length;
+			while (IS_ABSOLUTE_PATH(state->cwd, state->cwd_length) &&
+					!IS_SLASH(PREVIOUS)) {
+				save = PREVIOUS;
+				PREVIOUS = '\0';
+				state->cwd_length--;
 			}
-			ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
-		}
 
-		if (state->cwd_length == COPY_WHEN_ABSOLUTE(state->cwd)) {
-			state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
-			state->cwd[state->cwd_length] = DEFAULT_SLASH;
-			state->cwd[state->cwd_length+1] = '\0';
-			state->cwd_length++;
+			if (!IS_ABSOLUTE_PATH(state->cwd, state->cwd_length)) {
+				state->cwd[state->cwd_length++] = save;
+				state->cwd[state->cwd_length] = '\0';
+			} else {
+				PREVIOUS = '\0';
+				state->cwd_length--;
+			}
+		} else if (!IS_DIRECTORY_CURRENT(ptr, ptr_length)) {
+			state->cwd = (char *) realloc(state->cwd, state->cwd_length+ptr_length+1+1);
+#ifdef TSRM_WIN32
+			/* Windows 9x will consider C:\\Foo as a network path. Avoid it. */
+			if (state->cwd[state->cwd_length-1]!='\\' && state->cwd[state->cwd_length-1]!='/') {
+				state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+			}
+#else
+			state->cwd[state->cwd_length++] = DEFAULT_SLASH;
+#endif
+			memcpy(&state->cwd[state->cwd_length], ptr, ptr_length+1);
+			state->cwd_length += ptr_length;
 		}
-	} else {
-		state->cwd = (char *) realloc(state->cwd, path_length+1);
-		memcpy(state->cwd, path, path_length+1);
-		state->cwd_length = path_length;
+		ptr = tsrm_strtok_r(NULL, TOKENIZER_STRING, &tok);
+	}
+
+	if (state->cwd_length == COPY_WHEN_ABSOLUTE) {
+		state->cwd = (char *) realloc(state->cwd, state->cwd_length+1+1);
+		state->cwd[state->cwd_length] = DEFAULT_SLASH;
+		state->cwd[state->cwd_length+1] = '\0';
+		state->cwd_length++;
 	}
 
 	if (verify_path && verify_path(state)) {
@@ -448,7 +404,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 
 CWD_API int virtual_chdir(const char *path TSRMLS_DC)
 {
-	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok, 1)?-1:0;
+	return virtual_file_ex(&CWDG(cwd), path, php_is_dir_ok)?-1:0;
 }
 
 CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path TSRMLS_DC) TSRMLS_DC)
@@ -469,7 +425,7 @@ CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path
 		return -1;
 	}
 
-	if (length == COPY_WHEN_ABSOLUTE(path) && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
+	if (length == COPY_WHEN_ABSOLUTE && IS_ABSOLUTE_PATH(path, length+1)) { /* Also use trailing slash if this is absolute */
 		length++;
 	}
 	temp = (char *) tsrm_do_alloca(length+1);
@@ -489,7 +445,7 @@ CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, NULL, 1);
+	retval = virtual_file_ex(&new_state, path, NULL);
 	
 	if (!retval) {
 		int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
@@ -507,7 +463,7 @@ CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_f
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	retval = virtual_file_ex(&new_state, path, verify_path, 1);
+	retval = virtual_file_ex(&new_state, path, verify_path);
 
 	*filepath = new_state.cwd;
 
@@ -530,7 +486,7 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
 	}
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	virtual_file_ex(&new_state, path, NULL);
 
 	f = fopen(new_state.cwd, mode);
 
@@ -538,24 +494,6 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC)
 	return f;
 }
 
-#if !defined(TSRM_WIN32)
-CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC)
-{
-	cwd_state new_state;
-	int ret;
-	
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 1);
-
-	ret = access(new_state.cwd, mode);
-	
-	CWD_STATE_FREE(&new_state);
-	
-	return ret;
-}
-#endif
-
-
 #if HAVE_UTIME
 CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC)
 {
@@ -563,7 +501,7 @@ CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC)
 	int ret;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL, 0);
+	virtual_file_ex(&new_state, filename, NULL);
 
 	ret = utime(new_state.cwd, buf);
 
@@ -578,7 +516,7 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC)
 	int ret;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL, 1);
+	virtual_file_ex(&new_state, filename, NULL);
 
 	ret = chmod(new_state.cwd, mode);
 
@@ -586,14 +524,14 @@ CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC)
 	return ret;
 }
 
-#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#ifndef TSRM_WIN32
 CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC)
 {
 	cwd_state new_state;
 	int ret;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, filename, NULL, 0);
+	virtual_file_ex(&new_state, filename, NULL);
 
 	ret = chown(new_state.cwd, owner, group);
 
@@ -608,7 +546,7 @@ CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...)
 	int f;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	virtual_file_ex(&new_state, path, NULL);
 
 	if (flags & O_CREAT) {
 		mode_t mode;
@@ -632,7 +570,7 @@ CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC)
 	int f;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	virtual_file_ex(&new_state, path, NULL);
 
 	f = creat(new_state.cwd,  mode);
 
@@ -647,11 +585,11 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&old_state, &CWDG(cwd));
-	virtual_file_ex(&old_state, oldname, NULL, 0);
+	virtual_file_ex(&old_state, oldname, NULL);
 	oldname = old_state.cwd;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, newname, NULL, 0);
+	virtual_file_ex(&new_state, newname, NULL);
 	newname = new_state.cwd;
  
 	retval = rename(oldname, newname);
@@ -662,50 +600,36 @@ CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC)
 	return retval;
 }
 
-#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC)
 {
 	cwd_state new_state;
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+	virtual_file_ex(&new_state, path, NULL);
 
 	retval = stat(new_state.cwd, buf);
 
 	CWD_STATE_FREE(&new_state);
 	return retval;
 }
-#else
-CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC)
-{
-	cwd_state new_state;
-	int retval;
 
-	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 1);
+#ifndef TSRM_WIN32
 
-	retval = stat(new_state.cwd, (struct stat*)buf);
-
-	CWD_STATE_FREE(&new_state);
-	return retval;
-}
-#endif
-
-#if !defined(TSRM_WIN32) && !defined(NETWARE)
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC)
 {
 	cwd_state new_state;
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 0);
+	virtual_file_ex(&new_state, path, NULL);
 
 	retval = lstat(new_state.cwd, buf);
 
 	CWD_STATE_FREE(&new_state);
 	return retval;
 }
+
 #endif
 
 CWD_API int virtual_unlink(const char *path TSRMLS_DC)
@@ -714,7 +638,7 @@ CWD_API int virtual_unlink(const char *path TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, path, NULL, 0);
+	virtual_file_ex(&new_state, path, NULL);
 
 	retval = unlink(new_state.cwd);
 
@@ -728,7 +652,7 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 1);
+	virtual_file_ex(&new_state, pathname, NULL);
 
 #ifdef TSRM_WIN32
 	retval = mkdir(new_state.cwd);
@@ -745,7 +669,7 @@ CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC)
 	int retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 0);
+	virtual_file_ex(&new_state, pathname, NULL);
 
 	retval = rmdir(new_state.cwd);
 
@@ -763,7 +687,7 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC)
 	DIR *retval;
 
 	CWD_STATE_COPY(&new_state, &CWDG(cwd));
-	virtual_file_ex(&new_state, pathname, NULL, 1);
+	virtual_file_ex(&new_state, pathname, NULL);
 
 	retval = opendir(new_state.cwd);
 
@@ -771,45 +695,7 @@ CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC)
 	return retval;
 }
 
-#ifdef TSRM_WIN32
-
-CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
-{
-	return popen_ex(command, type, CWDG(cwd).cwd, NULL);
-}
-
-#elif defined(NETWARE)
-
-/* On NetWare, the trick of prepending "cd cwd; " doesn't work so we need to perform
-   a VCWD_CHDIR() and mutex it
- */
-CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
-{
-	char prev_cwd[MAXPATHLEN];
-	char *getcwd_result;
-	FILE *retval;
-
-	getcwd_result = VCWD_GETCWD(prev_cwd, MAXPATHLEN);
-	if (!getcwd_result) {
-		return NULL;
-	}
-
-#ifdef ZTS
-	tsrm_mutex_lock(cwd_mutex);
-#endif
-
-	VCWD_CHDIR(CWDG(cwd).cwd);
-	retval = popen(command, type);
-	VCWD_CHDIR(prev_cwd);
-
-#ifdef ZTS
-	tsrm_mutex_unlock(cwd_mutex);
-#endif
-
-	return retval;
-}
-
-#else /* Unix */
+#ifndef TSRM_WIN32
 
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 {
@@ -845,6 +731,37 @@ CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
 	return retval;
 }
 
+#else
+
+/* On Windows the trick of prepending "cd cwd; " doesn't work so we need to perform
+   a real chdir() and mutex it
+ */
+CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC)
+{
+	char prev_cwd[MAXPATHLEN];
+	char *getcwd_result;
+	FILE *retval;
+
+	getcwd_result = getcwd(prev_cwd, MAXPATHLEN);
+	if (!getcwd_result) {
+		return NULL;
+	}
+
+#ifdef ZTS
+	tsrm_mutex_lock(cwd_mutex);
+#endif
+
+	chdir(CWDG(cwd).cwd);
+	retval = popen(command, type);
+	chdir(prev_cwd);
+
+#ifdef ZTS
+	tsrm_mutex_unlock(cwd_mutex);
+#endif
+
+	return retval;
+}
+
 #endif
 
 

TSRM/tsrm_virtual_cwd.h

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
+   | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
+   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -50,52 +50,26 @@ typedef unsigned short mode_t;
 #define DEFAULT_SLASH '\\'
 #define DEFAULT_DIR_SEPARATOR	';'
 #define IS_SLASH(c)	((c) == '/' || (c) == '\\')
-#define IS_SLASH_P(c)	(*(c) == '/' || \
-        (*(c) == '\\' && !IsDBCSLeadByte(*(c-1))))
-
-/* COPY_WHEN_ABSOLUTE also takes path as argument because netware needs it
- * to account for volume name that is unique to NetWare absolute paths
- */
-#define COPY_WHEN_ABSOLUTE(path) 2
+#define COPY_WHEN_ABSOLUTE 2
 #define IS_ABSOLUTE_PATH(path, len) \
-	(len >= 2 && ((isalpha(path[0]) && path[1] == ':') || (IS_SLASH(path[0]) && IS_SLASH(path[1]))))
+	(len >= 2 && isalpha(path[0]) && path[1] == ':')
 #define IS_UNC_PATH(path, len) \
 	(len >= 2 && IS_SLASH(path[0]) && IS_SLASH(path[1]))
 
-#elif defined(NETWARE)
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-
-#define DEFAULT_SLASH '/'
-#define DEFAULT_DIR_SEPARATOR	';'
-#define IS_SLASH(c)	((c) == '/' || (c) == '\\')
-#define COPY_WHEN_ABSOLUTE(path) \
-    (strchr(path, ':') - path + 1)  /* Take the volume name which ends with a colon */
-#define IS_ABSOLUTE_PATH(path, len) \
-    (strchr(path, ':') != NULL) /* Colon indicates volume name */
-
 #else
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #endif
 
 #define DEFAULT_SLASH '/'
-
-#ifdef __riscos__
-#define DEFAULT_DIR_SEPARATOR  ';'
-#else
-#define DEFAULT_DIR_SEPARATOR  ':'
-#endif
-
+#define DEFAULT_DIR_SEPARATOR	':'
 #define IS_SLASH(c)	((c) == '/')
-#define IS_SLASH_P(c)	(*(c) == '/')
 
 #endif
 
 
 #ifndef COPY_WHEN_ABSOLUTE
-#define COPY_WHEN_ABSOLUTE(path) 0
+#define COPY_WHEN_ABSOLUTE 0
 #endif
 
 #ifndef IS_ABSOLUTE_PATH	
@@ -137,12 +111,8 @@ CWD_API FILE *virtual_fopen(const char *path, const char *mode TSRMLS_DC);
 CWD_API int virtual_open(const char *path TSRMLS_DC, int flags, ...);
 CWD_API int virtual_creat(const char *path, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rename(char *oldname, char *newname TSRMLS_DC);
-#if !(defined(NETWARE) && defined(CLIB_STAT_PATCH))
 CWD_API int virtual_stat(const char *path, struct stat *buf TSRMLS_DC);
-#else
-CWD_API int virtual_stat(const char *path, struct stat_libc *buf TSRMLS_DC);
-#endif
-#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#ifndef TSRM_WIN32
 CWD_API int virtual_lstat(const char *path, struct stat *buf TSRMLS_DC);
 #endif
 CWD_API int virtual_unlink(const char *path TSRMLS_DC);
@@ -150,20 +120,15 @@ CWD_API int virtual_mkdir(const char *pathname, mode_t mode TSRMLS_DC);
 CWD_API int virtual_rmdir(const char *pathname TSRMLS_DC);
 CWD_API DIR *virtual_opendir(const char *pathname TSRMLS_DC);
 CWD_API FILE *virtual_popen(const char *command, const char *type TSRMLS_DC);
-
-#if !defined(TSRM_WIN32)
-CWD_API int virtual_access(const char *pathname, int mode TSRMLS_DC);
-#endif
-
 #if HAVE_UTIME
 CWD_API int virtual_utime(const char *filename, struct utimbuf *buf TSRMLS_DC);
 #endif
 CWD_API int virtual_chmod(const char *filename, mode_t mode TSRMLS_DC);
-#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#ifndef TSRM_WIN32
 CWD_API int virtual_chown(const char *filename, uid_t owner, gid_t group TSRMLS_DC);
 #endif
 
-CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path, int use_realpath);
+CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func verify_path);
 
 typedef struct _virtual_cwd_globals {
 	cwd_state cwd;
@@ -194,7 +159,9 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_REALPATH(path, real_path) virtual_realpath(path, real_path TSRMLS_CC)
 #define VCWD_RENAME(oldname, newname) virtual_rename(oldname, newname TSRMLS_CC)
 #define VCWD_STAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
-#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#ifdef TSRM_WIN32
+#define VCWD_LSTAT(path, buff) virtual_stat(path, buff TSRMLS_CC)
+#else
 #define VCWD_LSTAT(path, buff) virtual_lstat(path, buff TSRMLS_CC)
 #endif
 #define VCWD_UNLINK(path) virtual_unlink(path TSRMLS_CC)
@@ -202,12 +169,11 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_RMDIR(pathname) virtual_rmdir(pathname TSRMLS_CC)
 #define VCWD_OPENDIR(pathname) virtual_opendir(pathname TSRMLS_CC)
 #define VCWD_POPEN(command, type) virtual_popen(command, type TSRMLS_CC)
-#define VCWD_ACCESS(pathname, mode) virtual_access(pathname, mode TSRMLS_CC)
 #if HAVE_UTIME
 #define VCWD_UTIME(path, time) virtual_utime(path, time TSRMLS_CC)
 #endif
 #define VCWD_CHMOD(path, mode) virtual_chmod(path, mode TSRMLS_CC)
-#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#ifndef TSRM_WIN32
 #define VCWD_CHOWN(path, owner, group) virtual_chown(path, owner, group TSRMLS_CC)
 #endif
 
@@ -229,9 +195,8 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_RMDIR(pathname) rmdir(pathname)
 #define VCWD_OPENDIR(pathname) opendir(pathname)
 #define VCWD_POPEN(command, type) popen(command, type)
-#define VCWD_ACCESS(pathname, mode) access(pathname, mode)
 
-#ifdef HAVE_REALPATH
+#ifndef TSRM_WIN32
 #define VCWD_REALPATH(path, real_path) realpath(path, real_path)
 #else
 #define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
@@ -241,7 +206,7 @@ typedef struct _virtual_cwd_globals {
 #define VCWD_UTIME(path, time) utime(path, time)
 #endif
 #define VCWD_CHMOD(path, mode) chmod(path, mode)
-#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#ifndef TSRM_WIN32
 #define VCWD_CHOWN(path, owner, group) chown(path, owner, group)
 #endif
 

TSRM/tsrm_win32.c

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
+   | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
+   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -18,6 +18,7 @@
 
 /* $Id$ */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>
@@ -27,6 +28,7 @@
 #include "TSRM.h"
 
 #ifdef TSRM_WIN32
+#include <windows.h>
 #include "tsrm_win32.h"
 
 #ifdef ZTS
@@ -148,11 +150,6 @@ static HANDLE dupHandle(HANDLE fh, BOOL inherit) {
 }
 
 TSRM_API FILE *popen(const char *command, const char *type)
-{
-	return popen_ex(command, type, NULL, NULL);
-}
-
-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
 {
 	FILE *stream = NULL;
 	int fno, str_len = strlen(type), read, mode;
@@ -195,7 +192,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
 
 	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c "));
 	sprintf(cmd, "%s /c %s", TWG(comspec), command);
-	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS, env, cwd, &startup, &process)) {
+	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &process)) {
 		return NULL;
 	}
 	free(cmd);

TSRM/tsrm_win32.h

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
+   | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
+   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -22,6 +22,8 @@
 #define TSRM_WIN32_H
 
 #include "TSRM.h"
+
+#ifdef TSRM_WIN32
 #include <windows.h>
 
 struct ipc_perm {
@@ -71,6 +73,8 @@ typedef struct {
 # define TWG(v) (win32_globals.v)
 #endif
 
+#endif
+
 #define IPC_PRIVATE	0
 #define IPC_CREAT	00001000
 #define IPC_EXCL	00002000
@@ -92,7 +96,6 @@ typedef struct {
 TSRM_API void tsrm_win32_startup(void);
 TSRM_API void tsrm_win32_shutdown(void);
 
-TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env);
 TSRM_API FILE *popen(const char *command, const char *type);
 TSRM_API int pclose(FILE *stream);
 

apidoc-zend.txt

@@ -0,0 +1,276 @@
+Following is a merge of two letters I sent to php4beta@lists.php.net,
+describing the changes in API between PHP 3.0 and PHP 4.0 (Zend).
+This file is by no means thorough documentation of the PHP API,
+and is intended for developers who are familiar with the PHP 3.0 API,
+and want to port their code to PHP 4.0, or take advantage of its new
+features.  For highlights about the PHP 3.0 API, consult apidoc.txt.
+
+Zeev
+
+--------------------------------------------------------------------------
+
+I'm going to try to list the important changes in API and programming
+techniques that are involved in developing modules for PHP4/Zend, as
+opposed to PHP3.  Listing the whole PHP4 API is way beyond my scope here,
+it's mostly a 'diff' from the apidoc.txt, which you're all pretty familiar
+with.
+An important note that I neglected to mention yesterday - the php4 tree is
+based on the php 3.0.5 tree, plus all 3.0.6 patches hand-patched into it.
+Notably, it does NOT include any 3.0.7 patches.  All of those have to be
+reapplied, with extreme care - modules should be safe to patch (mostly),
+but anything that touches the core or main.c will almost definitely require
+changes in order to work properly.
+
+[1]  Symbol Tables
+
+One of the major changes in Zend involves changing the way symbols tables
+work.  Zend enforces reference counting on all values and resources.  This
+required changes in the semantics of the hash tables that implement symbol
+tables.  Instead of storing pval in the hashes, we now store pval *.  All
+of the API functions in Zend were changed in a way that this change is
+completely transparent.  However, if you've used 'low level' hash functions
+to access or update elements in symbol tables, your code will require
+changes.  Following are two simple examples, one demonstrates the
+difference between PHP3 and Zend when reading a symbol's value, and the
+other demonstrates the difference when writing a value.
+
+php3_read()
+{
+	pval *foo;
+
+	_php3_hash_find(ht, "foo", sizeof("foo"), &foo);
+	/* foo->type is the type and foo->value is the value */
+}
+
+
+php4_read()
+{
+	pval **foo;
+
+	_php3_hash_find(ht, "foo", sizeof("foo"), &foo);
+	/* (*foo)->type is the type and (*foo)->value is the value */
+}
+
+---
+
+php3_write()
+{
+	pval newval;
+
+	newval.type = ...;
+	newval.value = ...;
+	_php3_hash_update(ht, "bar", sizeof("bar"), &newval, sizeof(pval), NULL);
+}
+
+php4_write()
+{
+	pval *newval = ALLOC_ZVAL();
+
+	newval->refcount=1;
+	newval->is_ref=0;
+	newval->type = ...;
+	newval->value = ...;
+	_php3_hash_update(ht, "bar", sizeof("bar"), &newval, sizeof(pval *), NULL);
+}
+
+
+[2]  Resources
+
+One of the 'cute' things about the reference counting support is that it
+completely eliminates the problem of resource leaking.  A simple loop that
+included '$result = mysql_query(...)' in PHP leaked unless the user
+remembered to run mysql_free($result) at the end of the loop body, and
+nobody really did.  In order to take advantage of the automatic resource
+deallocation upon destruction, there's virtually one small change you need
+to conduct.  Change the result type of a resource that you want to destroy
+itself as soon as its no longer referenced (just about any resource I can
+think of) as IS_RESOURCE, instead of as IS_LONG.  The rest is magic.
+
+A special treatment is required for SQL modules that follow MySQL's
+approach for having the link handle as an optional argument.  Modules that
+follow the MySQL module model, store the last opened link in a global
+variable, that they use in case the user neglects to explicitly specify a
+link handle.  Due to the way referenec counting works, this global
+reference is just like any other reference, and must increase that SQL link
+resource's reference count (otherwise, it will be closed prematurely).
+Simply, when you set the default link to a certain link, increase that
+link's reference count by calling zend_list_addref().
+As always, the MySQL module is the one used to demonstrate 'new
+technology'.  You can look around it and look for IS_RESOURCE, as well as
+zend_list_addref(), to see a clear example of how the new API should be used.
+
+
+[3]  Thread safety issues
+
+I'm not going to say that Zend was designed with thread safety in mind, but
+from some point, we've decided upon several guidelines that would make the
+move to thread safety much, much easier.  Generally, we've followed the PHP
+3.1 approach of moving global variables to a structure, and encapsulating
+all global variable references within macros.  There are three main
+differences:
+1.  We grouped related globals in a single structure, instead of grouping
+all globals in one structure.
+2.  We've used much, much shorter macro names to increase the readability
+of the source code.
+3.  Regardless of whether we're compiling in thread safe mode or not, all
+global variables are *always* stored in a structure.  For example, you
+would never have a global variable 'foo', instead, it'll be a property of a
+global structure, for example, compiler_globals.foo.  That makes
+development much, much easier, since your code will simply not compile
+unless you remember to put the necessary macro around foo.
+
+To write code that'll be thread safe in the future (when we release our
+thread safe memory manager and work on integrating it), you can take a look
+at zend_globals.h.  Essentially, two sets of macros are defined, one for
+thread safe mode, and one for thread unsafe mode.  All global references
+are encapsulated within ???G(varname), where ??? is the appropriate prefix
+for your structure (for example, so far we have CG(), EG() and AG(), which
+stand for the compiler, executor and memory allocator, respectively).
+When compiling with thread safety enabled, each function that makes use of
+a ???G() macro, must obtain the pointer to its copy of the structure.  It
+can do so in one of two forms:
+1.  It can receive it as an argument.
+2.  It can fetch it.
+
+Obviously, the first method is preferable since it's much quicker.
+However, it's not always possible to send the structure all the way to a
+particular function, or it may simply bloat the code too much in some
+cases.  Functions that receive the globals as an argument, should look like
+this:
+
+rettype functioname(???LS_D)			<-- a function with no arguments
+rettype functioname(type arg1, ..., type argn ???LS_DC)	<-- a funciton with
+arguments
+
+Calls to such functions should look like this:
+functionname(???LS_C)				<-- a function with no arguments
+functionname(arg1, ..., argn ???LS_CC)		<-- a function with arguments
+
+LS stands for 'Local Storage', _C stands for Call and _CC stands for Call
+Comma, _D stands for Declaration and _DC stands for Declaration Comma.
+Note that there's NO comma between the last argument and ???LS_DC or ???LS_CC.
+
+In general, every module that makes use of globals should use this approach
+if it plans to be thread safe.
+
+
+[4]  Generalized INI support
+
+The code comes to solve several issues:
+
+a.  The ugly long block of code in main.c that reads values from the
+cfg_hash into php3_ini.
+b.  Get rid of php3_ini.  The performance penalty of copying it around all
+the time in the Apache module probably wasn't too high, but
+psychologically, it annoyed me :)
+c.  Get rid of the ugly code in mod_php4.c, that also reads values from
+Apache directives and puts them into the php3_ini structure.
+d.  Generalize all the code so that you only have to add an entry in one
+single place and get it automatically supported in php3.ini, Apache, Win32
+registry, runtime function ini_get() and ini_alter() and any future method
+we might have.
+e.  Allow users to easily override *ANY* php3.ini value, except for ones
+they're not supposed to, of course.
+
+I'm happy to say that I think I pretty much reached all goals.  php_ini.c
+implements a mechanism that lets you add your INI entry in a single place,
+with a default value in case there's no php3.ini value.  What you get by
+using this mechanism:
+
+1.  Automatic initialization from php3.ini if available, or from the
+default value if not.
+2.  Automatic support in ini_alter().  That means a user can change the
+value for this INI entry at runtime, without you having to add in a single
+line of code, and definitely no additional function (for example, in PHP3,
+we had to add in special dedicated functions, like
+set_magic_quotes_runtime() or the likes - no need for that anymore).
+3.  Automatic support in Apache .conf files.
+4.  No need for a global php3_ini-like variable that'll store all that
+info.  You can directly access each INI entry by name, in runtime.  'Sure,
+that's not revolutionary, it's just slow' is probably what some of you
+think - which is true, but, you can also register a callback function that
+is called each time your INI entry is changed, if you wish to store it in a
+cached location for intensive use.
+5.  Ability to access the current active value for a given INI entry, and
+the 'master' value.
+
+Of course, (2) and (3) are only applicable in some cases.  Some entries
+shouldn't be overriden by users in runtime or through Apache .conf files -
+you can, of course, mark them as such.
+
+
+So, enough hype, how does it work.
+
+Essentially:
+
+static PHP_INI_MH(OnChangeBar);	/* declare a message handler for a change
+in "bar" */
+
+PHP_INI_BEGIN()
+	PHP_INI_ENTRY("foo",	"1",	PHP_INI_ALL,		NULL,		NULL)
+	PHP_INI_ENTRY("bar",	"bah",	PHP_INI_SYSTEM,	OnChangeBar,	NULL)
+PHP_INI_END()
+
+static PHP_INI_MH(OnChangeBar)
+{
+	a_global_var_for_bar = new_value;
+	return SUCCESS;
+}
+
+int whatever_minit(INIT_FUNC_ARGS)
+{	
+	...
+	REGISTER_INI_ENTRIES();
+	...
+}	
+
+
+int whatever_mshutdown(SHUTDOWN_FUNC_ARGS)
+{
+	...
+	UNREGISTER_INI_ENTRIES();
+	...
+}
+
+
+and that's it.  Here's what it does.  As you can probably guess, this code
+registers two INI entries - "foo" and "bar".  They're given defaults "1"
+and "bah" respectively - note that all defaults are always given as
+strings.  That doesn't reduce your ability to use integer values, simply
+specify them as strings.  "foo" is marked so that it can be changed by
+anyone at any time (PHP_INI_ALL), whereas "bar" is marked so it can be
+changed only at startup in the php3.ini only, presumably, by the system
+administrator (PHP_INI_SYSTEM).
+When "foo" changes, no function is called.  Access to it is done using the
+macros INI_INT("foo"), INI_FLT("foo") or INI_STR("foo"), which return a
+long, double or char * respectively (strings that are returned aren't
+duplicated - if they're manipulated, you must duplicate them first).  You
+can also access the original value (the 'master' value, in case one of them
+was overriden by a user) using another pair of macros:
+INI_ORIG_INT("foo"), INI_ORIG_FLT("foo") and INI_ORIG_STR("foo").
+
+When "bar" changes, a special message handler is called, OnBarChange().
+Always declare those message handlers using PHP_INI_MH(), as they might
+change in the future.  Message handlers are called as soon as an ini entry
+initializes or changes, and allow you to cache a certain INI value in a
+quick C structure.  In this example, whenever "bar" changes, the new value
+is stored in a_global_var_for_bar, which is a global char * pointer,
+quickly accessible from other functions.  Things get a bit more complicated
+when you want to implement a thread-safe module, but it's doable as well.
+Message handlers may return SUCCESS to acknowledge the new value, or
+FAILURE to reject it.  That enables you to reject invalid values for some
+INI entries if you want.  Finally, you can have a pointer passed to your
+message handler - that's the fifth argument to PHP_INI_ENTRY().  It is
+passed as mh_arg to the message handler.
+
+Remember that for certain values, there's really no reason to mess with a
+callback function.  A perfect example for this are the syntax highlight
+colors, which no longer have a dedicated global C slot that stores them,
+but instead, are fetched from the php_ini hash on demand.
+
+"As always", for a perfect working example of this mechanism, consult
+functions/mysql.c.  This module uses the new INI entry mechanism, and was
+also converted to be thread safe in general, and in its php_ini support in
+particular.  Converting your modules to look like this for thread safety
+isn't a bad idea (not necessarily now, but in the long run).
+

apidoc.txt

@@ -0,0 +1,492 @@
+PHP Version 3.0 API Documentation
+
+Table of Contents
+-----------------
+ 1. Function Prototype
+ 2. Function Arguments
+ 3. Variable number of function arguments
+ 4. Using the function arguments
+ 5. Memory management in functions
+ 6. Setting variables in the symbol table
+ 7. Returning values from functions
+ 8. Returning 'complex' values from functions (arrays or objects)
+ 9. Using the resource list
+10. Using the persistent resource table
+11. Adding runtime configuration directives
+----------------- 
+
+1. Function Prototype
+
+   All functions look like this:
+
+       PHP_FUNCTION(foo) {
+
+       }
+
+   Even if your function doesn't take any arguments, this is how it is
+   called.
+
+-----------------
+
+2. Function Arguments
+
+   Arguments are always of type pval.  This type contains a union which
+   has the actual type of the argument.  So, if your function takes two
+   arguments, you would do something like the following at the top of your
+   function:
+
+       pval *arg1, *arg2;
+       if (ARG_COUNT(ht) != 2 || getParameters(ht,2,&arg1,&arg2)==FAILURE) {
+           WRONG_PARAM_COUNT;
+       }
+
+   NOTE: Arguments can be passed either by value or by reference. In both
+   cases you will need to pass &(pval *) to getParameters. If you want to
+   check if the n'th parameter was sent to you by reference or not, you can
+   use the function, ParameterPassedByReference(ht,n). It will return either
+   1 or 0.
+
+   When you change any of the passed parameters, whether they are sent by
+   reference or by value, you can either start over with the parameter by
+   calling pval_destructor on it, or if it's an ARRAY you want to add to,
+   you can use functions similar to the ones in internal_functions.h which
+   manipulate return_value as an ARRAY.
+
+   Also if you change a parameter to IS_STRING make sure you first assign
+   the new estrdup'ed string and the string length, and only later change the
+   type to IS_STRING. If you change the string of a parameter which already
+   IS_STRING or IS_ARRAY you should run pval_destructor on it first.
+   
+-----------------
+
+3. Variable number of function arguments
+
+   A function can take a variable number of arguments.  If your function can
+   take either 2 or 3 arguments, use the following:
+
+       pval *arg1, *arg2, *arg3;
+       int arg_count = ARG_COUNT(ht);
+
+       if (arg_count<2 || arg_count>3 ||
+           getParameters(ht,arg_count,&arg1,&arg2,&arg3)==FAILURE) {
+           WRONG_PARAM_COUNT;
+       }
+
+------------------
+
+4. Using the function arguments
+
+   The type of each argument is stored in the pval type field:
+
+
+   This type can be any of the following:
+
+       IS_STRING             String
+       IS_DOUBLE             Double-precision floating point
+       IS_LONG               Long
+       IS_ARRAY              Array
+
+       IS_EMPTY              ??
+       IS_USER_FUNCTION      ??
+       IS_INTERNAL_FUNCTION  ?? (if some of these cannot be passed to a
+                                 function - delete)
+       IS_CLASS              ??
+       IS_OBJECT             ??
+       
+   If you get an argument of one type and would like to use it as another,
+   or if you just want to force the argument to be of a certain type, you
+   can use one of the following conversion functions:
+
+       convert_to_long(arg1);
+       convert_to_double(arg1);
+       convert_to_string(arg1); 
+       convert_to_boolean_long(arg1);    If the string is "" or "0" it
+                                         becomes 0, 1 otherwise
+       convert_string_to_number(arg1);   Converts string to either LONG or
+                                         DOUBLE depending on string
+
+   These function all do in-place conversion.  They do not return anything.
+
+   The actual argument is stored in a union.  
+
+   For type IS_STRING, use arg1->value.str.val
+            IS_LONG        arg1->value.lval
+            IS_DOUBLE      arg1->value.dval
+ 
+-------------------
+
+5. Memory management in functions
+
+   Any memory needed by a function should be allocated with either emalloc()
+   or estrdup().  These are memory handling abstraction functions that look
+   and smell like the normal malloc() and strdup() functions.  Memory should
+   be freed with efree().
+
+   There are two kinds of memory in this program. Memory which is returned
+   to the parser in a variable and memory which you need for temporary
+   storage in your internal function.  When you assign a string to a
+   variable which is returned to the parser you need to make sure you first
+   allocate the memory with either emalloc or estrdup.  This memory
+   should NEVER be freed by you, unless you later, in the same function
+   overwrite your original assignment (this kind of programming practice is
+   not good though).
+
+   For any temporary/permanent memory you need in your functions/library you
+   should use the three emalloc(), estrdup(), and efree() functions. They
+   behave EXACTLY like their counterpart functions. Anything you emalloc()
+   or estrdup() you have to efree() at some point or another, unless it's
+   supposed to stick around until the end of the program, otherwise there
+   will be a memory leak. The meaning of "the functions behave exactly like
+   their counterparts" is if you efree() something which was not
+   emalloc()'ed nor estrdup()'ed you might get a segmentation fault. So
+   please take care and free all of your wasted memory. One of the biggest
+   improvements in PHP 3.0 will hopefully be the memory management.
+
+   If you compile with "-DDEBUG", PHP3 will print out a list of all
+   memory that was allocated using emalloc() and estrdup() but never
+   freed with efree() when it is done running the specified script.
+
+-------------------
+
+6. Setting variables in the symbol table
+
+   A number of macros are available which make it easier to set a variable
+   in the symbol table:
+
+       SET_VAR_STRING(name,value) **
+       SET_VAR_DOUBLE(name,value)
+       SET_VAR_LONG(name,value)
+
+   ** Be careful here.  The value part must be malloc'ed manually because
+      the memory management code will try to free this pointer later.  Do
+      not pass statically allocated memory into a SET_VAR_STRING
+
+  Symbol tables in PHP 3.0 are implemented as hash tables.  At any given time,
+  &symbol_table is a pointer to the 'main' symbol table, and active_symbol_table
+  points to the currently active symbol table (these may be identical like in
+  startup, or different, if you're inside a function).
+  
+  The following examples use 'active_symbol_table'.  You should replace it with
+  &symbol_table if you specifically want to work with the 'main' symbol table.
+  Also, the same funcions may be applied to arrays, as explained below.
+  
+  * To check whether a variable named $foo already exists in a symbol table:
+    if (hash_exists(active_symbol_table,"foo",sizeof("foo"))) { exists... }
+    else { doesn't exist }
+  
+  * If you also need to get the type of the variable, you can use:
+    hash_find(active_symbol_table,"foo",sizeof("foo"),&pvalue);
+    check(pvalue.type);
+  
+  Arrays in PHP 3.0 are implemented using the same hashtables as symbol tables.
+  This means the two above functions can also be used to check variables
+  inside arrays.
+
+  If you want to define a new array in a symbol table, you should do this:
+
+      1.  Possibly check it exists and abort, using hash_exists()
+          or hash_find().
+      2.  Code:
+  
+      pval arr;
+  
+      if (array_init(&arr) == FAILURE) { failed... };
+      hash_update(active_symbol_table,"foo",sizeof("foo"),&arr,sizeof(pval),NULL);
+  
+  This code declares a new array, named $foo, in the active symbol table.
+  This array is empty.
+  
+  Here's how to add new entries to it:
+  
+      pval entry;
+  
+      entry.type = IS_LONG;
+      entry.value.lval = 5;
+  
+      hash_update(arr.value.ht,"bar",sizeof("bar"),&entry,sizeof(pval),NULL); /* defines $foo["bar"] = 5 */
+      hash_index_update(arr.value.ht,7,&entry,sizeof(pval),NULL); /* defines $foo[7] = 5 */
+      hash_next_index_insert(arr.value.ht,&entry,sizeof(pval),NULL); /* defines the next free place in $foo[],
+                                                                         * $foo[8], to be 5 (works like php2)
+                                                                         */
+  
+  If you'd like to modify a value that you inserted to a hash, you must first retreive it from the hash.  To
+  prevent that overhead, you can supply a pval ** to the hash add function, and it'll be updated with the
+  pval * address of the inserted element inside the hash.  If that value is NULL (like in all of the
+  above examples) - that parameter is ignored.
+
+  hash_next_index_insert() works more or less using the same logic
+  "$foo[] = bar;" works in PHP 2.0.
+
+  If you are building an array to return from a function, you can initialize
+  the array just like above by doing:
+
+    if (array_init(return_value) == FAILURE) { failed...; }
+
+  and then adding values with the helper functions:
+
+    add_next_index_long(return_value,long_value);
+    add_next_index_double(return_value,double_value);
+    add_next_index_string(return_value,estrdup(string_value));
+  
+  Of course, if the adding isn't done right after the array
+  initialization, you'd probably have to look for the array first:
+  
+    pval *arr;
+  
+    if (hash_find(active_symbol_table,"foo",sizeof("foo"),(void **)&arr)==FAILURE) { can't find... }
+    else { use arr->value.ht... }
+  
+  Note that hash_find receives a pointer to a pval pointer, and
+  not a pval pointer.
+  
+  Just about any hash function returns SUCCESS or FAILURE (except for
+  hash_exists() that returns a boolean truth value).
+    
+-------------------
+
+7. Returning 'simple' values from functions (integers, floats or strings)
+
+   A number of macros are available to make it easier to return things from
+   functions:
+
+   These set the return value and return from the function:
+
+   RETURN_FALSE
+   RETURN_TRUE
+   RETURN_LONG(l)
+   RETURN_STRING(s,dup)        If dup is true, duplicates the string
+   RETURN_STRINGL(s,l,dup)     Return string (s) specifying length (l).
+   RETURN_DOUBLE(d)
+
+   These only set the return value:
+
+   RETVAL_FALSE
+   RETVAL_TRUE
+   RETVAL_LONG(l)
+   RETVAL_STRING(s,dup)       If dup is true, duplicates the string
+   RETVAL_STRINGL(s,l,dup)    Return string (s) specifying length (l).
+   RETVAL_DOUBLE(d)
+
+   The string macros above will all estrdup() the passed 's' argument,
+   so you can safely free the argument after calling the macro, or
+   alternatively use statically allocated memory.
+
+   If your function returns boolean success/error responses, always use
+   RETURN_TRUE and RETURN_FALSE respectively.
+
+-------------------
+
+8. Returning 'complex' values from functions (arrays or objects)
+
+   Your function can also return a complex data type such as an object
+   or an array.
+
+   Returning an object:
+
+   1. Call object_init(return_value).
+   2. Fill it up with values:
+
+   add_property_long(return_value,property_name,l)			Add a property named 'property_name', of type long, equals to 'l'
+   add_property_double(return_value,property_name,d)		Same, only a double
+   add_property_string(return_value,property_name,str)		Same, only a string
+   add_property_stringl(return_value,property_name,str,l)	Add a property named 'property_name', of type string, string is 'str' with length 'l'
+
+   3. Possibly, register functions for this object.  In order to
+      obtain values from the object, the function would have to fetch
+      "this" from the active_symbol_table.  Its type should be IS_OBJECT,
+      and it's basically a regular hash table (i.e., you can use regular
+      hash functions on .value.ht).  The actual registration of the
+      function can be done using:
+   
+   add_method(return_value,function_name,function_ptr)
+   
+   
+   Returning an array:
+
+   1.  Call array_init(return_value).
+   2.  Fill it up with values:
+
+   add_assoc_long(return_value,key,l)				add associative entry with key 'key' and long value 'l'
+   add_assoc_double(return_value,key,d)		
+   add_assoc_string(return_value,key,str)
+   add_assoc_stringl(return_value,key,str,length)	specify the string length
+
+   add_index_long(return_value,index,l)				add entry in index 'index' with long value 'l'
+   add_index_double(return_value,index,d)
+   add_index_string(return_value,index,str)
+   add_index_stringl(return_value,index,str,length)  specify the string length
+
+   add_next_index_long(return_value,l)				add an array entry in the next free offset with long value 'l'
+   add_next_index_double(return_value,d)
+   add_next_index_string(return_value,str)
+   add_next_index_stringl(return_value,str,length)	specify the string length
+
+-------------------
+
+9. Using the resource list
+
+   PHP 3.0 has a standard way of dealing with various types of resources,
+   that replaces all of the local linked lists in PHP 2.0.
+
+   Available functions:
+
+   php3_list_insert(ptr, type)      returns the 'id' of the newly inserted resource
+   php3_list_delete(id)             delete the resource with the specified id
+   php3_list_find(id,*type)         returns the pointer of the resource with the specified id, updates 'type' to the resource's type
+
+   Typically, these functions are used for SQL drivers but they can be
+   used for anything else, and are used, for instance, for maintaining
+   file descriptors.
+
+   Typical list code would look like this:
+
+	Adding a new resource:
+
+		RESOURCE *resource;
+
+		...allocate memory for resource and acquire resource...
+		/* add a new resource to the list */
+		return_value->value.lval = php3_list_insert((void *) resource, LE_RESOURCE_TYPE);
+		return_value->type = IS_LONG;
+
+	Using an existing resource:
+
+		pval *resource_id;
+		RESOURCE *resource;
+		int type;
+
+		convert_to_long(resource_id);
+		resource = php3_list_find(resource_id->value.lval, &type);
+		if (type != LE_RESOURCE_TYPE) {
+			php3_error(E_WARNING,"resource index %d has the wrong type",resource_id->value.lval);
+			RETURN_FALSE;
+		}
+		...use resource...
+
+	Deleting an existing resource:
+
+		pval *resource_id;
+		RESOURCE *resource;
+		int type;
+
+		convert_to_long(resource_id);
+		php3_list_delete(resource_id->value.lval);
+   
+
+   The resource types should be registered in php3_list.h, in enum
+   list_entry_type.  In addition, one should add shutdown code for any
+   new resource type defined, in list.c's list_entry_destructor() (even if
+   you don't have anything to do on shutdown, you must add an empty case).
+
+-------------------
+
+10. Using the persistent resource table
+
+   PHP 3.0 has a standard way of storing persistent resources (i.e.,
+   resources that are kept in between hits).  The first module to use
+   this feature was the MySQL module, and mSQL followed it, so one can
+   get the general impression of how a persistent resource should be
+   used by reading mysql.c.  The functions you should look at are:
+   php3_mysql_do_connect()
+   php3_mysql_connect()
+   php3_mysql_pconnect()
+
+   The general idea of persistence modules is this:
+   1.  Code all of your module to work with the regular resource list
+       mentioned in section (9).
+   2.  Code extra connect functions that check if the resource already
+       exists in the persistent resource list.  If it does, register it
+       as in the regular resource list as a pointer to the persistent
+       resource list (because of 1., the rest of the code
+       should work immediately).  If it doesn't, then create it, add it
+       to the persistent resource list AND add a pointer to it from the
+       regular resource list, so all of the code would work since it's
+       in the regular resource list, but on the next connect, the
+       resource would be found in the persistent resource list and be
+       used without having to recreate it.
+       You should register these resources with a different type (e.g.
+       LE_MYSQL_LINK for non-persistent link and LE_MYSQL_PLINK for
+       a persistent link).
+
+   If you read mysql.c, you'll notice that except for the more complex
+   connect function, nothing in the rest of the module has to be changed.
+   
+   The very same interface exists for the regular resource list and the
+   persistent resource list, only 'list' is replaced with 'plist':
+
+   php3_plist_insert(ptr, type)      returns the 'id' of the newly inserted resource
+   php3_plist_delete(id)             delete the resource with the specified id
+   php3_plist_find(id,*type)         returns the pointer of the resource with the specified id, updates 'type' to the resource's type
+
+   However, it's more than likely that these functions would prove
+   to be useless for you when trying to implement a persistent module.
+   Typically, one would want to use the fact that the persistent resource
+   list is really a hash table.  For instance, in the MySQL/mSQL modules,
+   when there's a pconnect() call (persistent connect), the function
+   builds a string out of the host/user/passwd that were passed to the
+   function, and hashes the SQL link with this string as a key.  The next
+   time someone calls a pconnect() with the same host/user/passwd, the
+   same key would be generated, and the function would find the SQL link
+   in the persistent list.
+
+   Until further documented, you should look at mysql.c or msql.c to
+   see how one should use the plist's hash table abilities.
+
+   One important thing to note:  resources going into the persistent
+   resource list must *NOT* be allocated with PHP's memory manager, i.e.,
+   they should NOT be created with emalloc(), estrdup(), etc.  Rather,
+   one should use the regular malloc(), strdup(), etc.  The reason for
+   this is simple - at the end of the request (end of the hit), every
+   memory chunk that was allocated using PHP's memory manager is deleted.
+   Since the persistent list isn't supposed to be erased at the end
+   of a request, one mustn't use PHP's memory manager for allocating
+   resources that go to it.
+
+   Shutting down persistent resources:  
+   
+   When you register resource that's going to be in the persistent list,
+   you should add destructors to it both in the non-persistent list
+   and in the persistent list.
+   The destructor in the non-persistent list destructor shouldn't do anything.
+   The one in the persistent list destructor should properly free any
+   resources obtained by that type (e.g. memory, SQL links, etc).  Just like
+   with the non-persistent resources, you *MUST* add destructors for every
+   resource, even it requires no destructotion and the destructor would
+   be empty.
+   Remember, since emalloc() and friends aren't to be used in conjunction
+   with the persistent list, you mustn't use efree() here either.
+
+-------------------
+
+11. Adding runtime configuration directives
+
+Many of the features of PHP3 can be configured at runtime.  These
+configuration directives can appear in either the designated php3.ini
+file, or in the case of the Apache module version in the Apache .conf
+files.  The advantage of having them in the Apache .conf files is that
+they can be configured on a per-directory basis.  This means that one
+directory may have a certain safemodeexecdir for example, while another
+directory may have another.  This configuration granularity is especially
+handy when a server supports multiple virtual hosts.
+
+The steps required to add a new directive:
+
+ 1. Add directive to php3_ini_structure struct in mod_php4.h. 
+    
+ 2. In main.c, edit the php3_module_startup function and add the
+    appropriate cfg_get_string() or cfg_get_long() call.
+
+ 3. Add the directive, restrictions and a comment to the php3_commands
+    structure in mod_php4.c.  Note the restrictions part.  RSRC_CONF are
+    directives that can only be present in the actual Apache .conf files.
+    Any OR_OPTIONS directives can be present anywhere, include normal
+    .htaccess files.
+
+ 4. In either php3take1handler() or php3flaghandler() add the appropriate
+    entry for your directive.
+
+ 5. In the configuration section of the _php3_info() function in
+    functions/info.c you need to add your new directive.
+
+ 6. And last, you of course have to use your new directive somewhere.
+    It will be addressable as php3_ini.directive

build/bsd_makefile

@@ -0,0 +1,34 @@
+#! /bin/sh
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+# cwd must be top_srcdir
+test -f build/bsd_makefile || exit 2
+
+test -f bsd_converted && exit 0
+
+tmpfile=`mktemp /tmp/bsd_makefile.XXXXXX 2>/dev/null` || tmpfile="tmp.$$"
+for i in build/*.mk; do
+    sed 's/^include \(.*\)/.include "\1"/' $i >$tmpfile \
+        && cp $tmpfile $i
+done
+rm -f $tmpfile
+
+touch bsd_converted
+exit 0

build/build.mk

@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
+#  | PHP version 4.0                                                      |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
 #  +----------------------------------------------------------------------+
 #  | This source file is subject to version 2.02 of the PHP license,      |
 #  | that is bundled with this package in the file LICENSE, and is        |
@@ -11,7 +11,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: Sascha Schumann <sascha@schumann.cx>                         |
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -20,27 +20,24 @@
 # Makefile to generate build tools
 #
 
-ZENDDIR = Zend
-
-SUBDIRS = $(ZENDDIR) TSRM
+SUBDIRS = Zend TSRM
 
 STAMP = buildmk.stamp
 
 ALWAYS = generated_lists
 
-
 all: $(STAMP) $(ALWAYS)
 	@$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk
 
 generated_lists:
-	@echo makefile_am_files = $(ZENDDIR)/Makefile.am \
+	@echo makefile_am_files = Zend/Makefile.am \
 		TSRM/Makefile.am > $@
-	@echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@
-	@echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \
-		$(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
+	@echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@
+	@echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 \
+		Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@
 
 $(STAMP): build/buildcheck.sh
-	@build/buildcheck.sh $(STAMP)
+	@build/buildcheck.sh && touch $(STAMP)
 
 snapshot:
 	distname='$(DISTNAME)'; \
@@ -67,7 +64,8 @@ snapshot:
 
 cvsclean:
 	@for i in `find . -name .cvsignore`; do \
-		(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore | grep -v config.nice` *.o *.a .libs || true); \
+		(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore` *.o *.a || true); \
 	done
+	@rm -f $(SUBDIRS) 2>/dev/null || true
 
 .PHONY: $(ALWAYS) snapshot cvsclean

build/build2.mk

@@ -1,7 +1,7 @@
 #  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
+#  | PHP version 4.0                                                      |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
 #  +----------------------------------------------------------------------+
 #  | This source file is subject to version 2.02 of the PHP license,      |
 #  | that is bundled with this package in the file LICENSE, and is        |
@@ -11,7 +11,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: Sascha Schumann <sascha@schumann.cx>                         |
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
 # $Id$ 
@@ -30,16 +30,37 @@ config_h_in = main/php_config.h.in
 
 acconfig_h_SOURCES = acconfig.h.in $(config_h_files)
 
-targets = $(TOUCH_FILES) configure $(config_h_in)
+targets = $(TOUCH_FILES) $(makefile_in_files) configure $(config_h_in)
 
 
-all: $(targets)
+all: Zend/Makefile.am TSRM/Makefile.am $(targets)
+
+Zend/Makefile.am:
+	test -d Zend || (test -d ../Zend && ln -s ../Zend Zend)
+
+TSRM/Makefile.am:
+	test -d TSRM || (test -d ../TSRM && ln -s ../TSRM TSRM)
 
 acconfig.h: $(acconfig_h_SOURCES)
 	@echo rebuilding $@
 	cat $(acconfig_h_SOURCES) > $@
 
-SUPPRESS_WARNINGS = (egrep -v '(AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in acinclude.m4 but never used|AC_PROG_LEX invoked multiple times)'||true)
+$(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_files)
+	@echo rebuilding Makefile templates
+	@for i in $(LT_TARGETS); do \
+		if test -f "$$i"; then \
+			mv $$i $$i.bak; \
+			cp $$i.bak $$i; \
+		fi; \
+	done
+	@test -f want_dependencies || flag=-i; \
+	automake -a $$flag $(AMFLAGS) $(makefile_files) 2>&1 | $(SUPPRESS_WARNINGS)
+	@for i in $(LT_TARGETS); do mv $$i.bak $$i; done
+
+aclocal.m4: configure.in acinclude.m4 dynlib.m4
+	aclocal 2>&1 | $(SUPPRESS_WARNINGS)
+
+SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*|defined in acinclude.m4 but never used)'||true)
 
 $(config_h_in): configure acconfig.h
 # explicitly remove target since autoheader does not seem to work 
@@ -51,9 +72,6 @@ $(config_h_in): configure acconfig.h
 $(TOUCH_FILES):
 	touch $(TOUCH_FILES)
 
-aclocal.m4: configure.in acinclude.m4
-	aclocal 2>&1 | $(SUPPRESS_WARNINGS)
-	
 configure: aclocal.m4 configure.in $(config_m4_files)
 	@echo rebuilding $@
 	@autoconf 2>&1 | $(SUPPRESS_WARNINGS)

build/buildcheck.sh

@@ -1,8 +1,8 @@
 #! /bin/sh
 #  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
+#  | PHP version 4.0                                                      |
 #  +----------------------------------------------------------------------+
-#  | Copyright (c) 1997-2002 The PHP Group                                |
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
 #  +----------------------------------------------------------------------+
 #  | This source file is subject to version 2.02 of the PHP license,      |
 #  | that is bundled with this package in the file LICENSE, and is        |
@@ -16,13 +16,11 @@
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.21.2.2 2003-04-16 12:05:43 jan Exp $ 
+# $Id: buildcheck.sh,v 1.12 2001-06-20 18:21:03 david Exp $ 
 #
 
 echo "buildconf: checking installation..."
 
-stamp=$1
-
 # autoconf 2.13 or newer
 ac_version=`autoconf --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 if test -z "$ac_version"; then
@@ -41,16 +39,6 @@ else
 echo "buildconf: autoconf version $ac_version (ok)"
 fi
 
-
-if test "$1" = "2" && test "$2" -ge "50"; then
-  echo "buildconf: Your version of autoconf likely contains buggy cache code."
-  echo "           Running cvsclean for you."
-  echo "           To avoid this, install autoconf-2.13 and automake-1.5."
-  ./cvsclean
-  stamp=
-fi
-
-
 # automake 1.4 or newer
 am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
 am_version_clean=`echo $am_version|sed -e 's/-p[0-9]*$//'`
@@ -71,31 +59,24 @@ echo "buildconf: automake version $am_version (ok)"
 fi
 
 # libtool 1.4 or newer
-# Prefer glibtool over libtool for Mac OS X compatibility
-libtool=`which glibtool 2> /dev/null`
-if test ! -r "$libtool"; then libtool=`which libtool`; fi
-lt_pversion=`$libtool --version 2>/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p'`
+libtool=`which libtool`
+if test ! -f "$libtool"; then libtool=`which glibtool`; fi
+lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/^[^0-9]*//' -e 's/[- ].*//'`
 if test "$lt_pversion" = ""; then
 echo "buildconf: libtool not found."
-echo "           You need libtool version 1.4.3 or newer installed"
+echo "           You need libtool version 1.4 or newer installed"
 echo "           to build PHP from CVS."
 exit 1
 fi
 lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
 IFS=.; set $lt_version; IFS=' '
 
-if test "$3" = ""; then
-  third=0
-else
-  third=$3
-fi
-
-if test "$1" -gt "1" || test "$2" -ge "5" || (test "$2" -ge "4" && test "$third" -ge "3")
+if test "$1" -gt "1" || test "$2" -ge "4";
 then
 echo "buildconf: libtool version $lt_pversion (ok)"
 else
 echo "buildconf: libtool version $lt_pversion found."
-echo "           You need libtool version 1.4.3 or newer installed"
+echo "           You need libtool version 1.4 or newer installed"
 echo "           to build PHP from CVS."
 exit 1
 fi
@@ -108,6 +89,4 @@ if test "$am_prefix" != "$lt_prefix"; then
     echo "         continuing anyway"
 fi
 
-test -n "$stamp" && touch $stamp
-
 exit 0

build/config-stubs

@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-
-dir=$1; shift
-for stubfile in $dir/*/config0.m4 $dir/*/config.m4 $dir/*/config9.m4; do
-    echo "sinclude($stubfile)"
-done

build/dynlib.mk

@@ -0,0 +1,24 @@
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+all: all-recursive
+
+include $(builddir)/libs.mk
+
+include $(top_srcdir)/build/rules.mk

build/fastgen.sh

@@ -0,0 +1,76 @@
+#! /bin/sh
+#
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id: fastgen.sh,v 1.10 2001-05-20 22:04:23 sas Exp $ 
+#
+
+srcdir=$1
+shift
+
+mkdir_p=$1
+shift
+
+bsd_makefile=$1
+shift
+
+top_srcdir=`(cd $srcdir; pwd)`
+top_builddir=`pwd`
+
+if test "$mkdir_p" = "yes"; then
+  mkdir_p="mkdir -p"
+else
+  mkdir_p="$top_srcdir/build/shtool mkdir -p"
+fi
+
+if test "$bsd_makefile" = "yes"; then
+  (cd $top_srcdir; ./build/bsd_makefile)
+
+  for makefile in $@; do
+    echo "creating $makefile"
+    dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
+    $mkdir_p "$dir/"
+
+    cat - $top_srcdir/$makefile.in <<EOF |sed 's/^include \(.*\)/.include "\1"/' >$makefile 
+top_srcdir   = $top_srcdir
+top_builddir = $top_builddir
+srcdir       = $top_srcdir/$dir
+builddir     = $top_builddir/$dir
+VPATH        = $top_srcdir/$dir
+EOF
+
+    test -z "$dir" && dir=.
+    touch $dir/.deps
+  done
+else  
+  for makefile in $@; do
+    echo "creating $makefile"
+    dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`
+    $mkdir_p "$dir/"
+
+    cat - $top_srcdir/$makefile.in <<EOF >$makefile
+top_srcdir   = $top_srcdir
+top_builddir = $top_builddir
+srcdir       = $top_srcdir/$dir
+builddir     = $top_builddir/$dir
+VPATH        = $top_srcdir/$dir
+EOF
+  
+    test -z "$dir" && dir=.
+    touch $dir/.deps
+  done
+fi

build/genif.sh

@@ -1,24 +1,24 @@
 #! /bin/sh
 
-# $Id: genif.sh,v 1.3 2002-03-22 10:22:41 sas Exp $
+# $Id: genif.sh,v 1.2 2001-03-30 14:02:20 sas Exp $
 # replacement for genif.pl
 
-infile=$1
+infile="$1"
 shift
-srcdir=$1
+srcdir="$1"
 shift
-extra_module_ptrs=$1
+extra_module_ptrs="$1"
 shift
-awk=$1
+awk="$1"
 shift
 
-if test -z "$infile" || test -z "$srcdir"; then
+if test "$infile" = "" -o "$srcdir" = ""; then
 	echo "please supply infile and srcdir"
 	exit 1
 fi
 
-module_ptrs=$extra_module_ptrs
-header_list=
+module_ptrs="$extra_module_ptrs"
+header_list=""
 olddir=`pwd`
 cd $srcdir
 

build/library.mk

@@ -0,0 +1,23 @@
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X)
+
+$(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES)
+	$(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD)

build/ltlib.mk

@@ -0,0 +1,24 @@
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+targets = $(LTLIBRARY_NAME)
+
+include $(top_srcdir)/build/rules.mk
+include $(top_srcdir)/build/library.mk
+

build/mkdep.awk

@@ -1,5 +1,5 @@
 #  +----------------------------------------------------------------------+
-#  | PHP Version 4                                                        |
+#  | PHP version 4.0                                                      |
 #  +----------------------------------------------------------------------+
 #  | Copyright (c) 2000 The PHP Group                                     |
 #  +----------------------------------------------------------------------+
@@ -11,7 +11,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: Sascha Schumann <sascha@schumann.cx>                         |
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
 # $Id$

build/program.mk

@@ -0,0 +1,23 @@
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+PROGRAM_OBJECTS = $(PROGRAM_SOURCES:.c=.lo)
+
+$(PROGRAM_NAME): $(PROGRAM_DEPENDENCIES) $(PROGRAM_OBJECTS)
+	$(LINK_CLEAN) $(PROGRAM_LDFLAGS) $(PROGRAM_OBJECTS) $(PROGRAM_LDADD)

build/rules.mk

@@ -0,0 +1,68 @@
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+include $(top_srcdir)/build/rules_common.mk
+
+all: all-recursive
+install: install-recursive
+
+distclean-recursive depend-recursive clean-recursive all-recursive install-recursive:
+	@otarget=`echo $@|sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for i in $$list; do \
+		target="$$otarget"; \
+		echo "Making $$target in $$i"; \
+		if test "$$i" = "."; then \
+			ok=yes; \
+			target="$$target-p"; \
+		fi; \
+		(cd $$i && $(MAKE) $$target) || exit 1; \
+	done; \
+	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi; \
+	if test "$$ok" != "yes"; then $(MAKE) "$$otarget-p" || exit 1; fi
+
+all-p: $(targets)
+install-p: $(targets) $(install_targets)
+distclean-p depend-p clean-p:
+
+depend: depend-recursive
+	@echo $(top_srcdir) $(top_builddir) $(srcdir) $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c *.c | $(AWK) -f $(top_srcdir)/build/mkdep.awk > $(builddir)/.deps || true
+
+clean: clean-recursive clean-x
+
+clean-x:
+	rm -f $(targets) *.lo *.slo *.la *.o $(CLEANFILES)
+	rm -rf .libs
+
+distclean: distclean-recursive clean-x
+	rm -f config.cache config.log config.status config_vars.mk libtool \
+	php_config.h stamp-h Makefile build-defs.h php4.spec libphp4.module
+
+test: $(top_builddir)/php
+	@if test "$(TESTS)" = ""; then \
+		TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -C -q $(top_srcdir)/run-tests.php $(srcdir); \
+	else \
+		TOP_BUILDDIR=$(top_builddir) TOP_SRCDIR=$(top_srcdir) $(top_builddir)/php -C -q $(top_srcdir)/run-tests.php $(TESTS); \
+	fi
+
+include $(builddir)/.deps
+
+.PHONY: all-recursive clean-recursive install-recursive \
+$(install_targets) install all clean depend depend-recursive shared \
+distclean-recursive distclean clean-x all-p install-p distclean-p \
+depend-p clean-p

build/rules_common.mk

@@ -0,0 +1,77 @@
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+include $(top_builddir)/config_vars.mk
+
+COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
+COMPILE      = $(CC)  $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
+CXX_COMPILE  = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
+
+SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@
+CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@
+
+LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+LINK_CLEAN = $(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@
+
+mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
+INSTALL = $(top_srcdir)/build/shtool install -c
+INSTALL_DATA = $(INSTALL) -m 644
+
+DEFS = -I. -I$(srcdir) -I$(top_builddir)/main -I$(top_srcdir)
+
+moduledir    = $(EXTENSION_DIR)
+
+CXX_SUFFIX = .cpp
+
+.SUFFIXES:
+.SUFFIXES: .slo .c $(CXX_SUFFIX) .lo .o .s .y .l
+
+.c.o:
+	$(COMPILE) -c $<
+
+$(CXX_SUFFIX).o:
+	$(CXX_COMPILE) -c $<
+
+.s.o:
+	$(COMPILE) -c $<
+
+.c.lo:
+	$(PHP_COMPILE)
+
+$(CXX_SUFFIX).lo:
+	$(CXX_PHP_COMPILE)
+
+.s.lo:
+	$(PHP_COMPILE)
+
+.c.slo:
+	$(SHARED_COMPILE)
+
+$(CXX_SUFFIX).slo:
+	$(CXX_SHARED_COMPILE)
+
+.y.c:
+	$(YACC) $(YFLAGS) $< && mv y.tab.c $*.c
+	if test -f y.tab.h; then \
+	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
+	else :; fi
+
+.l.c:
+	$(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
+

build/rules_pear.mk

@@ -0,0 +1,76 @@
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+include $(top_srcdir)/build/rules_common.mk
+
+install_targets = install-modules
+
+all: all-recursive
+install: install-recursive
+
+distclean-recursive depend-recursive clean-recursive all-recursive install-recursive:
+	@otarget=`echo $@|sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for i in $$list; do \
+		target="$$otarget"; \
+		echo "Making $$target in $$i"; \
+		if test "$$i" = "."; then \
+			ok=yes; \
+			target="$$target-p"; \
+		fi; \
+		(cd $$i && $(MAKE) $$target) || exit 1; \
+	done; \
+	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi; \
+	if test "$$ok" != "yes"; then $(MAKE) "$$otarget-p" || exit 1; fi
+
+all-p: $(targets)
+install-p: $(targets) $(install_targets)
+distclean-p depend-p clean-p:
+
+depend: depend-recursive
+	@echo $(top_srcdir) $(top_builddir) $(srcdir) $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c *.c | $(AWK) -f $(top_srcdir)/build/mkdep.awk > $(builddir)/.deps || true
+
+clean: clean-recursive clean-x
+
+clean-x:
+	rm -f $(targets) *.lo *.slo *.la *.o $(CLEANFILES)
+	rm -rf .libs
+
+distclean: distclean-recursive clean-x
+	rm -f config.cache config.log config.status config_vars.mk libtool \
+	config.h stamp-h Makefile build-defs.h php4.spec libphp4.module
+
+cvsclean:
+	@for i in `find . -name .cvsignore`; do \
+		(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore` *.o *.a || true); \
+	done
+	@rm -f $(SUBDIRS) 2>/dev/null || true
+
+install-modules:
+	@test -d modules && \
+	$(mkinstalldirs) $(moduledir) && \
+	echo "installing shared modules into $(moduledir)" && \
+	rm -f modules/*.la && \
+	cp modules/* $(moduledir) || true
+
+include $(builddir)/.deps
+
+.PHONY: all-recursive clean-recursive install-recursive \
+$(install_targets) install all clean depend depend-recursive shared \
+distclean-recursive distclean clean-x all-p install-p distclean-p \
+depend-p clean-p

build/shtool

@@ -1,13 +1,13 @@
 #!/bin/sh
 ##
 ##  GNU shtool -- The GNU Portable Shell Tool
-##  Copyright (c) 1994-2002 Ralf S. Engelschall <rse@engelschall.com>
+##  Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>
 ##
 ##  See http://www.gnu.org/software/shtool/ for more information.
 ##  See ftp://ftp.gnu.org/gnu/shtool/ for latest version.
 ##
-##  Version:  1.6.2 (02-Nov-2002)
-##  Contents: 4/19 available modules
+##  Version 1.4.9 (16-Apr-2000)
+##  Ingredients: 3/17 available modules
 ##
 
 ##
@@ -26,7 +26,7 @@
 ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ##  USA, or contact Ralf S. Engelschall <rse@engelschall.com>.
 ##
-##  NOTICE: Given that you include this file verbatim into your own
+##  Notice: Given that you include this file verbatim into your own
 ##  source tree, you are justified in saying that it remains separate
 ##  from your package, and that this way you are simply just using GNU
 ##  shtool. So, in this situation, there is no requirement that your
@@ -41,7 +41,6 @@
 ##    echo       Print string with optional construct expansion
 ##    install    Install a program, script or datafile
 ##    mkdir      Make one or more directories
-##    path       Deal with program paths
 ##
 ##  Not available commands (because module was not built-in):
 ##    mdate      Pretty-print modification time of a file or dir
@@ -51,14 +50,13 @@
 ##    mkln       Make link with calculation of relative paths
 ##    mkshadow   Make a shadow tree through symbolic links
 ##    fixperm    Fix file permissions inside a source tree
-##    rotate     Logfile rotation
 ##    tarball    Roll distribution tarballs
-##    subst      Apply sed(1) substitution operations
 ##    guessos    Simple operating system guesser
 ##    arx        Extended archive command
 ##    slo        Separate linker options by library class
 ##    scpp       Sharing C Pre-Processor
-##    version    Maintain a version information file
+##    version    Generate and maintain a version information file
+##    path       Deal with program paths
 ##
 
 if [ $# -eq 0 ]; then
@@ -67,76 +65,46 @@ if [ $# -eq 0 ]; then
     exit 1
 fi
 if [ ".$1" = ".-h" -o ".$1" = ".--help" ]; then
-    echo "This is GNU shtool, version 1.6.2 (02-Nov-2002)"
-    echo "Copyright (c) 1994-2002 Ralf S. Engelschall <rse@engelschall.com>"
+    echo "This is GNU shtool, version 1.4.9 (16-Apr-2000)"
+    echo "Copyright (c) 1994-2000 Ralf S. Engelschall <rse@engelschall.com>"
     echo "Report bugs to <bug-shtool@gnu.org>"
     echo ''
-    echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]"
+    echo "Usage: shtool [<options>] [<cmd-name> [<cmd-options>] [<cmd-args>]]" 
     echo ''
     echo 'Available global <options>:'
     echo '  -v, --version   display shtool version information'
     echo '  -h, --help      display shtool usage help page (this one)'
     echo '  -d, --debug     display shell trace information'
-    echo '  -r, --recreate  recreate this shtool script via shtoolize'
     echo ''
     echo 'Available <cmd-name> [<cmd-options>] [<cmd-args>]:'
-    echo '  echo     [-n|--newline] [-e|--expand] [<str> ...]'
-    echo '  install  [-v|--verbose] [-t|--trace] [-d|--mkdir] [-c|--copy]'
-    echo '           [-C|--compare-copy] [-s|--strip] [-m|--mode <mode>]'
-    echo '           [-o|--owner <owner>] [-g|--group <group>] [-e|--exec'
-    echo '           <sed-cmd>] <file> [<file> ...] <path>'
-    echo '  mkdir    [-t|--trace] [-f|--force] [-p|--parents] [-m|--mode'
-    echo '           <mode>] [-o|--owner <owner>] [-g|--group <group>] <dir>'
-    echo '           [<dir> ...]'
-    echo '  path     [-s|--suppress] [-r|--reverse] [-d|--dirname] [-b|--basename]'
-    echo '           [-m|--magic] [-p|--path <path>] <str> [<str> ...]'
+    echo '  echo     [-n] [-e] [<str> ...]'
+    echo '  install  [-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>]'
+    echo '           [-e<ext>] <file> <path>'
+    echo '  mkdir    [-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]'
     echo ''
     echo 'Not available <cmd-name> (because module was not built-in):'
-    echo '  mdate    [-n|--newline] [-z|--zero] [-s|--shorten] [-d|--digits]'
-    echo '           [-f|--field-sep <str>] [-o|--order <spec>] <path>'
-    echo '  table    [-F|--field-sep <sep>] [-w|--width <width>] [-c|--columns'
-    echo '           <cols>] [-s|--strip <strip>] <str><sep><str>...'
-    echo '  prop     [-p|--prefix <str>]'
-    echo '  move     [-v|--verbose] [-t|--trace] [-e|--expand] [-p|--preserve]'
-    echo '           <src-file> <dst-file>'
-    echo '  mkln     [-t|--trace] [-f|--force] [-s|--symbolic] <src-path>'
-    echo '           [<src-path> ...] <dst-path>'
-    echo '  mkshadow [-v|--verbose] [-t|--trace] [-a|--all] <src-dir> <dst-dir>'
-    echo '  fixperm  [-v|--verbose] [-t|--trace] <path> [<path> ...]'
-    echo '  rotate   [-v|--verbose] [-t|--trace] [-f|--force] [-n|--num-files'
-    echo '           <count>] [-s|--size <size>] [-c|--copy] [-r|--remove]'
-    echo '           [-a|--archive-dir <dir>] [-z|--compress [<tool>:]<level>]'
-    echo '           [-b|--background] [-d|--delay] [-p|--pad <len>] [-o|--owner'
-    echo '           <owner>] [-g|--group <group>] [-m|--mode <mode>] [-M|--migrate'
-    echo '           <cmd>] [-P|--prolog <cmd>] [-E|--epilog <cmd>] <file> [...]'
-    echo '  tarball  [-t|--trace] [-v|--verbose] [-o|--output <tarball>]'
-    echo '           [-c|--compress <prog>] [-d|--directory <dir>] [-u|--user'
-    echo '           <user>] [-g|--group <group>] [-e|--exclude <pattern>]'
-    echo '           <path> [<path> ...]'
-    echo '  subst    [-v|--verbose] [-t|--trace] [-n|--nop] [-s|--stealth]'
-    echo '           [-i|--interactive] [-b|--backup <ext>] [-e|--exec <cmd>]'
-    echo '           [-f|--file <cmd-file>] [<file>] [...]'
+    echo '  mdate    [-n] [-z] [-s] [-d] [-f<str>] [-o<spec>] <path>'
+    echo '  table    [-F<sep>] [-w<width>] [-c<cols>] [-s<strip>] <str><sep><str>...'
+    echo '  prop     [-p<str>]'
+    echo '  move     [-v] [-t] [-e] [-p] <src-file> <dst-file>'
+    echo '  mkln     [-t] [-f] [-s] <src-path> [<src-path> ...] <dst-path>'
+    echo '  mkshadow [-v] [-t] [-a] <src-dir> <dst-dir>'
+    echo '  fixperm  [-v] [-t] <path> [<path> ...]'
+    echo '  tarball  [-t] [-v] [-o <tarball>] [-c <prog>] [-d <dir>] [-u'
+    echo '           <user>] [-g <group>] [-e <pattern>] <path> [<path> ...]'
     echo '  guessos  '
-    echo '  arx      [-t|--trace] [-C|--command <cmd>] <op> <archive> [<file>'
-    echo '           ...]'
-    echo '  slo      [-p|--prefix <str>] -- -L<dir> -l<lib> [-L<dir> -l<lib>'
-    echo '           ...]'
-    echo '  scpp     [-v|--verbose] [-p|--preserve] [-f|--filter <filter>]'
-    echo '           [-o|--output <ofile>] [-t|--template <tfile>] [-M|--mark'
-    echo '           <mark>] [-D|--define <dname>] [-C|--class <cname>]'
-    echo '           <file> [<file> ...]'
-    echo '  version  [-l|--language <lang>] [-n|--name <name>] [-p|--prefix'
-    echo '           <prefix>] [-s|--set <version>] [-e|--edit] [-i|--increase'
-    echo '           <knob>] [-d|--display <type>] <file>'
+    echo '  arx      [-t] [-C<cmd>] <op> <archive> [<file> ...]'
+    echo '  slo      [-p<str>] -- -L<dir> -l<lib> [-L<dir> -l<lib> ...]'
+    echo '  scpp     [-v] [-p] [-f<filter>] [-o<ofile>] [-t<tfile>] [-M<mark>]'
+    echo '           [-D<dname>] [-C<cname>] <file> [<file> ...]'
+    echo '  version  [-l<lang>] [-n<name>] [-p<prefix>] [-s<version>] [-i<knob>]'
+    echo '           [-d<type>] <file>'
+    echo '  path     [-s] [-r] [-d] [-b] [-m] [-p<path>] <str> [<str> ...]'
     echo ''
     exit 0
 fi
 if [ ".$1" = ".-v" -o ".$1" = ."--version" ]; then
-    echo "GNU shtool 1.6.2 (02-Nov-2002)"
-    exit 0
-fi
-if [ ".$1" = ".-r" -o ".$1" = ."--recreate" ]; then
-    shtoolize -oshtool echo install mkdir path
+    echo "GNU shtool 1.4.9 (16-Apr-2000)"
     exit 0
 fi
 if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then
@@ -145,7 +113,7 @@ if [ ".$1" = ".-d" -o ".$1" = ."--debug" ]; then
 fi
 name=`echo "$0" | sed -e 's;.*/\([^/]*\)$;\1;' -e 's;-sh$;;' -e 's;\.sh$;;'`
 case "$name" in
-    echo|install|mkdir|path )
+    echo|install|mkdir )
         #   implicit tool command selection
         tool="$name"
         ;;
@@ -166,56 +134,36 @@ gen_tmpfile=no
 case $tool in
     echo )
         str_tool="echo"
-        str_usage="[-n|--newline] [-e|--expand] [<str> ...]"
+        str_usage="[-n] [-e] [<str> ...]"
         arg_spec="0+"
         opt_spec="n.e."
-        opt_alias="n:newline,e:expand"
         opt_n=no
         opt_e=no
         ;;
     install )
         str_tool="install"
-        str_usage="[-v|--verbose] [-t|--trace] [-d|--mkdir] [-c|--copy] [-C|--compare-copy] [-s|--strip] [-m|--mode <mode>] [-o|--owner <owner>] [-g|--group <group>] [-e|--exec <sed-cmd>] <file> [<file> ...] <path>"
-        arg_spec="1+"
-        opt_spec="v.t.d.c.C.s.m:o:g:e+"
-        opt_alias="v:verbose,t:trace,d:mkdir,c:copy,C:compare-copy,s:strip,m:mode,o:owner,g:group,e:exec"
+        str_usage="[-v] [-t] [-c] [-C] [-s] [-m<mode>] [-o<owner>] [-g<group>] [-e<ext>] <file> <path>"
+        arg_spec="2="
+        opt_spec="v.t.c.C.s.m:o:g:e:"
         opt_v=no
         opt_t=no
-        opt_d=no
         opt_c=no
         opt_C=no
         opt_s=no
-        opt_m="0755"
+        opt_m=""
         opt_o=""
         opt_g=""
         opt_e=""
         ;;
     mkdir )
         str_tool="mkdir"
-        str_usage="[-t|--trace] [-f|--force] [-p|--parents] [-m|--mode <mode>] [-o|--owner <owner>] [-g|--group <group>] <dir> [<dir> ...]"
+        str_usage="[-t] [-f] [-p] [-m<mode>] <dir> [<dir> ...]"
         arg_spec="1+"
-        opt_spec="t.f.p.m:o:g:"
-        opt_alias="t:trace,f:force,p:parents,m:mode,o:owner,g:group"
+        opt_spec="t.f.p.m:"
         opt_t=no
         opt_f=no
         opt_p=no
         opt_m=""
-        opt_o=""
-        opt_g=""
-        ;;
-    path )
-        str_tool="path"
-        str_usage="[-s|--suppress] [-r|--reverse] [-d|--dirname] [-b|--basename] [-m|--magic] [-p|--path <path>] <str> [<str> ...]"
-        gen_tmpfile=yes
-        arg_spec="1+"
-        opt_spec="s.r.d.b.m.p:"
-        opt_alias="s:suppress,r:reverse,d:dirname,b:basename,m:magic,p:path"
-        opt_s=no
-        opt_r=no
-        opt_d=no
-        opt_b=no
-        opt_m=no
-        opt_p="$PATH"
         ;;
     -* )
         echo "$0:Error: unknown option \`$tool'" 2>&1
@@ -233,11 +181,6 @@ esac
 ##  COMMON UTILITY CODE
 ##
 
-#   commonly used ASCII values
-ASC_TAB="	"
-ASC_NL="
-"
-
 #   determine name of tool
 if [ ".$tool" != . ]; then
     #   used inside shtool script
@@ -259,10 +202,6 @@ eval `echo $arg_spec |\
 eval `echo h.$opt_spec |\
       sed -e 's/\([a-zA-Z0-9]\)\([.:+]\)/opt_MODE_\1=\2;/g'`
 
-#   parse option alias string
-eval `echo h:help,$opt_alias |\
-      tr 'x-' 'x_' | sed -e 's/\([a-zA-Z0-9]\):\([^,]*\),*/opt_ALIAS_\2=\1;/g'`
-
 #   interate over argument line
 opt_PREV=''
 while [ $# -gt 0 ]; do
@@ -283,18 +222,6 @@ while [ $# -gt 0 ]; do
     else
         #   split argument into option and argument
         case "$1" in
-            --[a-zA-Z0-9]*=*)
-                eval `echo "x$1" |\
-                      sed -e 's/^x--\([a-zA-Z0-9-]*\)=\(.*\)$/opt_OPT="\1";opt_ARG="\2"/'`
-                opt_STR=`echo $opt_OPT | tr 'x-' 'x_'`
-                eval "opt_OPT=\${opt_ALIAS_${opt_STR}-${opt_OPT}}"
-                ;;
-            --[a-zA-Z0-9]*)
-                opt_OPT=`echo "x$1" | cut -c4-`
-                opt_STR=`echo $opt_OPT | tr 'x-' 'x_'`
-                eval "opt_OPT=\${opt_ALIAS_${opt_STR}-${opt_OPT}}"
-                opt_ARG=''
-                ;;
             -[a-zA-Z0-9]*)
                 eval `echo "x$1" |\
                       sed -e 's/^x-\([a-zA-Z0-9]\)/opt_OPT="\1";/' \
@@ -334,17 +261,17 @@ while [ $# -gt 0 ]; do
             ;;
         '+' )
             #   option with argument (multiple occurances append)
-            eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\""
+            eval "opt_${opt_OPT}=\"\$opt_${opt_OPT} \$opt_ARG\""
             ;;
         * )
-            echo "$msgprefix:Error: unknown option: \`$opt_OPT'" 1>&2
+            echo "$msgprefix:Error: unknown option: \`-$opt_OPT'" 1>&2
             echo "$msgprefix:Hint:  run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
             exit 1
             ;;
     esac
 done
 if [ ".$opt_PREV" != . ]; then
-    echo "$msgprefix:Error: missing argument to option \`$opt_PREV'" 1>&2
+    echo "$msgprefix:Error: missing argument to option \`-$opt_PREV'" 1>&2
     echo "$msgprefix:Hint:  run \`$toolcmdhelp -h' or \`man shtool' for details" 1>&2
     exit 1
 fi
@@ -385,7 +312,6 @@ if [ ".$gen_tmpfile" = .yes ]; then
     tmpfile="$tmpdir/.shtool.$$"
     rm -f $tmpfile >/dev/null 2>&1
     touch $tmpfile
-    chmod 600 $tmpfile
 fi
 
 ##
@@ -397,7 +323,7 @@ case $tool in
 echo )
     ##
     ##  echo -- Print string with optional construct expansion
-    ##  Copyright (c) 1998-2002 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1998-2000 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for WML as buildinfo
     ##
     
@@ -421,7 +347,7 @@ echo )
     fi
     
     #   determine terminal bold sequence
-    term_bold=''
+    term_bold='' 
     term_norm=''
     if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[Bb]'`" != . ]; then
         case $TERM in
@@ -430,7 +356,7 @@ echo )
                 term_bold=`awk 'BEGIN { printf("%c%c%c%c", 27, 91, 49, 109); }' </dev/null 2>/dev/null`
                 term_norm=`awk 'BEGIN { printf("%c%c%c", 27, 91, 109); }' </dev/null 2>/dev/null`
                 ;;
-            vt100|vt100*|cygwin)
+            vt100|vt100*)
                 term_bold=`awk 'BEGIN { printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }' </dev/null 2>/dev/null`
                 term_norm=`awk 'BEGIN { printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }' </dev/null 2>/dev/null`
                 ;;
@@ -448,7 +374,7 @@ echo )
                                 fi
                             done
                             if [ ".$term_bold" != . ]; then
-                                for seq in sgr0 me rmso init reset; do # 'reset' is last
+                                for seq in sgr0 me rmso reset; do # 'reset' is last
                                     norm="`$dir/$tool $seq 2>/dev/null`"
                                     if [ ".$norm" != . ]; then
                                         term_norm="$norm"
@@ -467,14 +393,12 @@ echo )
         esac
         if [ ".$term_bold" = . -o ".$term_norm" = . ]; then
             echo "$msgprefix:Warning: unable to determine terminal sequence for bold mode" 1>&2
-            term_bold=''
-            term_norm=''
         fi
     fi
     
     #   determine user name
     username=''
-    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[uUgG]'`" != . ]; then
+    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[uU]'`" != . ]; then
         username="$LOGNAME"
         if [ ".$username" = . ]; then
             username="$USER"
@@ -516,38 +440,8 @@ echo )
         fi
     fi
     
-    #   determine (primary) group id
-    groupid=''
-    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%[gG]'`" != . ]; then
-        groupid=`egrep "^${username}:" /etc/passwd 2>/dev/null | \
-                 sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
-        if [ ".$groupid" = . ]; then
-            groupid=`(ypcat passwd) 2>/dev/null | egrep "^${username}:" | \
-                     sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
-            if [ ".$groupid" = . ]; then
-                groupid='?'
-            fi
-        fi
-    fi
-    
-    #   determine (primary) group name
-    groupname=''
-    if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%g'`" != . ]; then
-        groupname=`egrep "^[^:]*:[^:]*:${groupid}:" /etc/group 2>/dev/null | \
-                   sed -e 's/:.*$//'`
-        if [ ".$groupname" = . ]; then
-            groupname=`(ypcat group) 2>/dev/null | \
-                       egrep "^[^:]*:[^:]*:${groupid}:" | \
-                       sed -e 's/:.*$//'`
-            if [ ".$groupname" = . ]; then
-                groupname='?'
-            fi
-        fi
-    fi
-    
-    #   determine host and domain name
+    #   determine host name
     hostname=''
-    domainname=''
     if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%h'`" != . ]; then
         hostname="`(uname -n) 2>/dev/null |\
                    awk '{ printf("%s", $1); }'`"
@@ -565,16 +459,19 @@ echo )
                 ;;
         esac
     fi
+    
+    #   determine domain name
+    domainname=''
     if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%d'`" != . ]; then
         if [ ".$domainname" = . ]; then
             if [ -f /etc/resolv.conf ]; then
-                domainname="`egrep '^[ 	]*domain' /etc/resolv.conf | sed -e 'q' |\
+                domainname="`egrep '^[ 	]*domain' /etc/resolv.conf | head -1 |\
                              sed -e 's/.*domain//' \
                                  -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
                                  -e 's/^\.//' -e 's/^/./' |\
                              awk '{ printf("%s", $1); }'`"
                 if [ ".$domainname" = . ]; then
-                    domainname="`egrep '^[ 	]*search' /etc/resolv.conf | sed -e 'q' |\
+                    domainname="`egrep '^[ 	]*search' /etc/resolv.conf | head -1 |\
                                  sed -e 's/.*search//' \
                                      -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
                                      -e 's/ .*//' -e 's/	.*//' \
@@ -624,8 +521,6 @@ echo )
                   -e "s/%b/${term_norm}/g" \
                   -e "s/%u/${username}/g" \
                   -e "s/%U/${userid}/g" \
-                  -e "s/%g/${groupname}/g" \
-                  -e "s/%G/${groupid}/g" \
                   -e "s/%h/${hostname}/g" \
                   -e "s/%d/${domainname}/g" \
                   -e "s/%D/${time_day}/g" \
@@ -651,168 +546,114 @@ echo )
 install )
     ##
     ##  install -- Install a program, script or datafile
-    ##  Copyright (c) 1997-2002 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1997-2000 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for shtool
     ##
     
-    #   special case: "shtool install -d <dir> [...]" internally
-    #   maps to "shtool mkdir -f -p -m 755 <dir> [...]"
-    if [ "$opt_d" = yes ]; then
-        cmd="$0 mkdir -f -p -m 755"
-        if [ ".$opt_o" != . ]; then
-            cmd="$cmd -o '$opt_o'"
-        fi
-        if [ ".$opt_g" != . ]; then
-            cmd="$cmd -g '$opt_g'"
-        fi
-        if [ ".$opt_v" = .yes ]; then
-            cmd="$cmd -v"
-        fi
-        if [ ".$opt_t" = .yes ]; then
-            cmd="$cmd -t"
-        fi
-        for dir in "$@"; do
-            eval "$cmd $dir" || exit $?
-        done
-        exit 0
+    src="$1"
+    dst="$2"
+    
+    #  If destination is a directory, append the input filename
+    if [ -d $dst ]; then
+        dst=`echo "$dst" | sed -e 's:/$::'`
+        dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'`
+        dst="$dst/$dstfile"
     fi
     
-    #   determine source(s) and destination
-    argc=$#
-    srcs=""
-    while [ $# -gt 1 ]; do
-        srcs="$srcs $1"
-        shift
-    done
-    dstpath="$1"
-    
-    #   type check for destination
-    dstisdir=0
-    if [ -d $dstpath ]; then
-        dstpath=`echo "$dstpath" | sed -e 's:/$::'`
-        dstisdir=1
+    #  Add a possible extension to src and dst
+    if [ ".$opt_e" != . ]; then
+        src="$src$opt_e"
+        dst="$dst$opt_e"
     fi
     
-    #   consistency check for destination
-    if [ $argc -gt 2 -a $dstisdir = 0 ]; then
-        echo "$msgprefix:Error: multiple sources require destination to be directory" 1>&2
+    #  Check for correct arguments
+    if [ ".$src" = ".$dst" ]; then
+        echo "$msgprefix:Error: source and destination are the same" 1>&2
         exit 1
     fi
     
-    #   iterate over all source(s)
-    for src in $srcs; do
-        dst=$dstpath
+    #  Make a temp file name in the destination directory
+    dstdir=`echo $dst | sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;'`
+    dsttmp="$dstdir/#INST@$$#"
     
-        #   if destination is a directory, append the input filename
-        if [ $dstisdir = 1 ]; then
-            dstfile=`echo "$src" | sed -e 's;.*/\([^/]*\)$;\1;'`
-            dst="$dst/$dstfile"
-        fi
+    #  Verbosity
+    if [ ".$opt_v" = .yes ]; then
+        echo "$src -> $dst" 1>&2
+    fi
     
-        #   check for correct arguments
-        if [ ".$src" = ".$dst" ]; then
-            echo "$msgprefix:Warning: source and destination are the same - skipped" 1>&2
-            continue
+    #  Copy or move the file name to the temp name
+    #  (because we might be not allowed to change the source)
+    if [ ".$opt_C" = .yes ]; then
+        opt_c=yes
+    fi
+    if [ ".$opt_c" = .yes ]; then
+        if [ ".$opt_t" = .yes ]; then
+            echo "cp $src $dsttmp" 1>&2
         fi
-        if [ -d "$src" ]; then
-            echo "$msgprefix:Warning: source \`$src' is a directory - skipped" 1>&2
-            continue
+        cp $src $dsttmp || exit $?
+    else
+        if [ ".$opt_t" = .yes ]; then
+            echo "mv $src $dsttmp" 1>&2
         fi
+        mv $src $dsttmp || exit $?
+    fi
     
-        #   make a temp file name in the destination directory
-        dsttmp=`echo $dst |\
-                sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;' -e 's;^$;.;' \
-                    -e "s;\$;/#INST@$$#;"`
+    #  Adjust the target file
+    #  (we do chmod last to preserve setuid bits)
+    if [ ".$opt_s" = .yes ]; then
+        if [ ".$opt_t" = .yes ]; then
+            echo "strip $dsttmp" 1>&2
+        fi
+        strip $dsttmp || exit $?
+    fi
+    if [ ".$opt_o" != . ]; then
+        if [ ".$opt_t" = .yes ]; then
+            echo "chown $opt_o $dsttmp" 1>&2
+        fi
+        chown $opt_o $dsttmp || exit $?
+    fi
+    if [ ".$opt_g" != . ]; then
+        if [ ".$opt_t" = .yes ]; then
+            echo "chgrp $opt_g $dsttmp" 1>&2
+        fi
+        chgrp $opt_g $dsttmp || exit $?
+    fi
+    if [ ".$opt_m" != . ]; then
+        if [ ".$opt_t" = .yes ]; then
+            echo "chmod $opt_m $dsttmp" 1>&2
+        fi
+        chmod $opt_m $dsttmp || exit $?
+    fi
     
-        #   verbosity
-        if [ ".$opt_v" = .yes ]; then
-            echo "$src -> $dst" 1>&2
+    #   Determine whether to do a quick install
+    #   (has to be done _after_ the strip was already done)
+    quick=no
+    if [ ".$opt_C" = .yes ]; then
+        if [ -r $dst ]; then
+            if cmp -s $src $dst; then
+                quick=yes
+            fi
         fi
+    fi
     
-        #   copy or move the file name to the temp name
-        #   (because we might be not allowed to change the source)
-        if [ ".$opt_C" = .yes ]; then
-            opt_c=yes
+    #   Finally install the file to the real destination
+    if [ $quick = yes ]; then
+        if [ ".$opt_t" = .yes ]; then
+            echo "rm -f $dsttmp" 1>&2
         fi
-        if [ ".$opt_c" = .yes ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "cp $src $dsttmp" 1>&2
-            fi
-            cp $src $dsttmp || exit $?
-        else
-            if [ ".$opt_t" = .yes ]; then
-                echo "mv $src $dsttmp" 1>&2
-            fi
-            mv $src $dsttmp || exit $?
+        rm -f $dsttmp
+    else
+        if [ ".$opt_t" = .yes ]; then
+            echo "rm -f $dst && mv $dsttmp $dst" 1>&2
         fi
-    
-        #   adjust the target file
-        if [ ".$opt_e" != . ]; then
-            sed='sed'
-            OIFS="$IFS"; IFS="$ASC_NL"; set -- $opt_e; IFS="$OIFS"
-            for e
-            do
-                sed="$sed -e '$e'"
-            done
-            cp $dsttmp $dsttmp.old
-            eval "$sed <$dsttmp.old >$dsttmp" || exit $?
-            rm -f $dsttmp.old
-        fi
-        if [ ".$opt_s" = .yes ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "strip $dsttmp" 1>&2
-            fi
-            strip $dsttmp || exit $?
-        fi
-        if [ ".$opt_o" != . ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "chown $opt_o $dsttmp" 1>&2
-            fi
-            chown $opt_o $dsttmp || exit $?
-        fi
-        if [ ".$opt_g" != . ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "chgrp $opt_g $dsttmp" 1>&2
-            fi
-            chgrp $opt_g $dsttmp || exit $?
-        fi
-        if [ ".$opt_m" != ".-" ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "chmod $opt_m $dsttmp" 1>&2
-            fi
-            chmod $opt_m $dsttmp || exit $?
-        fi
-    
-        #   determine whether to do a quick install
-        #   (has to be done _after_ the strip was already done)
-        quick=no
-        if [ ".$opt_C" = .yes ]; then
-            if [ -r $dst ]; then
-                if cmp -s $src $dst; then
-                    quick=yes
-                fi
-            fi
-        fi
-    
-        #   finally, install the file to the real destination
-        if [ $quick = yes ]; then
-            if [ ".$opt_t" = .yes ]; then
-                echo "rm -f $dsttmp" 1>&2
-            fi
-            rm -f $dsttmp
-        else
-            if [ ".$opt_t" = .yes ]; then
-                echo "rm -f $dst && mv $dsttmp $dst" 1>&2
-            fi
-            rm -f $dst && mv $dsttmp $dst
-        fi
-    done
+        rm -f $dst && mv $dsttmp $dst
+    fi
     ;;
 
 mkdir )
     ##
     ##  mkdir -- Make one or more directories
-    ##  Copyright (c) 1996-2002 Ralf S. Engelschall <rse@engelschall.com>
+    ##  Copyright (c) 1996-2000 Ralf S. Engelschall <rse@engelschall.com>
     ##  Originally written for public domain by Noah Friedman <friedman@prep.ai.mit.edu>
     ##  Cleaned up and enhanced for shtool
     ##
@@ -821,7 +662,7 @@ mkdir )
     for p in ${1+"$@"}; do
         #   if the directory already exists...
         if [ -d "$p" ]; then
-            if [ ".$opt_f" = .no -a ".$opt_p" = .no ]; then
+            if [ ".$opt_f" = .no ] && [ ".$opt_p" = .no ]; then
                 echo "$msgprefix:Error: directory already exists: $p" 1>&2
                 errstatus=1
                 break
@@ -835,24 +676,6 @@ mkdir )
                 echo "mkdir $p" 1>&2
             fi
             mkdir $p || errstatus=$?
-            if [ ".$opt_o" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chown $opt_o $p" 1>&2
-                fi
-                chown $opt_o $p || errstatus=$?
-            fi
-            if [ ".$opt_g" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chgrp $opt_g $p" 1>&2
-                fi
-                chgrp $opt_g $p || errstatus=$?
-            fi
-            if [ ".$opt_m" != . ]; then
-                if [ ".$opt_t" = .yes ]; then
-                    echo "chmod $opt_m $p" 1>&2
-                fi
-                chmod $opt_m $p || errstatus=$?
-            fi
         else
             #   the smart situation
             set fnord `echo ":$p" |\
@@ -872,18 +695,6 @@ mkdir )
                         echo "mkdir $pathcomp" 1>&2
                     fi
                     mkdir $pathcomp || errstatus=$?
-                    if [ ".$opt_o" != . ]; then
-                        if [ ".$opt_t" = .yes ]; then
-                            echo "chown $opt_o $pathcomp" 1>&2
-                        fi
-                        chown $opt_o $pathcomp || errstatus=$?
-                    fi
-                    if [ ".$opt_g" != . ]; then
-                        if [ ".$opt_t" = .yes ]; then
-                            echo "chgrp $opt_g $pathcomp" 1>&2
-                        fi
-                        chgrp $opt_g $pathcomp || errstatus=$?
-                    fi
                     if [ ".$opt_m" != . ]; then
                         if [ ".$opt_t" = .yes ]; then
                             echo "chmod $opt_m $pathcomp" 1>&2
@@ -898,147 +709,6 @@ mkdir )
     exit $errstatus
     ;;
 
-path )
-    ##
-    ##  path -- Deal with program paths
-    ##  Copyright (c) 1998-2002 Ralf S. Engelschall <rse@engelschall.com>
-    ##  Originally written for Apache
-    ##
-    
-    namelist="$*"
-    
-    #   check whether the test command supports the -x option
-    if [ -x /bin/sh ] 2>/dev/null; then
-        minusx="-x"
-    else
-        minusx="-r"
-    fi
-    
-    #   split path string
-    paths="`echo $opt_p |\
-            sed -e 's/^:/.:/' \
-                -e 's/::/:.:/g' \
-                -e 's/:$/:./' \
-                -e 's/:/ /g'`"
-    
-    #   SPECIAL REQUEST
-    #   translate forward to reverse path
-    if [ ".$opt_r" = .yes ]; then
-        if [ "x$namelist" = "x." ]; then
-            rp='.'
-        else
-            rp=''
-            for pe in `IFS="$IFS/"; echo $namelist`; do
-                rp="../$rp"
-            done
-        fi
-        echo $rp | sed -e 's:/$::'
-        exit 0
-    fi
-    
-    #   SPECIAL REQUEST
-    #   strip out directory or base name
-    if [ ".$opt_d" = .yes ]; then
-        echo "$namelist" |\
-        sed -e 's;[^/]*$;;' -e 's;\(.\)/$;\1;'
-        exit 0
-    fi
-    if [ ".$opt_b" = .yes ]; then
-        echo "$namelist" |\
-        sed -e 's;.*/\([^/]*\)$;\1;'
-        exit 0
-    fi
-    
-    #   MAGIC SITUATION
-    #   Perl Interpreter (perl)
-    if [ ".$opt_m" = .yes  -a ".$namelist" = .perl ]; then
-        rm -f $tmpfile >/dev/null 2>&1
-        touch $tmpfile
-        found=0
-        pc=99
-        for dir in $paths; do
-            dir=`echo $dir | sed -e 's;/*$;;'`
-            nc=99
-            for name in perl perl5 miniperl; do
-                 if [ $minusx "$dir/$name" -a ! -d "$dir/$name" ]; then
-                     perl="$dir/$name"
-                     pv=`$perl -e 'printf("%.3f", $]);'`
-                     echo "$pv:$pc:$nc:$perl" >>$tmpfile
-                     found=1
-                 fi
-                 nc=`expr $nc - 1`
-            done
-            pc=`expr $pc - 1`
-        done
-        if [ $found = 1 ]; then
-            perl="`cat $tmpfile | sort -r -u | sed -e 'q' | cut -d: -f4`"
-            rm -f $tmpfile >/dev/null 2>&1
-            echo "$perl"
-            exit 0
-        fi
-        rm -f $tmpfile >/dev/null 2>&1
-        exit 1
-    fi
-    
-    #   MAGIC SITUATION
-    #   C pre-processor (cpp)
-    if [ ".$opt_m" = .yes -a ".$namelist" = .cpp ]; then
-        echo >$tmpfile.c "#include <assert.h>"
-        echo >>$tmpfile.c "Syntax Error"
-        #   1. try the standard cc -E approach
-        cpp="${CC-cc} -E"
-        (eval "$cpp $tmpfile.c >/dev/null") 2>$tmpfile.out
-        my_error=`grep -v '^ *+' $tmpfile.out`
-        if [ ".$my_error" != . ]; then
-            #   2. try the cc -E approach and GCC's -traditional-ccp option
-            cpp="${CC-cc} -E -traditional-cpp"
-            (eval "$cpp $tmpfile.c >/dev/null") 2>$tmpfile.out
-            my_error=`grep -v '^ *+' $tmpfile.out`
-            if [ ".$my_error" != . ]; then
-                #   3. try a standalone cpp command in path and lib dirs
-                for path in $paths /lib /usr/lib /usr/local/lib; do
-                    path=`echo $path | sed -e 's;/*$;;'`
-                    if [ $minusx "$path/cpp" -a ! -d "$path/cpp" ]; then
-                        cpp="$path/cpp"
-                        break
-                    fi
-                done
-                if [ ".$cpp" != . ]; then
-                    (eval "$cpp $tmpfile.c >/dev/null") 2>$tmpfile.out
-                    my_error=`grep -v '^ *+' $tmpfile.out`
-                    if [ ".$my_error" != . ]; then
-                        #   ok, we gave up...
-                        cpp=''
-                    fi
-                fi
-            fi
-        fi
-        rm -f $tmpfile >/dev/null 2>&1
-        rm -f $tmpfile.c $tmpfile.out >/dev/null 2>&1
-        if [ ".$cpp" != . ]; then
-            echo "$cpp"
-            exit 0
-        fi
-        exit 1
-    fi
-    
-    #   STANDARD SITUATION
-    #   iterate over names
-    for name in $namelist; do
-        #   iterate over paths
-        for path in $paths; do
-            path=`echo $path | sed -e 's;/*$;;'`
-            if [ $minusx "$path/$name" -a ! -d "$path/$name" ]; then
-                if [ ".$opt_s" != .yes ]; then
-                    echo "$path/$name"
-                fi
-                exit 0
-            fi
-        done
-    done
-    exit 1
-    ;;
-
 esac
 
 exit 0

build/sysv_makefile

@@ -0,0 +1,34 @@
+#! /bin/sh
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+# cwd must be top_srcdir
+test -f build/sysv_makefile || exit 2
+
+test -f bsd_converted || exit 1
+
+tmpfile=`mktemp /tmp/sysv_makefile.XXXXXX` || tmpfile="tmp.$$"
+for i in build/*.mk; do
+    sed 's/^\.include "\(.*\)"/include \1/' $i >$tmpfile \
+        && cp $tmpfile $i
+done
+rm -f $tmpfile
+
+rm bsd_converted
+exit 0

buildconf

@@ -1,24 +1,36 @@
 #!/bin/sh
 # $Id$
 
-while test $# -gt 0; do
-    if test "$1" = "--copy"; then
-        automake_flags=--copy
-    fi
+supplied_flag=$1
 
-    if test "$1" = "--ZendEngine2"; then
-        ZENDDIR=ZendEngine2
-        echo "Using Zend Engine 2 code"
-    fi
-
-    shift
-done
-
-if test -z "$ZENDDIR"; then
-    ZENDDIR=Zend
-    echo "using default Zend directory"
+if test "$supplied_flag" = "--copy"; then
+    automake_flags=--copy
 fi
- 
+
+## build.mk does not check aclocal exit status yet
+##
+#mv aclocal.m4 aclocal.m4.old 2>/dev/null
+#aclocal
+#if test "$?" != "0" -a "$am_prefix" != "$lt_prefix"; then
+#    echo "buildconf: ERROR: aclocal failed, probably because automake and"
+#    echo "           libtool are installed with different prefixes;"
+#    echo "           automake is installed in $am_prefix, but libtool in $lt_prefix."
+#    echo "           Please re-install automake and/or libtool with a common prefix"
+#    echo "           and try again."
+#    exit 1
+#fi
+
+if test "$supplied_flag" = "--local"; then
+  subdirs='SUBDIRS='
+else
+  subdirs=''
+fi
+
 rm -f generated_lists
 
-${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR"
+case "`uname`" in
+*BSD/OS*)
+    ./build/bsd_makefile;;
+esac
+
+${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags"

config.guess

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
 
-timestamp='2002-10-21'
+timestamp='2001-11-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ timestamp='2002-10-21'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Originally written by Per Bothner <per@bothner.com>.
+# Originally written by Per Bothner <bothner@cygnus.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -88,40 +88,30 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
 
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 
+# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# This shell variable is my proudest work .. or something. --bje
-
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int dummy(){}" > $dummy.c ;
+	for c in cc gcc c89 ; do
+	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+	  if test $? = 0 ; then
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $files ;
+	rm -f $dummy.c $dummy.o $dummy.rel ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;
-unset files'
+esac'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -145,23 +135,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# object file format.  This provides both forward
 	# compatibility and a consistent mechanism for selecting the
 	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	# Determine the machine/vendor (is the vendor relevant).
+	case "${UNAME_MACHINE}" in
+	    amiga) machine=m68k-unknown ;;
+	    arm32) machine=arm-unknown ;;
+	    atari*) machine=m68k-atari ;;
+	    sun3*) machine=m68k-sun ;;
+	    mac68k) machine=m68k-apple ;;
+	    macppc) machine=powerpc-apple ;;
+	    hp3[0-9][05]) machine=m68k-hp ;;
+	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    sparc*) machine=`uname -p`-unknown ;;
+	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	case "${UNAME_MACHINE}" in
+	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep __ELF__ >/dev/null
@@ -231,7 +221,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	eval $set_cc_for_build
 	cat <<EOF >$dummy.s
 	.data
 \$Lformat:
@@ -257,9 +246,10 @@ main:
 	jsr \$26,exit
 	.end main
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
+	eval $set_cc_for_build
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		case `$dummy` in
+		case `./$dummy` in
 			0-0)
 				UNAME_MACHINE="alpha"
 				;;
@@ -281,12 +271,9 @@ EOF
 			2-1307)
 				UNAME_MACHINE="alphaev68"
 				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
 		esac
 	fi
-	rm -f $dummy.s $dummy && rmdir $tmpdir
+	rm -f $dummy.s $dummy
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
@@ -304,9 +291,6 @@ EOF
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
@@ -327,10 +311,6 @@ EOF
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
@@ -359,7 +339,7 @@ EOF
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
     sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
@@ -437,21 +417,15 @@ EOF
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
 	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS)
-	echo powerpc-harris-powermax
-	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
 	exit 0 ;;
@@ -524,8 +498,8 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-		rm -f $dummy.c $dummy && rmdir $tmpdir
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -534,7 +508,7 @@ EOF
 	fi
 	exit 0 ;;
     *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
@@ -623,9 +597,9 @@ EOF
                   exit (0);
               }
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
 		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy && rmdir $tmpdir
+		    rm -f $dummy.c $dummy
 		fi ;;
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -661,8 +635,8 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -708,6 +682,9 @@ EOF
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
         exit 0 ;;
+    CRAY*X-MP:*:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
@@ -729,6 +706,9 @@ EOF
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    CRAY-2:*:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
@@ -745,19 +725,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -768,9 +736,6 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
-	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -796,30 +761,16 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
+	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
+	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
+	esac
 	;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
@@ -868,8 +819,7 @@ EOF
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+	ld_supported_targets=`cd /; ld --help 2>&1 \
 			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
 				    s/.*supported targets: *//
@@ -881,7 +831,7 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit 0 ;;		
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0 ;;
@@ -893,29 +843,32 @@ EOF
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
+	cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-pc-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+# endif
+#else
+  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+#endif
+  return 0;
+}
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
@@ -953,13 +906,13 @@ EOF
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
@@ -992,12 +945,9 @@ EOF
 	# "miniframe"
 	echo m68010-convergent-sysv
 	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1088,9 +1038,6 @@ EOF
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
 	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
@@ -1101,17 +1048,15 @@ EOF
 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
+	if test "${UNAME_MACHINE}" = "x86pc"; then
 		UNAME_MACHINE=pc
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 	exit 0 ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-[KW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1283,8 +1228,8 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 

config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+#   Free Software Foundation, Inc.
 
-timestamp='2002-09-05'
+timestamp='2001-11-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -227,42 +227,31 @@ case $basic_machine in
 	1750a | 580 \
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| c4x | clipper \
+	| d10v | d30v | dsp16xx \
+	| fr30 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
 	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
+	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
 	| mn10200 | mn10300 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| openrisc \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sh | sh[34] | sh[34]eb | shbe | shle \
+	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
+	| v850 \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xstormy16 \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -289,51 +278,38 @@ case $basic_machine in
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| alphapca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armv*-* \
 	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
+	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+	| clipper-* | cray2-* | cydra-* \
+	| d10v-* | d30v-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
 	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39 | mipstx39el \
+	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
+	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
+	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
+	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+	| v850-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -398,10 +374,6 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -422,8 +394,16 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | j90)
-		basic_machine=j90-cray
+	cray | ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	cray2)
+		basic_machine=cray2-cray
+		os=-unicos
+		;;
+	[cjt]90)
+		basic_machine=${basic_machine}-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -438,14 +418,6 @@ case $basic_machine in
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -626,6 +598,14 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
+	mipsel*-linux*)
+		basic_machine=mipsel-unknown
+		os=-linux-gnu
+		;;
+	mips*-linux*)
+		basic_machine=mips-unknown
+		os=-linux-gnu
+		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -640,10 +620,6 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -723,10 +699,6 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -749,13 +721,13 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-	pc532 | pc532-*)
+        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+	pentiumpro | p6 | 6x86 | athlon)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)
@@ -776,22 +748,22 @@ case $basic_machine in
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-		;;
+	        ;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-		;;
+	        ;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-		;;
+	        ;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-		;;
+	        ;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -822,12 +794,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -901,22 +867,10 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
 	t3e)
-		basic_machine=alphaev5-cray
+		basic_machine=t3e-cray
 		os=-unicos
 		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-        tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
@@ -927,10 +881,6 @@ case $basic_machine in
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -955,8 +905,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
+               basic_machine=f301-fujitsu
+               ;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -981,13 +931,13 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-windows32-msvcrt
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
+	xmp)
+		basic_machine=xmp-cray
 		os=-unicos
 		;;
+        xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -1008,6 +958,13 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
+	mips)
+		if [ x$os = x-linux-gnu ]; then
+			basic_machine=mips-unknown
+		else
+			basic_machine=mips-mips
+		fi
+		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -1027,16 +984,13 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+	sh3 | sh4 | sh3eb | sh4eb)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-	cydra)
+        cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -1051,6 +1005,10 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
+	c4x*)
+		basic_machine=c4x-none
+		os=-coff
+		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1116,8 +1074,7 @@ case $os in
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
+	      | -os2* | -vos* | -palmos* | -uclinux*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1169,20 +1126,14 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
-	-atheos*)
-		os=-atheos
-		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
 	-ns2 )
-		os=-nextstep2
+	        os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1221,8 +1172,8 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
+        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+	        os=-mint
 		;;
 	-none)
 		;;
@@ -1255,11 +1206,10 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-	pdp11-*)
+        pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1286,9 +1236,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or32-*)
-		os=-coff
-		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1352,19 +1299,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-	*-gould)
+        *-gould)
 		os=-sysv
 		;;
-	*-highlevel)
+        *-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-	*-sgi)
+        *-sgi)
 		os=-irix
 		;;
-	*-siemens)
+        *-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1436,7 +1383,7 @@ case $basic_machine in
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			-vxsim* | -vxworks*)
 				vendor=wrs
 				;;
 			-aux*)

dynlib.m4

@@ -0,0 +1,88 @@
+#  +----------------------------------------------------------------------+
+#  | PHP version 4.0                                                      |
+#  +----------------------------------------------------------------------+
+#  | Copyright (c) 1997-2001 The PHP Group                                |
+#  +----------------------------------------------------------------------+
+#  | This source file is subject to version 2.02 of the PHP license,      |
+#  | that is bundled with this package in the file LICENSE, and is        |
+#  | available at through the world-wide-web at                           |
+#  | http://www.php.net/license/2_02.txt.                                 |
+#  | If you did not receive a copy of the PHP license and are unable to   |
+#  | obtain it through the world-wide-web, please send a note to          |
+#  | license@php.net so we can mail you a copy immediately.               |
+#  +----------------------------------------------------------------------+
+#  | Authors: Sascha Schumann <sascha@schumann.cx>                        |
+#  +----------------------------------------------------------------------+
+#
+# $Id$ 
+#
+
+
+
+AC_DEFUN(LIB_SHARED_CONVENIENCE,[
+  lib_target="\$(LTLIBRARY_NAME)"
+  cat >>$1<<EOF
+\$(LTLIBRARY_NAME): \$(LTLIBRARY_SHARED_OBJECTS) \$(LTLIBRARY_DEPENDENCIES)
+	\$(SHARED_LIBTOOL) --mode=link \$(COMPILE) \$(LDFLAGS) -o \[$]@ \$(LTLIBRARY_LDFLAGS) \$(LTLIBRARY_OBJECTS) \$(LTLIBRARY_SHARED_LIBADD)
+
+EOF
+])
+
+AC_DEFUN(LIB_SHARED_MODULE,[
+  lib_target="\$(LTLIBRARY_SHARED_NAME)"
+  cat >>$1<<EOF
+\$(LTLIBRARY_SHARED_NAME): \$(LTLIBRARY_SHARED_OBJECTS) \$(LTLIBRARY_DEPENDENCIES)
+	\$(SHARED_LIBTOOL) --mode=link \$(COMPILE) \$(LDFLAGS) -o \[$]@ -avoid-version -module -rpath \$(phplibdir) \$(LTLIBRARY_LDFLAGS) \$(LTLIBRARY_OBJECTS) \$(LTLIBRARY_SHARED_LIBADD)
+	\$(SHARED_LIBTOOL) --mode=install cp \[$]@ \$(phplibdir)
+
+EOF
+])
+
+AC_DEFUN(LIB_STATIC_CONVENIENCE,[
+  lib_target="\$(LTLIBRARY_NAME)"
+  cat >>$1<<EOF
+\$(LTLIBRARY_NAME): \$(LTLIBRARY_OBJECTS) \$(LTLIBRARY_DEPENDENCIES)
+	\$(LINK) \$(LTLIBRARY_LDFLAGS) \$(LTLIBRARY_OBJECTS) \$(LTLIBRARY_LIBADD)
+
+EOF
+])
+
+dnl LIB_BUILD(path, shared, convenience)
+dnl sets up path to build a shared/static convenience/module
+AC_DEFUN(LIB_BUILD,[
+  lib_makefile="$1/libs.mk"
+  lib_target=""
+  
+  $php_shtool mkdir -p $1
+  if test "$BSD_MAKEFILE" = "yes"; then
+    lib_include_conf=".include \"\$(top_builddir)/config_vars.mk\""
+  else
+    lib_include_conf="include \$(top_builddir)/config_vars.mk"
+  fi
+  cat >$lib_makefile<<EOF
+$lib_include_conf
+LTLIBRARY_OBJECTS = \$(LTLIBRARY_SOURCES:.c=.lo) \$(LTLIBRARY_OBJECTS_X)
+LTLIBRARY_SHARED_OBJECTS = \$(LTLIBRARY_OBJECTS:.lo=.slo)
+EOF
+
+  if test "$2" = "shared" || test "$2" = "yes"; then
+    lib_build_shared=yes
+    if test -n "$3"; then
+dnl ---------------------------------------- Shared Convenience
+      LIB_SHARED_CONVENIENCE($lib_makefile)
+    else
+dnl ---------------------------------------- Shared Module
+      LIB_SHARED_MODULE($lib_makefile)
+    fi
+  else
+dnl ---------------------------------------- Static Convenience = Static Module
+    LIB_STATIC_CONVENIENCE($lib_makefile)
+  fi
+
+dnl ---------------------------------------- Generate build targets
+  if test -n "$lib_target"; then
+    cat >>$lib_makefile<<EOF
+targets = $lib_target
+EOF
+  fi
+])

ext/Makefile.in

@@ -0,0 +1,4 @@
+
+SUBDIRS = $(EXT_SUBDIRS)
+
+include $(top_srcdir)/build/rules.mk

ext/aspell/CREDITS

@@ -0,0 +1,2 @@
+aspell
+Rasmus Lerdorf

ext/aspell/Makefile.in

@@ -0,0 +1,5 @@
+
+LTLIBRARY_NAME    = libaspell.la
+LTLIBRARY_SOURCES = aspell.c
+
+include $(top_srcdir)/build/dynlib.mk

ext/aspell/aspell.c

@@ -0,0 +1,228 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2001 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors:                                                             |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+
+#ifdef COMPILE_DL_ASPELL
+#include "phpdl.h"
+#endif
+#include <stdlib.h>
+#include <ctype.h>
+#include <stdio.h>
+
+#if HAVE_ASPELL
+
+#include "php_aspell.h"
+#include <aspell-c.h>
+#include "ext/standard/info.h"
+
+/* {{{ aspell_functions[]
+ */
+function_entry aspell_functions[] = {
+	PHP_FE(aspell_new,								NULL)
+	PHP_FE(aspell_check,							NULL)
+	PHP_FE(aspell_check_raw,						NULL)
+	PHP_FE(aspell_suggest,							NULL)
+	{NULL, NULL, NULL}
+};
+/* }}} */
+
+static int le_aspell;
+
+zend_module_entry aspell_module_entry = {
+    STANDARD_MODULE_HEADER,
+	"aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
+};
+
+#ifdef COMPILE_DL_ASPELL
+ZEND_GET_MODULE(aspell)
+#endif
+
+/* {{{ php_aspell_close
+ */
+static void php_aspell_close(zend_rsrc_list_entry *rsrc TSRMLS_DC)
+{
+	aspell *sc = (aspell *)rsrc->ptr;
+
+	aspell_free(sc);
+}
+/* }}} */
+
+/* {{{ PHP_MINIT_FUNCTION
+ */
+PHP_MINIT_FUNCTION(aspell)
+{
+    le_aspell = zend_register_list_destructors_ex(php_aspell_close, NULL, "aspell", module_number);
+	return SUCCESS;
+}
+/* }}} */
+
+/* {{{ proto int aspell_new(string master [, string personal])
+   Load a dictionary */
+PHP_FUNCTION(aspell_new)
+{
+	pval **master, **personal;
+	int argc;
+	aspell *sc;
+	int ind;
+	
+	argc = ZEND_NUM_ARGS();
+	if (argc < 1 || argc > 2 || zend_get_parameters_ex(argc, &master, &personal) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	convert_to_string_ex(master);
+	if(argc==2)
+	  {
+		convert_to_string_ex(personal) ;
+		sc=aspell_new((*master)->value.str.val, (*personal)->value.str.val);
+	  }
+	else
+	  sc=aspell_new((*master)->value.str.val, "");
+
+	ind = zend_list_insert(sc, le_aspell);
+	RETURN_LONG(ind);
+}
+/* }}} */
+
+/* {{{ proto array aspell_suggest(aspell int, string word)
+   Return array of Suggestions */
+PHP_FUNCTION(aspell_suggest)
+{
+	pval **scin, **word;
+	int argc;
+	aspell *sc;
+	int ind, type;
+	aspellSuggestions *sug;
+	size_t i;
+
+	
+	argc = ZEND_NUM_ARGS();
+	if (argc != 2 || zend_get_parameters_ex(argc, &scin, &word) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	convert_to_long_ex(scin);
+	convert_to_string_ex(word);
+	sc = (aspell *)zend_list_find((*scin)->value.lval, &type);
+	if(!sc)
+	  {
+		php_error(E_WARNING, "%d is not an ASPELL result index", (*scin)->value.lval);
+		RETURN_FALSE;
+	  }
+
+	if (array_init(return_value) == FAILURE) {
+                RETURN_FALSE;
+	}
+
+	sug = aspell_suggest(sc, (*word)->value.str.val);
+	  for (i = 0; i != sug->size; ++i) {
+                add_next_index_string(return_value, (char *)sug->data[i], 1);
+	  }
+	  aspell_free_suggestions(sug);
+}
+/* }}} */
+
+/* {{{ proto int aspell_check(aspell int, string word)
+   Return if word is valid */
+PHP_FUNCTION(aspell_check)
+{
+   int type;
+   pval **scin, **word;
+   aspell *sc;
+
+   int argc;
+    argc = ZEND_NUM_ARGS();
+    if (argc != 2 || zend_get_parameters_ex(argc, &scin, &word) == FAILURE) {
+        WRONG_PARAM_COUNT;
+    }
+    convert_to_long_ex(scin);
+    convert_to_string_ex(word);
+    sc= (aspell *) zend_list_find((*scin)->value.lval, &type);
+    if(!sc)
+      {
+        php_error(E_WARNING, "%d is not an ASPELL result index", (*scin)->value.lval);
+        RETURN_FALSE;
+      }
+    if (aspell_check(sc, (*word)->value.str.val)) 
+      {
+	RETURN_TRUE;
+      }
+    else 
+      {
+  RETURN_FALSE;
+      }
+}
+/* }}} */
+
+/* {{{ proto int aspell_check_raw(aspell int, string word)
+   Return if word is valid, ignoring case or trying to trim it in any way */
+PHP_FUNCTION(aspell_check_raw)
+{
+  pval **scin, **word;
+  int type;
+  int argc;
+  aspell *sc;
+
+    argc = ZEND_NUM_ARGS();
+    if (argc != 2 || zend_get_parameters_ex(argc, &scin, &word) == FAILURE) {
+        WRONG_PARAM_COUNT;
+    }
+    convert_to_long_ex(scin);
+    convert_to_string_ex(word);
+    sc = (aspell *)zend_list_find((*scin)->value.lval, &type);
+    if(!sc)
+      {
+        php_error(E_WARNING, "%d is not an ASPELL result index", (*scin)->value.lval);
+        RETURN_FALSE;
+      }
+	if (aspell_check_raw(sc, (*word)->value.str.val)) 
+	  {
+	    RETURN_TRUE;
+	  }
+	else
+	  {
+	    RETURN_FALSE;
+	      }
+}
+/* }}} */
+
+/* {{{ PHP_MINFO_FUNCTION
+ */
+PHP_MINFO_FUNCTION(aspell)
+{
+	php_info_print_table_start();
+	php_info_print_table_row(2, "ASpell Support", "enabled");
+	php_info_print_table_end();
+}
+/* }}} */
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
+ */

ext/aspell/config.m4

@@ -0,0 +1,28 @@
+dnl $Id$
+
+AC_MSG_CHECKING(for ASPELL support)
+AC_ARG_WITH(aspell,
+[  --with-aspell[=DIR]     Include ASPELL support.],
+[
+  if test "$withval" != "no"; then
+    if test "$withval" = "yes"; then
+      ASPELL_DIR=/usr/local
+    else
+      ASPELL_DIR=$withval
+    fi
+
+    PHP_ADD_INCLUDE($ASPELL_DIR/include)
+    PHP_ADD_LIBRARY_WITH_PATH(aspell, $ASPELL_DIR/lib)
+
+    if test ! -f "$ASPELL_DIR/include/aspell-c.h"; then
+      AC_MSG_ERROR(Could not find aspell-c.h in $ASPELL_DIR/include - please copy it manually from the aspell sources to $ASPELL_DIR/include)
+    fi
+    AC_DEFINE(HAVE_ASPELL,1,[Whether you have aspell])
+    AC_MSG_RESULT(yes)
+    PHP_EXTENSION(aspell)
+  else
+    AC_MSG_RESULT(no)
+  fi
+],[
+  AC_MSG_RESULT(no)
+])

ext/aspell/php_aspell.h

@@ -1,8 +1,8 @@
-/*
+/* 
    +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
+   | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
+   | Copyright (c) 1997-2001 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -12,30 +12,30 @@
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
-   | Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                        |
+   | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca>                       |
    +----------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifndef PHP_TYPE_H
-#define PHP_TYPE_H
+#ifndef PHP_ASPELL_H
+#define PHP_ASPELL_H
+#if HAVE_ASPELL
+extern zend_module_entry aspell_module_entry;
+#define aspell_module_ptr &aspell_module_entry
 
-PHP_FUNCTION(intval);
-PHP_FUNCTION(floatval);
-PHP_FUNCTION(strval);
-PHP_FUNCTION(gettype);
-PHP_FUNCTION(settype);
-PHP_FUNCTION(is_null);
-PHP_FUNCTION(is_resource);
-PHP_FUNCTION(is_bool);
-PHP_FUNCTION(is_long);
-PHP_FUNCTION(is_float);
-PHP_FUNCTION(is_numeric);
-PHP_FUNCTION(is_string);
-PHP_FUNCTION(is_array);
-PHP_FUNCTION(is_object);
-PHP_FUNCTION(is_scalar);
-PHP_FUNCTION(is_callable);
+PHP_MINIT_FUNCTION(aspell);
+PHP_MINFO_FUNCTION(aspell);
 
+PHP_FUNCTION(aspell_new);
+PHP_FUNCTION(aspell_check);
+PHP_FUNCTION(aspell_check_raw);
+PHP_FUNCTION(aspell_suggest);
+
+#else
+#define aspell_module_ptr NULL
 #endif
+
+#define phpext_aspell_ptr aspell_module_ptr
+
+#endif /* PHP_ASPELL_H */

ext/bcmath/Makefile.in

@@ -0,0 +1,11 @@
+
+LTLIBRARY_NAME    = libbcmath.la
+LTLIBRARY_SOURCES = bcmath.c number.c
+LTLIBRARY_SHARED_NAME = bcmath.la
+LTLIBRARY_DEPENDENCIES  = libbcmath/libbcmath.la
+LTLIBRARY_LIBADD        = $(LTLIBRARY_DEPENDENCIES)
+LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_LIBADD)
+
+SUBDIRS = libbcmath
+
+include $(top_srcdir)/build/dynlib.mk

ext/bcmath/bcmath.c

@@ -1,8 +1,8 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
+   | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
+   | Copyright (c) 1997-2001 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -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: Andi Gutmans <andi@zend.com>                                 |
+   | Authors: Andi Gutmans <andi@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
@@ -28,9 +28,7 @@
 
 #include "ext/standard/info.h"
 #include "php_bcmath.h"
-#include "libbcmath/src/bcmath.h"
-
-ZEND_DECLARE_MODULE_GLOBALS(bcmath);
+#include "ext/bcmath/libbcmath/src/bcmath.h"
 
 function_entry bcmath_functions[] = {
 	PHP_FE(bcadd,									NULL)
@@ -48,15 +46,11 @@ function_entry bcmath_functions[] = {
 zend_module_entry bcmath_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"bcmath",
-	bcmath_functions,
-#if ZTS
-	PHP_MODULE_STARTUP_N(bcmath),
-#else
-	NULL,
-#endif
-	NULL,
+    bcmath_functions,
+	PHP_MINIT(bcmath),
+	PHP_MSHUTDOWN(bcmath),
 	PHP_RINIT(bcmath),
-	PHP_RSHUTDOWN(bcmath),
+	NULL,
 	PHP_MINFO(bcmath),
 	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
@@ -70,23 +64,55 @@ ZEND_GET_MODULE(bcmath)
 static long bc_precision;
 #endif
 
-#if ZTS
-PHP_MODULE_STARTUP_D(bcmath)
+/* Storage used for special numbers. */
+bc_num _zero_;
+bc_num _one_;
+bc_num _two_;
+
+
+/* Make a copy of a number!  Just increments the reference count! */
+bc_num copy_num (bc_num num)
 {
-	zend_bcmath_globals *bcmath_globals;
+  num->n_refs++;
+  return num;
+}
+
+
+/* Initialize a number NUM by making it a copy of zero. */
+void init_num (bc_num *num)
+{
+	*num = copy_num (_zero_);
+}
+
+
+PHP_MINIT_FUNCTION(bcmath)
+{
+	extern bc_num _zero_;
+	extern bc_num _one_;
+	extern bc_num _two_;
+
+	_zero_ = bc_new_num (1, 0);
+	_one_  = bc_new_num (1, 0);
+	_one_->n_value[0] = 1;
+	_two_  = bc_new_num (1, 0);
+	_two_->n_value[0] = 2;
+	persist_alloc(_zero_);
+	persist_alloc(_one_);
+	persist_alloc(_two_);
+	persist_alloc(_zero_->n_ptr);
+	persist_alloc(_one_->n_ptr);
+	persist_alloc(_two_->n_ptr);
 
-	ts_allocate_id(&bcmath_globals_id, sizeof(zend_bcmath_globals), NULL, NULL);
-	bcmath_globals = ts_resource(bcmath_globals_id);
 	return SUCCESS;
 }
-#endif
 
-PHP_RSHUTDOWN_FUNCTION(bcmath)
+
+
+PHP_MSHUTDOWN_FUNCTION(bcmath)
 {
-	bc_free_num(&BCG(_zero_));
-	bc_free_num(&BCG(_one_));
-	bc_free_num(&BCG(_two_));
-
+	bc_free_num(&_zero_);
+	bc_free_num(&_one_);
+	bc_free_num(&_two_);
 	return SUCCESS;
 }
 
@@ -96,9 +122,6 @@ PHP_RINIT_FUNCTION(bcmath)
 	if (cfg_get_long("bcmath.scale", &bc_precision)==FAILURE) {
 		bc_precision=0;
 	}
-	if(bc_precision<0) bc_precision=0;
-	bc_init_numbers(TSRMLS_C);
-	
 	return SUCCESS;
 }
 
@@ -110,21 +133,6 @@ PHP_MINFO_FUNCTION(bcmath)
 	php_info_print_table_end();
 }
 
-/* {{{ php_str2num
-   Convert to bc_num detecting scale */
-static void php_str2num(bc_num *num, char *str TSRMLS_DC) 
-{
-	char *p;
-
-	if (!(p = strchr(str, '.'))) {
-		bc_str2num(num, str, 0 TSRMLS_CC);
-		return;
-	}
-
-	bc_str2num(num, str, strlen(p+1) TSRMLS_CC);
-}
-/* }}} */
-
 /* {{{ proto string bcadd(string left_operand, string right_operand [, int scale])
    Returns the sum of two arbitrary precision numbers */
 PHP_FUNCTION(bcadd)
@@ -144,7 +152,7 @@ PHP_FUNCTION(bcadd)
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
+				scale = (int) (*scale_param)->value.lval;
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -152,17 +160,15 @@ PHP_FUNCTION(bcadd)
 	}
 	convert_to_string_ex(left);
 	convert_to_string_ex(right);
-	bc_init_num(&first TSRMLS_CC);
-	bc_init_num(&second TSRMLS_CC);
-	bc_init_num(&result TSRMLS_CC);
-	php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
-	php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
+	bc_init_num(&first);
+	bc_init_num(&second);
+	bc_init_num(&result);
+	bc_str2num(&first, (*left)->value.str.val, scale);
+	bc_str2num(&second, (*right)->value.str.val, scale);
 	bc_add (first, second, &result, scale);
-	if (result->n_scale > scale)
-		result->n_scale = scale;
-	Z_STRVAL_P(return_value) = bc_num2str(result);
-	Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
-	Z_TYPE_P(return_value) = IS_STRING;
+	return_value->value.str.val = bc_num2str(result);
+	return_value->value.str.len = strlen(return_value->value.str.val);
+	return_value->type = IS_STRING;
 	bc_free_num(&first);
 	bc_free_num(&second);
 	bc_free_num(&result);
@@ -189,7 +195,7 @@ PHP_FUNCTION(bcsub)
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
+				scale = (int) (*scale_param)->value.lval;
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -197,17 +203,15 @@ PHP_FUNCTION(bcsub)
 	}
 	convert_to_string_ex(left);
 	convert_to_string_ex(right);
-	bc_init_num(&first TSRMLS_CC);
-	bc_init_num(&second TSRMLS_CC);
-	bc_init_num(&result TSRMLS_CC);
-	php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
-	php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
+	bc_init_num(&first);
+	bc_init_num(&second);
+	bc_init_num(&result);
+	bc_str2num(&first, (*left)->value.str.val, scale);
+	bc_str2num(&second, (*right)->value.str.val, scale);
 	bc_sub (first, second, &result, scale);
-	if (result->n_scale > scale)
-		result->n_scale = scale;
-	Z_STRVAL_P(return_value) = bc_num2str(result);
-	Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
-	Z_TYPE_P(return_value) = IS_STRING;
+	return_value->value.str.val = bc_num2str(result);
+	return_value->value.str.len = strlen(return_value->value.str.val);
+	return_value->type = IS_STRING;
 	bc_free_num(&first);
 	bc_free_num(&second);
 	bc_free_num(&result);
@@ -234,7 +238,7 @@ PHP_FUNCTION(bcmul)
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
+				scale = (int) (*scale_param)->value.lval;
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -242,17 +246,15 @@ PHP_FUNCTION(bcmul)
 	}
 	convert_to_string_ex(left);
 	convert_to_string_ex(right);
-	bc_init_num(&first TSRMLS_CC);
-	bc_init_num(&second TSRMLS_CC);
-	bc_init_num(&result TSRMLS_CC);
-	php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
-	php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
-	bc_multiply (first, second, &result, scale TSRMLS_CC);
-	if (result->n_scale > scale)
-		result->n_scale = scale;
-	Z_STRVAL_P(return_value) = bc_num2str(result);
-	Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
-	Z_TYPE_P(return_value) = IS_STRING;
+	bc_init_num(&first);
+	bc_init_num(&second);
+	bc_init_num(&result);
+	bc_str2num(&first, (*left)->value.str.val, scale);
+	bc_str2num(&second, (*right)->value.str.val, scale);
+	bc_multiply (first, second, &result, scale);
+	return_value->value.str.val = bc_num2str(result);
+	return_value->value.str.len = strlen(return_value->value.str.val);
+	return_value->type = IS_STRING;
 	bc_free_num(&first);
 	bc_free_num(&second);
 	bc_free_num(&result);
@@ -279,7 +281,7 @@ PHP_FUNCTION(bcdiv)
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
+				scale = (int) (*scale_param)->value.lval;
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -287,21 +289,19 @@ PHP_FUNCTION(bcdiv)
 	}
 	convert_to_string_ex(left);
 	convert_to_string_ex(right);
-	bc_init_num(&first TSRMLS_CC);
-	bc_init_num(&second TSRMLS_CC);
-	bc_init_num(&result TSRMLS_CC);
-	php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
-	php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
-	switch (bc_divide (first, second, &result, scale TSRMLS_CC)) {
+	bc_init_num(&first);
+	bc_init_num(&second);
+	bc_init_num(&result);
+	bc_str2num(&first, (*left)->value.str.val, scale);
+	bc_str2num(&second, (*right)->value.str.val, scale);
+	switch (bc_divide (first, second, &result, scale)) {
 		case 0: /* OK */
-			if (result->n_scale > scale)
-				result->n_scale = scale;
-			Z_STRVAL_P(return_value) = bc_num2str(result);
-			Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
-			Z_TYPE_P(return_value) = IS_STRING;
+			return_value->value.str.val = bc_num2str(result);
+			return_value->value.str.len = strlen(return_value->value.str.val);
+			return_value->type = IS_STRING;
 			break;
 		case -1: /* division by zero */
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Division by zero");
+			php_error(E_WARNING, "Division by zero");
 			break;
 	}
 	bc_free_num(&first);
@@ -330,19 +330,19 @@ PHP_FUNCTION(bcmod)
 	}
 	convert_to_string_ex(left);
 	convert_to_string_ex(right);
-	bc_init_num(&first TSRMLS_CC);
-	bc_init_num(&second TSRMLS_CC);
-	bc_init_num(&result TSRMLS_CC);
-	bc_str2num(&first, Z_STRVAL_PP(left), 0 TSRMLS_CC);
-	bc_str2num(&second, Z_STRVAL_PP(right), 0 TSRMLS_CC);
-	switch (bc_modulo(first, second, &result, 0 TSRMLS_CC)) {
+	bc_init_num(&first);
+	bc_init_num(&second);
+	bc_init_num(&result);
+	bc_str2num(&first, (*left)->value.str.val, 0);
+	bc_str2num(&second, (*right)->value.str.val, 0);
+	switch (bc_modulo(first, second, &result, 0)) {
 		case 0:
-			Z_STRVAL_P(return_value) = bc_num2str(result);
-			Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
-			Z_TYPE_P(return_value) = IS_STRING;
+			return_value->value.str.val = bc_num2str(result);
+			return_value->value.str.len = strlen(return_value->value.str.val);
+			return_value->type = IS_STRING;
 			break;
 		case -1:
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Division by zero");
+			php_error(E_WARNING, "Division by zero");
 			break;
 	}
 	bc_free_num(&first);
@@ -371,7 +371,7 @@ PHP_FUNCTION(bcpow)
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
+				scale = (int) (*scale_param)->value.lval;
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -379,17 +379,15 @@ PHP_FUNCTION(bcpow)
 	}
 	convert_to_string_ex(left);
 	convert_to_string_ex(right);
-	bc_init_num(&first TSRMLS_CC);
-	bc_init_num(&second TSRMLS_CC);
-	bc_init_num(&result TSRMLS_CC);
-	php_str2num(&first, Z_STRVAL_PP(left) TSRMLS_CC);
-	php_str2num(&second, Z_STRVAL_PP(right) TSRMLS_CC);
-	bc_raise (first, second, &result, scale TSRMLS_CC);
-	if (result->n_scale > scale)
-		result->n_scale = scale;
-	Z_STRVAL_P(return_value) = bc_num2str(result);
-	Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
-	Z_TYPE_P(return_value) = IS_STRING;
+	bc_init_num(&first);
+	bc_init_num(&second);
+	bc_init_num(&result);
+	bc_str2num(&first, (*left)->value.str.val, scale);
+	bc_str2num(&second, (*right)->value.str.val, scale);
+	bc_raise (first, second, &result, scale); 
+	return_value->value.str.val = bc_num2str(result);
+	return_value->value.str.len = strlen(return_value->value.str.val);
+	return_value->type = IS_STRING;
 	bc_free_num(&first);
 	bc_free_num(&second);
 	bc_free_num(&result);
@@ -416,23 +414,21 @@ PHP_FUNCTION(bcsqrt)
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
+				scale = (int) (*scale_param)->value.lval;
 				break;
 		default:
 				WRONG_PARAM_COUNT;
 				break;
 	}
 	convert_to_string_ex(left);
-	bc_init_num(&result TSRMLS_CC);
-	php_str2num(&result, Z_STRVAL_PP(left) TSRMLS_CC);
-	if (bc_sqrt (&result, scale TSRMLS_CC) != 0) {
-		if (result->n_scale > scale)
-			result->n_scale = scale;
-		Z_STRVAL_P(return_value) = bc_num2str(result);
-		Z_STRLEN_P(return_value) = strlen(Z_STRVAL_P(return_value));
-		Z_TYPE_P(return_value) = IS_STRING;
+	bc_init_num(&result);
+	bc_str2num(&result, (*left)->value.str.val, scale);
+	if (bc_sqrt (&result, scale) != 0) {
+		return_value->value.str.val = bc_num2str(result);
+		return_value->value.str.len = strlen(return_value->value.str.val);
+		return_value->type = IS_STRING;
 	} else {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Square root of negative number");
+		php_error(E_WARNING, "Square root of negative number");
 	}
 	bc_free_num(&result);
 	return;
@@ -458,7 +454,7 @@ PHP_FUNCTION(bccomp)
 		        	WRONG_PARAM_COUNT;
     			}
 				convert_to_long_ex(scale_param);
-				scale = (int) (Z_LVAL_PP(scale_param)<0) ? 0:Z_LVAL_PP(scale_param);
+				scale = (int) (*scale_param)->value.lval;
 				break;
 		default:
 				WRONG_PARAM_COUNT;
@@ -467,13 +463,13 @@ PHP_FUNCTION(bccomp)
 
 	convert_to_string_ex(left);
 	convert_to_string_ex(right);
-	bc_init_num(&first TSRMLS_CC);
-	bc_init_num(&second TSRMLS_CC);
+	bc_init_num(&first);
+	bc_init_num(&second);
 
-	bc_str2num(&first, Z_STRVAL_PP(left), scale TSRMLS_CC);
-	bc_str2num(&second, Z_STRVAL_PP(right), scale TSRMLS_CC);
-	Z_LVAL_P(return_value) = bc_compare(first, second);
-	Z_TYPE_P(return_value) = IS_LONG;
+	bc_str2num(&first, (*left)->value.str.val, scale);
+	bc_str2num(&second, (*right)->value.str.val, scale);
+	return_value->value.lval = bc_compare(first, second);
+	return_value->type = IS_LONG;
 
 	bc_free_num(&first);
 	bc_free_num(&second);
@@ -492,8 +488,7 @@ PHP_FUNCTION(bcscale)
 	}
 	
 	convert_to_long_ex(new_scale);
-	bc_precision = (Z_LVAL_PP(new_scale)<0) ? 0 : Z_LVAL_PP(new_scale);
-
+	bc_precision = (*new_scale)->value.lval;
 	RETURN_TRUE;
 }
 /* }}} */
@@ -506,6 +501,6 @@ PHP_FUNCTION(bcscale)
  * tab-width: 4
  * c-basic-offset: 4
  * End:
- * vim600: sw=4 ts=4 fdm=marker
- * vim<600: sw=4 ts=4
+ * vim600: sw=4 ts=4 tw=78 fdm=marker
+ * vim<600: sw=4 ts=4 tw=78
  */

ext/bcmath/config.m4

@@ -1,17 +1,16 @@
-dnl
 dnl $Id$
-dnl
 
-PHP_ARG_ENABLE(bcmath, whether to enable bc style precision math functions,
+PHP_ARG_ENABLE(bcmath, for bc style precision math functions,
 [  --enable-bcmath         Enable bc style precision math functions.])
 
 if test "$PHP_BCMATH" != "no"; then
   AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
-  PHP_NEW_EXTENSION(bcmath, bcmath.c number.c \
-libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
-libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
-libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
-libbcmath/src/rmzero.c libbcmath/src/str2num.c,
-          $ext_shared,,-I@ext_srcdir@/libbcmath/src)
-  PHP_ADD_BUILD_DIR($ext_builddir/libbcmath/src)
+  PHP_EXTENSION(bcmath, $ext_shared)
+  PHP_FAST_OUTPUT($ext_builddir/libbcmath/Makefile $ext_builddir/libbcmath/src/Makefile)
+  LIB_BUILD($ext_builddir/libbcmath,$ext_shared,yes)
+  LIB_BUILD($ext_builddir/libbcmath/src,$ext_shared,yes)
 fi
+
+dnl ## Local Variables:
+dnl ## tab-width: 4
+dnl ## End:

ext/bcmath/libbcmath/Makefile.in

@@ -0,0 +1,9 @@
+
+LTLIBRARY_NAME          = libbcmath.la
+LTLIBRARY_DEPENDENCIES  = src/libbcmath.la
+LTLIBRARY_LIBADD        = $(LTLIBRARY_DEPENDENCIES)
+LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_LIBADD)
+
+SUBDIRS = src
+
+include $(top_srcdir)/build/dynlib.mk

ext/bcmath/libbcmath/doc/Makefile.am

@@ -0,0 +1,3 @@
+# Documentation makefile
+
+MAINTAINERCLEANFILES= Makefile.in

ext/bcmath/libbcmath/doc/Makefile.in

@@ -0,0 +1,171 @@
+# Makefile.in generated automatically by automake 1.4 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Documentation makefile
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+CC = @CC@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+
+MAINTAINERCLEANFILES = Makefile.in
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../config.h
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps doc/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = doc
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

ext/bcmath/libbcmath/doc/bcmath.1

@@ -0,0 +1 @@
+./" bcmath library documentation

ext/bcmath/libbcmath/src/Makefile.in

@@ -0,0 +1,7 @@
+LTLIBRARY_NAME          = libbcmath.la
+LTLIBRARY_SOURCES       =		add.c div.c init.c neg.c outofmem.c raisemod.c rt.c sub.c \
+								compare.c divmod.c int2num.c num2long.c output.c recmul.c \
+								sqrt.c zero.c debug.c doaddsub.c nearzero.c num2str.c raise.c \
+								rmzero.c str2num.c 
+
+include $(top_srcdir)/build/dynlib.mk

ext/bcmath/libbcmath/src/bcmath.h

@@ -52,9 +52,6 @@ typedef struct bc_struct
 			   in the case of leading zeros generated. */
     } bc_struct;
 
-#include <php.h>
-#include <ext/bcmath/php_bcmath.h>
-
 
 /* The base used in storing the numbers in n_value above.
    Currently this MUST be 10. */
@@ -84,6 +81,12 @@ typedef struct bc_struct
 #endif
 
 
+/* Global numbers. */
+extern bc_num _zero_;
+extern bc_num _one_;
+extern bc_num _two_;
+
+
 /* Function Prototypes */
 
 /* Define the _PROTOTYPE macro if it is needed. */
@@ -96,7 +99,7 @@ typedef struct bc_struct
 #endif
 #endif
 
-_PROTOTYPE(void bc_init_numbers, (TSRMLS_D));
+_PROTOTYPE(void bc_init_numbers, (void));
 
 _PROTOTYPE(bc_num bc_new_num, (int length, int scale));
 
@@ -104,9 +107,9 @@ _PROTOTYPE(void bc_free_num, (bc_num *num));
 
 _PROTOTYPE(bc_num bc_copy_num, (bc_num num));
 
-_PROTOTYPE(void bc_init_num, (bc_num *num TSRMLS_DC));
+_PROTOTYPE(void bc_init_num, (bc_num *num));
 
-_PROTOTYPE(void bc_str2num, (bc_num *num, char *str, int scale TSRMLS_DC));
+_PROTOTYPE(void bc_str2num, (bc_num *num, char *str, int scale));
 
 _PROTOTYPE(char *bc_num2str, (bc_num num));
 
@@ -116,7 +119,7 @@ _PROTOTYPE(long bc_num2long, (bc_num num));
 
 _PROTOTYPE(int bc_compare, (bc_num n1, bc_num n2));
 
-_PROTOTYPE(char bc_is_zero, (bc_num num TSRMLS_DC));
+_PROTOTYPE(char bc_is_zero, (bc_num num));
 
 _PROTOTYPE(char bc_is_near_zero, (bc_num num, int scale));
 
@@ -126,26 +129,26 @@ _PROTOTYPE(void bc_add, (bc_num n1, bc_num n2, bc_num *result, int scale_min));
 
 _PROTOTYPE(void bc_sub, (bc_num n1, bc_num n2, bc_num *result, int scale_min));
 
-_PROTOTYPE(void bc_multiply, (bc_num n1, bc_num n2, bc_num *prod, int scale TSRMLS_DC));
+_PROTOTYPE(void bc_multiply, (bc_num n1, bc_num n2, bc_num *prod, int scale));
 
-_PROTOTYPE(int bc_divide, (bc_num n1, bc_num n2, bc_num *quot, int scale TSRMLS_DC));
+_PROTOTYPE(int bc_divide, (bc_num n1, bc_num n2, bc_num *quot, int scale));
 
 _PROTOTYPE(int bc_modulo, (bc_num num1, bc_num num2, bc_num *result,
-			   int scale TSRMLS_DC));
+			   int scale));
 
 _PROTOTYPE(int bc_divmod, (bc_num num1, bc_num num2, bc_num *quot,
-			   bc_num *rem, int scale TSRMLS_DC));
+			   bc_num *rem, int scale));
 
 _PROTOTYPE(int bc_raisemod, (bc_num base, bc_num expo, bc_num mod,
-			     bc_num *result, int scale TSRMLS_DC));
+			     bc_num *result, int scale));
 
 _PROTOTYPE(void bc_raise, (bc_num num1, bc_num num2, bc_num *result,
-			   int scale TSRMLS_DC));
+			   int scale));
 
-_PROTOTYPE(int bc_sqrt, (bc_num *num, int scale TSRMLS_DC));
+_PROTOTYPE(int bc_sqrt, (bc_num *num, int scale));
 
 _PROTOTYPE(void bc_out_num, (bc_num num, int o_base, void (* out_char)(int),
-			     int leading_zero TSRMLS_DC));
+			     int leading_zero));
 
 /* Prototypes needed for external utility routines. */
 

ext/bcmath/libbcmath/src/config.h

@@ -1,7 +1,5 @@
 #if PHP_WIN32
 #include "../../../../main/config.w32.h"
-#elif defined(NETWARE)
-#include "config.nw.h"
 #else
 #include "php_config.h"
 #endif

ext/bcmath/libbcmath/src/debug.c

@@ -48,9 +48,10 @@ out_char (int c)
 
 
 void
-pn (bc_num num TSRMLS_DC)
+pn (num)
+     bc_num num;
 {
-  bc_out_num (num, 10, out_char, 0 TSRMLS_CC);
+  bc_out_num (num, 10, out_char, 0);
   out_char ('\n');
 }
 

ext/bcmath/libbcmath/src/div.c

@@ -85,7 +85,9 @@ _one_mult (num, size, digit, result)
    by zero is tried.  The algorithm is found in Knuth Vol 2. p237. */
 
 int
-bc_divide (bc_num n1, bc_num n2, bc_num *quot, int scale TSRMLS_DC)
+bc_divide (n1, n2, quot, scale)
+     bc_num n1, n2, *quot;
+     int scale;
 {
   bc_num qval;
   unsigned char *num1, *num2;
@@ -98,7 +100,7 @@ bc_divide (bc_num n1, bc_num n2, bc_num *quot, int scale TSRMLS_DC)
   unsigned int  norm;
 
   /* Test for divide by zero. */
-  if (bc_is_zero (n2 TSRMLS_CC)) return -1;
+  if (bc_is_zero (n2)) return -1;
 
   /* Test for divide by 1.  If it is we must truncate. */
   if (n2->n_scale == 0)
@@ -259,7 +261,7 @@ bc_divide (bc_num n1, bc_num n2, bc_num *quot, int scale TSRMLS_DC)
 
   /* Clean up and return the number. */
   qval->n_sign = ( n1->n_sign == n2->n_sign ? PLUS : MINUS );
-  if (bc_is_zero (qval TSRMLS_CC)) qval->n_sign = PLUS;
+  if (bc_is_zero (qval)) qval->n_sign = PLUS;
   _bc_rm_leading_zeros (qval);
   bc_free_num (quot);
   *quot = qval;

ext/bcmath/libbcmath/src/divmod.c

@@ -45,24 +45,26 @@
  */
 
 int
-bc_divmod (bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, int scale TSRMLS_DC)
+bc_divmod (num1, num2, quot, rem, scale)
+     bc_num num1, num2, *quot, *rem;
+     int scale;
 {
   bc_num quotient = NULL;
   bc_num temp;
   int rscale;
 
   /* Check for correct numbers. */
-  if (bc_is_zero (num2 TSRMLS_CC)) return -1;
+  if (bc_is_zero (num2)) return -1;
 
   /* Calculate final scale. */
   rscale = MAX (num1->n_scale, num2->n_scale+scale);
-  bc_init_num(&temp TSRMLS_CC);
+  bc_init_num(&temp);
 
   /* Calculate it. */
-  bc_divide (num1, num2, &temp, scale TSRMLS_CC);
+  bc_divide (num1, num2, &temp, scale);
   if (quot)
     quotient = bc_copy_num (temp);
-  bc_multiply (temp, num2, &temp, rscale TSRMLS_CC);
+  bc_multiply (temp, num2, &temp, rscale);
   bc_sub (num1, temp, rem, rscale);
   bc_free_num (&temp);
 
@@ -80,8 +82,10 @@ bc_divmod (bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, int scale TSRMLS
    result in RESULT.   */
 
 int
-bc_modulo (bc_num num1, bc_num num2, bc_num *result, int scale TSRMLS_DC)
+bc_modulo (num1, num2, result, scale)
+     bc_num num1, num2, *result;
+     int scale;
 {
-  return bc_divmod (num1, num2, NULL, result, scale TSRMLS_CC);
+  return bc_divmod (num1, num2, NULL, result, scale);
 }
 

ext/bcmath/libbcmath/src/init.c

@@ -38,9 +38,12 @@
 #include "bcmath.h"
 #include "private.h"
 
-#ifdef SANDER_0
+/* Storage used for special numbers. */
+bc_num _zero_;
+bc_num _one_;
+bc_num _two_;
+
  bc_num _bc_Free_list = NULL;
-#endif
 
 /* new_num allocates a number and sets fields to known values. */
 
@@ -100,20 +103,21 @@ bc_free_num (num)
 /* Intitialize the number package! */
 
 void
-bc_init_numbers (TSRMLS_D)
+bc_init_numbers ()
 {
-  BCG(_zero_) = bc_new_num (1,0);
-  BCG(_one_)  = bc_new_num (1,0);
-  BCG(_one_)->n_value[0] = 1;
-  BCG(_two_)  = bc_new_num (1,0);
-  BCG(_two_)->n_value[0] = 2;
+  _zero_ = bc_new_num (1,0);
+  _one_  = bc_new_num (1,0);
+  _one_->n_value[0] = 1;
+  _two_  = bc_new_num (1,0);
+  _two_->n_value[0] = 2;
 }
 
 
 /* Make a copy of a number!  Just increments the reference count! */
 
 bc_num
-bc_copy_num (bc_num num)
+bc_copy_num (num)
+     bc_num num;
 {
   num->n_refs++;
   return num;
@@ -123,8 +127,9 @@ bc_copy_num (bc_num num)
 /* Initialize a number NUM by making it a copy of zero. */
 
 void
-bc_init_num (bc_num *num TSRMLS_DC)
+bc_init_num (num)
+     bc_num *num;
 {
-  *num = bc_copy_num (BCG(_zero_));
+  *num = bc_copy_num (_zero_);
 }
 

ext/bcmath/libbcmath/src/output.c

@@ -86,11 +86,15 @@ bc_out_long (val, size, space, out_char)
    as the routine to do the actual output of the characters. */
 
 void
+bc_out_num (num, o_base, out_char, leading_zero)
+     bc_num num;
+     int o_base;
 #ifdef __STDC__
-bc_out_num (bc_num num, int o_base, void (*out_char)(int), int leading_zero TSRMLS_DC)
+     void (*out_char)(int);
 #else
-bc_out_num (bc_num num, int o_base, void (*out_char)(), int leading_zero TSRMLS_DC)
+     void (*out_char)();
 #endif
+     int leading_zero;
 {
   char *nptr;
   int  index, fdigit, pre_space;
@@ -101,7 +105,7 @@ bc_out_num (bc_num num, int o_base, void (*out_char)(), int leading_zero TSRMLS_
   if (num->n_sign == MINUS) (*out_char) ('-');
 
   /* Output the number. */
-  if (bc_is_zero (num TSRMLS_CC))
+  if (bc_is_zero (num))
     (*out_char) ('0');
   else
     if (o_base == 10)
@@ -114,7 +118,7 @@ bc_out_num (bc_num num, int o_base, void (*out_char)(), int leading_zero TSRMLS_
 	else
 	  nptr++;
 
-	if (leading_zero && bc_is_zero (num TSRMLS_CC))
+	if (leading_zero && bc_is_zero (num))
 	  (*out_char) ('0');
 
 	/* Now the fraction. */
@@ -128,36 +132,36 @@ bc_out_num (bc_num num, int o_base, void (*out_char)(), int leading_zero TSRMLS_
     else
       {
 	/* special case ... */
-	if (leading_zero && bc_is_zero (num TSRMLS_CC))
+	if (leading_zero && bc_is_zero (num))
 	  (*out_char) ('0');
 
 	/* The number is some other base. */
 	digits = NULL;
-	bc_init_num (&int_part TSRMLS_CC);
-	bc_divide (num, BCG(_one_), &int_part, 0 TSRMLS_CC);
-	bc_init_num (&frac_part TSRMLS_CC);
-	bc_init_num (&cur_dig TSRMLS_CC);
-	bc_init_num (&base TSRMLS_CC);
+	bc_init_num (&int_part);
+	bc_divide (num, _one_, &int_part, 0);
+	bc_init_num (&frac_part);
+	bc_init_num (&cur_dig);
+	bc_init_num (&base);
 	bc_sub (num, int_part, &frac_part, 0);
 	/* Make the INT_PART and FRAC_PART positive. */
 	int_part->n_sign = PLUS;
 	frac_part->n_sign = PLUS;
 	bc_int2num (&base, o_base);
-	bc_init_num (&max_o_digit TSRMLS_CC);
+	bc_init_num (&max_o_digit);
 	bc_int2num (&max_o_digit, o_base-1);
 
 
 	/* Get the digits of the integer part and push them on a stack. */
-	while (!bc_is_zero (int_part TSRMLS_CC))
+	while (!bc_is_zero (int_part))
 	  {
-	    bc_modulo (int_part, base, &cur_dig, 0 TSRMLS_CC);
+	    bc_modulo (int_part, base, &cur_dig, 0);
 		/* PHP Change:  malloc() -> emalloc() */
 	    temp = (stk_rec *) emalloc (sizeof(stk_rec));
 	    if (temp == NULL) bc_out_of_memory();
 	    temp->digit = bc_num2long (cur_dig);
 	    temp->next = digits;
 	    digits = temp;
-	    bc_divide (int_part, base, &int_part, 0 TSRMLS_CC);
+	    bc_divide (int_part, base, &int_part, 0);
 	  }
 
 	/* Print the digits on the stack. */
@@ -181,9 +185,9 @@ bc_out_num (bc_num num, int o_base, void (*out_char)(), int leading_zero TSRMLS_
 	  {
 	    (*out_char) ('.');
 	    pre_space = 0;
-	    t_num = bc_copy_num (BCG(_one_));
+	    t_num = bc_copy_num (_one_);
 	    while (t_num->n_len <= num->n_scale) {
-	      bc_multiply (frac_part, base, &frac_part, num->n_scale TSRMLS_CC);
+	      bc_multiply (frac_part, base, &frac_part, num->n_scale);
 	      fdigit = bc_num2long (frac_part);
 	      bc_int2num (&int_part, fdigit);
 	      bc_sub (frac_part, int_part, &frac_part, 0);
@@ -193,7 +197,7 @@ bc_out_num (bc_num num, int o_base, void (*out_char)(), int leading_zero TSRMLS_
 		bc_out_long (fdigit, max_o_digit->n_len, pre_space, out_char);
 		pre_space = 1;
 	      }
-	      bc_multiply (t_num, base, &t_num, 0 TSRMLS_CC);
+	      bc_multiply (t_num, base, &t_num, 0);
 	    }
 	    bc_free_num (&t_num);
 	  }

ext/bcmath/libbcmath/src/private.h

@@ -32,9 +32,7 @@
 /* "Private" routines to bcmath. */
 
 /* variables */
-#ifdef SANDER_0
-extern bc_num _bc_Free_list;
-#endif
+bc_num _bc_Free_list;
 
 /* routines */
 int _bc_do_compare (bc_num n1, bc_num n2, int use_sign, int ignore_last);

ext/bcmath/libbcmath/src/raise.c

@@ -44,7 +44,9 @@
    only the integer part is used.  */
 
 void
-bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale TSRMLS_DC)
+bc_raise (num1, num2, result, scale)
+     bc_num num1, num2, *result;
+     int scale;
 {
    bc_num temp, power;
    long exponent;
@@ -64,7 +66,7 @@ bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale TSRMLS_DC)
    if (exponent == 0)
      {
        bc_free_num (result);
-       *result = bc_copy_num (BCG(_one_));
+       *result = bc_copy_num (_one_);
        return;
      }
 
@@ -87,7 +89,7 @@ bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale TSRMLS_DC)
    while ((exponent & 1) == 0)
      {
        pwrscale = 2*pwrscale;
-       bc_multiply (power, power, &power, pwrscale TSRMLS_CC);
+       bc_multiply (power, power, &power, pwrscale);
        exponent = exponent >> 1;
      }
    temp = bc_copy_num (power);
@@ -98,10 +100,10 @@ bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale TSRMLS_DC)
    while (exponent > 0)
      {
        pwrscale = 2*pwrscale;
-       bc_multiply (power, power, &power, pwrscale TSRMLS_CC);
+       bc_multiply (power, power, &power, pwrscale);
        if ((exponent & 1) == 1) {
 	 calcscale = pwrscale + calcscale;
-	 bc_multiply (temp, power, &temp, calcscale TSRMLS_CC);
+	 bc_multiply (temp, power, &temp, calcscale);
        }
        exponent = exponent >> 1;
      }
@@ -109,7 +111,7 @@ bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale TSRMLS_DC)
    /* Assign the value. */
    if (neg)
      {
-       bc_divide (BCG(_one_), temp, result, rscale TSRMLS_CC);
+       bc_divide (_one_, temp, result, rscale);
        bc_free_num (&temp);
      }
    else

ext/bcmath/libbcmath/src/raisemod.c

@@ -43,20 +43,22 @@
    only the integer part is used.  */
 
 int
-bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale TSRMLS_DC)
+bc_raisemod (base, expo, mod, result, scale)
+     bc_num base, expo, mod, *result;
+     int scale;
 {
   bc_num power, exponent, parity, temp;
   int rscale;
 
   /* Check for correct numbers. */
-  if (bc_is_zero(mod TSRMLS_CC)) return -1;
+  if (bc_is_zero(mod)) return -1;
   if (bc_is_neg(expo)) return -1;
 
   /* Set initial values.  */
   power = bc_copy_num (base);
   exponent = bc_copy_num (expo);
-  temp = bc_copy_num (BCG(_one_));
-  bc_init_num(&parity TSRMLS_CC);
+  temp = bc_copy_num (_one_);
+  bc_init_num(&parity);
 
   /* Check the base for scale digits. */
   if (base->n_scale != 0)
@@ -66,7 +68,7 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale TSR
   if (exponent->n_scale != 0)
     {
       bc_rt_warn ("non-zero scale in exponent");
-      bc_divide (exponent, BCG(_one_), &exponent, 0 TSRMLS_CC); /*truncate */
+      bc_divide (exponent, _one_, &exponent, 0); /*truncate */
     }
 
   /* Check the modulus for scale digits. */
@@ -75,17 +77,17 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale TSR
 
   /* Do the calculation. */
   rscale = MAX(scale, base->n_scale);
-  while ( !bc_is_zero(exponent TSRMLS_CC) )
+  while ( !bc_is_zero(exponent) )
     {
-      (void) bc_divmod (exponent, BCG(_two_), &exponent, &parity, 0 TSRMLS_CC);
-      if ( !bc_is_zero(parity TSRMLS_CC) )
+      (void) bc_divmod (exponent, _two_, &exponent, &parity, 0);
+      if ( !bc_is_zero(parity) )
 	{
-	  bc_multiply (temp, power, &temp, rscale TSRMLS_CC);
-	  (void) bc_modulo (temp, mod, &temp, scale TSRMLS_CC);
+	  bc_multiply (temp, power, &temp, rscale);
+	  (void) bc_modulo (temp, mod, &temp, scale);
 	}
 
-      bc_multiply (power, power, &power, rscale TSRMLS_CC);
-      (void) bc_modulo (power, mod, &power, scale TSRMLS_CC);
+      bc_multiply (power, power, &power, rscale);
+      (void) bc_modulo (power, mod, &power, scale);
     }
 
   /* Assign the value. */

ext/bcmath/libbcmath/src/recmul.c

@@ -57,17 +57,13 @@ new_sub_num (length, scale, value)
 {
   bc_num temp;
 
-#ifdef SANDER_0
   if (_bc_Free_list != NULL) {
     temp = _bc_Free_list;
     _bc_Free_list = temp->n_next;
   } else {
-#endif
     temp = (bc_num) emalloc (sizeof(bc_struct));
-#ifdef SANDER_0
     if (temp == NULL) bc_out_of_memory ();
   }
-#endif
   temp->n_sign = PLUS;
   temp->n_len = length;
   temp->n_scale = scale;
@@ -180,7 +176,7 @@ _bc_shift_addsub (bc_num accum, bc_num val, int shift, int sub)
 */
 static void
 _bc_rec_mul (bc_num u, int ulen, bc_num v, int vlen, bc_num *prod,
-	     int full_scale TSRMLS_DC)
+	     int full_scale)
 { 
   bc_num u0, u1, v0, v1;
   int u0len, v0len;
@@ -201,14 +197,14 @@ _bc_rec_mul (bc_num u, int ulen, bc_num v, int vlen, bc_num *prod,
 
   /* Split u and v. */
   if (ulen < n) {
-    u1 = bc_copy_num (BCG(_zero_));
+    u1 = bc_copy_num (_zero_);
     u0 = new_sub_num (ulen,0, u->n_value);
   } else {
     u1 = new_sub_num (ulen-n, 0, u->n_value);
     u0 = new_sub_num (n, 0, u->n_value+ulen-n);
   }
   if (vlen < n) {
-    v1 = bc_copy_num (BCG(_zero_));
+    v1 = bc_copy_num (_zero_);
     v0 = new_sub_num (vlen,0, v->n_value);
   } else {
     v1 = new_sub_num (vlen-n, 0, v->n_value);
@@ -221,12 +217,12 @@ _bc_rec_mul (bc_num u, int ulen, bc_num v, int vlen, bc_num *prod,
   _bc_rm_leading_zeros (v0);
   v0len = v0->n_len;
 
-  m1zero = bc_is_zero(u1 TSRMLS_CC) || bc_is_zero(v1 TSRMLS_CC);
+  m1zero = bc_is_zero(u1) || bc_is_zero(v1);
 
   /* Calculate sub results ... */
 
-  bc_init_num(&d1 TSRMLS_CC);
-  bc_init_num(&d2 TSRMLS_CC);
+  bc_init_num(&d1);
+  bc_init_num(&d2);
   bc_sub (u1, u0, &d1, 0);
   d1len = d1->n_len;
   bc_sub (v0, v1, &d2, 0);
@@ -235,19 +231,19 @@ _bc_rec_mul (bc_num u, int ulen, bc_num v, int vlen, bc_num *prod,
 
   /* Do recursive multiplies and shifted adds. */
   if (m1zero)
-    m1 = bc_copy_num (BCG(_zero_));
+    m1 = bc_copy_num (_zero_);
   else
-    _bc_rec_mul (u1, u1->n_len, v1, v1->n_len, &m1, 0 TSRMLS_CC);
+    _bc_rec_mul (u1, u1->n_len, v1, v1->n_len, &m1, 0);
 
-  if (bc_is_zero(d1 TSRMLS_CC) || bc_is_zero(d2 TSRMLS_CC))
-    m2 = bc_copy_num (BCG(_zero_));
+  if (bc_is_zero(d1) || bc_is_zero(d2))
+    m2 = bc_copy_num (_zero_);
   else
-    _bc_rec_mul (d1, d1len, d2, d2len, &m2, 0 TSRMLS_CC);
+    _bc_rec_mul (d1, d1len, d2, d2len, &m2, 0);
 
-  if (bc_is_zero(u0 TSRMLS_CC) || bc_is_zero(v0 TSRMLS_CC))
-    m3 = bc_copy_num (BCG(_zero_));
+  if (bc_is_zero(u0) || bc_is_zero(v0))
+    m3 = bc_copy_num (_zero_);
   else
-    _bc_rec_mul (u0, u0->n_len, v0, v0->n_len, &m3, 0 TSRMLS_CC);
+    _bc_rec_mul (u0, u0->n_len, v0, v0->n_len, &m3, 0);
 
   /* Initialize product */
   prodlen = ulen+vlen+1;
@@ -278,7 +274,9 @@ _bc_rec_mul (bc_num u, int ulen, bc_num v, int vlen, bc_num *prod,
    */
 
 void
-bc_multiply (bc_num n1, bc_num n2, bc_num *prod, int scale TSRMLS_DC)
+bc_multiply (n1, n2, prod, scale)
+     bc_num n1, n2, *prod;
+     int scale;
 {
   bc_num pval; 
   int len1, len2;
@@ -291,7 +289,7 @@ bc_multiply (bc_num n1, bc_num n2, bc_num *prod, int scale TSRMLS_DC)
   prod_scale = MIN(full_scale,MAX(scale,MAX(n1->n_scale,n2->n_scale)));
 
   /* Do the multiply */
-  _bc_rec_mul (n1, len1, n2, len2, &pval, full_scale TSRMLS_CC);
+  _bc_rec_mul (n1, len1, n2, len2, &pval, full_scale);
 
   /* Assign to prod and clean up the number. */
   pval->n_sign = ( n1->n_sign == n2->n_sign ? PLUS : MINUS );
@@ -299,7 +297,7 @@ bc_multiply (bc_num n1, bc_num n2, bc_num *prod, int scale TSRMLS_DC)
   pval->n_len = len2 + len1 + 1 - full_scale;
   pval->n_scale = prod_scale;
   _bc_rm_leading_zeros (pval);
-  if (bc_is_zero (pval TSRMLS_CC))
+  if (bc_is_zero (pval))
     pval->n_sign = PLUS;
   bc_free_num (prod);
   *prod = pval;

ext/bcmath/libbcmath/src/sqrt.c

@@ -42,14 +42,16 @@
    after the decimal place. */
 
 int
-bc_sqrt (bc_num *num, int scale TSRMLS_DC)
+bc_sqrt (num, scale)
+     bc_num *num;
+     int scale;
 {
   int rscale, cmp_res, done;
   int cscale;
   bc_num guess, guess1, point5, diff;
 
   /* Initial checks. */
-  cmp_res = bc_compare (*num, BCG(_zero_));
+  cmp_res = bc_compare (*num, _zero_);
   if (cmp_res < 0)
     return 0;		/* error */
   else
@@ -57,23 +59,23 @@ bc_sqrt (bc_num *num, int scale TSRMLS_DC)
       if (cmp_res == 0)
 	{
 	  bc_free_num (num);
-	  *num = bc_copy_num (BCG(_zero_));
+	  *num = bc_copy_num (_zero_);
 	  return 1;
 	}
     }
-  cmp_res = bc_compare (*num, BCG(_one_));
+  cmp_res = bc_compare (*num, _one_);
   if (cmp_res == 0)
     {
       bc_free_num (num);
-      *num = bc_copy_num (BCG(_one_));
+      *num = bc_copy_num (_one_);
       return 1;
     }
 
   /* Initialize the variables. */
   rscale = MAX (scale, (*num)->n_scale);
-  bc_init_num(&guess TSRMLS_CC);
-  bc_init_num(&guess1 TSRMLS_CC);
-  bc_init_num(&diff TSRMLS_CC);
+  bc_init_num(&guess);
+  bc_init_num(&guess1);
+  bc_init_num(&diff);
   point5 = bc_new_num (1,1);
   point5->n_value[1] = 5;
 
@@ -82,7 +84,7 @@ bc_sqrt (bc_num *num, int scale TSRMLS_DC)
   if (cmp_res < 0)
     {
       /* The number is between 0 and 1.  Guess should start at 1. */
-      guess = bc_copy_num (BCG(_one_));
+      guess = bc_copy_num (_one_);
       cscale = (*num)->n_scale;
     }
   else
@@ -91,9 +93,9 @@ bc_sqrt (bc_num *num, int scale TSRMLS_DC)
       bc_int2num (&guess,10);
 
       bc_int2num (&guess1,(*num)->n_len);
-      bc_multiply (guess1, point5, &guess1, 0 TSRMLS_CC);
+      bc_multiply (guess1, point5, &guess1, 0);
       guess1->n_scale = 0;
-      bc_raise (guess, guess1, &guess, 0 TSRMLS_CC);
+      bc_raise (guess, guess1, &guess, 0);
       bc_free_num (&guess1);
       cscale = 3;
     }
@@ -104,9 +106,9 @@ bc_sqrt (bc_num *num, int scale TSRMLS_DC)
     {
       bc_free_num (&guess1);
       guess1 = bc_copy_num (guess);
-      bc_divide (*num, guess, &guess, cscale TSRMLS_CC);
+      bc_divide (*num, guess, &guess, cscale);
       bc_add (guess, guess1, &guess, 0);
-      bc_multiply (guess, point5, &guess, cscale TSRMLS_CC);
+      bc_multiply (guess, point5, &guess, cscale);
       bc_sub (guess, guess1, &diff, cscale+1);
       if (bc_is_near_zero (diff, cscale))
 	{
@@ -119,7 +121,7 @@ bc_sqrt (bc_num *num, int scale TSRMLS_DC)
 
   /* Assign the number and clean up. */
   bc_free_num (num);
-  bc_divide (guess,BCG(_one_),num,rscale TSRMLS_CC);
+  bc_divide (guess,_one_,num,rscale);
   bc_free_num (&guess);
   bc_free_num (&guess1);
   bc_free_num (&point5);

ext/bcmath/libbcmath/src/str2num.c

@@ -41,7 +41,10 @@
 /* Convert strings to bc numbers.  Base 10 only.*/
 
 void
-bc_str2num (bc_num *num, char *str, int scale TSRMLS_DC)
+bc_str2num (num, str, scale)
+     bc_num *num;
+     char *str;
+     int scale;
 {
   int digits, strscale;
   char *ptr, *nptr;
@@ -62,7 +65,7 @@ bc_str2num (bc_num *num, char *str, int scale TSRMLS_DC)
   while (isdigit((int)*ptr)) ptr++, strscale++;	/* digits */
   if ((*ptr != '\0') || (digits+strscale == 0))
     {
-      *num = bc_copy_num (BCG(_zero_));
+      *num = bc_copy_num (_zero_);
       return;
     }
 

ext/bcmath/libbcmath/src/zero.c

@@ -41,13 +41,14 @@
 /* In some places we need to check if the number NUM is zero. */
 
 char
-bc_is_zero (bc_num num TSRMLS_DC)
+bc_is_zero (num)
+     bc_num num;
 {
   int  count;
   char *nptr;
 
   /* Quick check. */
-  if (num == BCG(_zero_)) return TRUE;
+  if (num == _zero_) return TRUE;
 
   /* Initialize */
   count = num->n_len + num->n_scale;

ext/bcmath/php_bcmath.h

@@ -1,8 +1,8 @@
 /* 
    +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
+   | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
+   | Copyright (c) 1997-2001 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -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: Andi Gutmans <andi@zend.com>                                 |
+   | Authors: Andi Gutmans <andi@zend.com>                                |
    +----------------------------------------------------------------------+
 */
 
@@ -23,32 +23,12 @@
 
 #if WITH_BCMATH
 
-#include "libbcmath/src/bcmath.h"
-
-ZEND_BEGIN_MODULE_GLOBALS(bcmath)
-	bc_num _zero_;
-	bc_num _one_;
-	bc_num _two_;
-ZEND_END_MODULE_GLOBALS(bcmath)
-	
-#if ZTS
-# define BCG(v) TSRMG(bcmath_globals_id, zend_bcmath_globals *, v)
-extern int bcmath_globals_id;
-#else
-# define BCG(v) (bcmath_globals.v)
-extern zend_bcmath_globals bcmath_globals;
-#endif
-
-#define BC
-
 extern zend_module_entry bcmath_module_entry;
 #define phpext_bcmath_ptr &bcmath_module_entry
 
-#if ZTS
 PHP_MINIT_FUNCTION(bcmath);
-#endif
+PHP_MSHUTDOWN_FUNCTION(bcmath);
 PHP_RINIT_FUNCTION(bcmath);
-PHP_RSHUTDOWN_FUNCTION(bcmath);
 PHP_MINFO_FUNCTION(bcmath);
 
 PHP_FUNCTION(bcadd);

ext/bcmath/setup.stub

@@ -0,0 +1,6 @@
+# $Source$
+# $Id$
+
+define_option enable-bcmath 'Enable bc style precision math functions' yesno \
+    yes \
+'    Enables bc style arbitrary precision math functions.'

ext/bcmath/tests/bcadd.phpt

@@ -1,16 +0,0 @@
---TEST--
-bcadd() function
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
---INI--
-bcmath.scale=0
---FILE--
-<?php
-echo bcadd("1", "2"),"\n";
-echo bcadd("-1", "5", 4),"\n";
-echo bcadd("1928372132132819737213", "8728932001983192837219398127471", 2),"\n";
-?>
---EXPECT--
-3
-4.0000
-8728932003911564969352217864684.00

ext/bcmath/tests/bccomp.phpt

@@ -1,18 +0,0 @@
---TEST--
-bccomp() function
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
---INI--
-bcmath.scale=0
---FILE--
-<?php
-echo bccomp("-1", "5", 4),"\n";
-echo bccomp("1928372132132819737213", "8728932001983192837219398127471"),"\n";
-echo bccomp("1.00000000000000000001", "1", 2),"\n";
-echo bccomp("97321", "2321"),"\n";
-?>
---EXPECT--
--1
--1
-0
-1

ext/bcmath/tests/bcdiv.phpt

@@ -1,18 +0,0 @@
---TEST--
-bcdiv() function
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
---INI--
-bcmath.scale=0
---FILE--
-<?php
-echo bcdiv("1", "2"),"\n";
-echo bcdiv("1", "2", 2),"\n";
-echo bcdiv("-1", "5", 4),"\n";
-echo bcdiv("8728932001983192837219398127471", "1928372132132819737213", 2),"\n";
-?>
---EXPECT--
-0
-0.50
--0.2000
-4526580661.75

ext/bcmath/tests/bcmod.phpt

@@ -1,16 +0,0 @@
---TEST--
-bcmod() function
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
---INI--
-bcmath.scale=0
---FILE--
-<?php
-echo bcmod("11", "2"),"\n";
-echo bcmod("-1", "5"),"\n";
-echo bcmod("8728932001983192837219398127471", "1928372132132819737213"),"\n";
-?>
---EXPECT--
-1
--1
-1459434331351930289678

ext/bcmath/tests/bcmul.phpt

@@ -1,18 +0,0 @@
---TEST--
-bcmul() function
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
---INI--
-bcmath.scale=0
---FILE--
-<?php
-echo bcmul("1", "2"),"\n";
-echo bcmul("-3", "5"),"\n";
-echo bcmul("1234567890", "9876543210"),"\n";
-echo bcmul("2.5", "1.5", 2),"\n";
-?>
---EXPECT--
-2
--15
-12193263111263526900
-3.75

ext/bcmath/tests/bcpow.phpt

@@ -1,16 +0,0 @@
---TEST--
-bcpow() function
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
---INI--
-bcmath.scale=0
---FILE--
-<?php
-echo bcpow("1", "2"),"\n";
-echo bcpow("-2", "5", 4),"\n";
-echo bcpow("2", "64"),"\n";
-?>
---EXPECT--
-1
--32
-18446744073709551616

ext/bcmath/tests/bcscale.phpt

@@ -1,21 +0,0 @@
---TEST--
-bcscale() function
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
---INI--
-bcmath.scale=0
---FILE--
-<?php
-echo bcadd("1", "2"),"\n";
-bcscale(2);
-echo bcadd("1", "2"),"\n";
-bcscale(10);
-echo bcadd("1", "2"),"\n";
-bcscale(0);
-echo bcadd("1", "2"),"\n";
-?>
---EXPECT--
-3
-3.00
-3.0000000000
-3

ext/bcmath/tests/bcsqrt.phpt

@@ -1,14 +0,0 @@
---TEST--
-bcsqrt() function
---SKIPIF--
-<?php if(!extension_loaded("bcmath")) print "skip"; ?>
---INI--
-bcmath.scale=0
---FILE--
-<?php
-echo bcsqrt("9"),"\n";
-echo bcsqrt("1928372132132819737213", 5),"\n";
-?>
---EXPECT--
-3
-43913234134.28826