CVS update: php3/functions
| From: | ssb | Date: | Wed, 18 Nov 1998 21:23:13 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2470@lists.php.net to get a copy of this message | ||
Date: Wednesday November 18, 1998 @ 16:23
Author: ssb
Update of /repository/php3/functions
In directory asf:/u2/tmp/cvs-serv9546/functions
Modified Files:
apache.c base64.c basic_functions.c bcmath.c cyr_convert.c
dir.c dl.c dns.c exec.c file.c fsock.c gd.c html.c hw.c imap.c
info.c ldap.c link.c mail.c math.c md5.c microtime.c pack.c
pageinfo.c pdf.c quot_print.c reg.c soundex.c string.c
syslog.c uniqid.c url.c
Log Message:
folding fixes, emacs needs to have the end-fold mark on a separate line
Index: php3/functions/apache.c
diff -c php3/functions/apache.c:1.42 php3/functions/apache.c:1.43
*** php3/functions/apache.c:1.42 Fri Nov 13 19:55:57 1998
--- php3/functions/apache.c Wed Nov 18 16:23:02 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: apache.c,v 1.42 1998/11/14 00:55:57 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: apache.c,v 1.43 1998/11/18 21:23:02 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 97,103 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
void php3_info_apache(void) {
module *modp = NULL;
--- 97,104 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
void php3_info_apache(void) {
module *modp = NULL;
***************
*** 200,206 ****
if (rr) destroy_sub_req (rr);
RETURN_TRUE;
}
! } /* }}} */
/* {{{ proto array getallheaders(void)
Fetch all HTTP request headers */
--- 201,208 ----
if (rr) destroy_sub_req (rr);
RETURN_TRUE;
}
! }
! /* }}} */
/* {{{ proto array getallheaders(void)
Fetch all HTTP request headers */
***************
*** 225,231 ****
RETURN_FALSE;
}
}
! } /* }}} */
/* {{{ proto class apache_lookup_uri(string URI)
Perform a partial request of the given URI to obtain information about it */
--- 227,234 ----
RETURN_FALSE;
}
}
! }
! /* }}} */
/* {{{ proto class apache_lookup_uri(string URI)
Perform a partial request of the given URI to obtain information about it */
***************
*** 296,302 ****
}
destroy_sub_req(rr);
! } /* }}} */
#if 0
This function is most likely a bad idea. Just playing with it for now.
--- 299,306 ----
}
destroy_sub_req(rr);
! }
! /* }}} */
#if 0
This function is most likely a bad idea. Just playing with it for now.
Index: php3/functions/base64.c
diff -c php3/functions/base64.c:1.24 php3/functions/base64.c:1.25
*** php3/functions/base64.c:1.24 Sat Nov 7 10:56:19 1998
--- php3/functions/base64.c Wed Nov 18 16:23:02 1998
***************
*** 26,32 ****
| Author: Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
! /* $Id: base64.c,v 1.24 1998/11/07 15:56:19 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 26,32 ----
| Author: Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
! /* $Id: base64.c,v 1.25 1998/11/18 21:23:02 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 162,168 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto string base64_decode(string str)
--- 162,169 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto string base64_decode(string str)
***************
*** 185,191 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/*
--- 186,193 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/*
Index: php3/functions/basic_functions.c
diff -c php3/functions/basic_functions.c:1.234 php3/functions/basic_functions.c:1.235
*** php3/functions/basic_functions.c:1.234 Tue Nov 17 04:48:12 1998
--- php3/functions/basic_functions.c Wed Nov 18 16:23:03 1998
***************
*** 1716,1722 ****
pval_copy_constructor(&shutdown_function_name);
_php3_hash_next_index_insert(user_shutdown_function_names, &shutdown_function_name,
sizeof(pval), NULL);
! } /* }}} */
/*
* Local variables:
--- 1716,1723 ----
pval_copy_constructor(&shutdown_function_name);
_php3_hash_next_index_insert(user_shutdown_function_names, &shutdown_function_name,
sizeof(pval), NULL);
! }
! /* }}} */
/*
* Local variables:
Index: php3/functions/bcmath.c
diff -c php3/functions/bcmath.c:1.25 php3/functions/bcmath.c:1.26
*** php3/functions/bcmath.c:1.25 Fri Nov 13 19:09:30 1998
--- php3/functions/bcmath.c Wed Nov 18 16:23:04 1998
***************
*** 123,129 ****
free_num(&second);
free_num(&result);
return;
! } /* }}} */
/* {{{ proto string bcsub(string left_operand, string right_operand [, int scale])
Returns the difference between two arbitrary precision numbers (subtration) */
--- 123,130 ----
free_num(&second);
free_num(&result);
return;
! }
! /* }}} */
/* {{{ proto string bcsub(string left_operand, string right_operand [, int scale])
Returns the difference between two arbitrary precision numbers (subtration) */
***************
*** 165,171 ****
free_num(&second);
free_num(&result);
return;
! } /* }}} */
/* {{{ proto string bcmul(string left_operand, string right_operand [, int scale])
Returns the multiplication of two arbitrary precision numbers */
--- 166,173 ----
free_num(&second);
free_num(&result);
return;
! }
! /* }}} */
/* {{{ proto string bcmul(string left_operand, string right_operand [, int scale])
Returns the multiplication of two arbitrary precision numbers */
***************
*** 207,213 ****
free_num(&second);
free_num(&result);
return;
! } /* }}} */
/* {{{ proto string bcdiv(string left_operand, string right_operand [, int scale])
Returns the quotient of two arbitrary precision numbers (division) */
--- 209,216 ----
free_num(&second);
free_num(&result);
return;
! }
! /* }}} */
/* {{{ proto string bcdiv(string left_operand, string right_operand [, int scale])
Returns the quotient of two arbitrary precision numbers (division) */
***************
*** 255,261 ****
free_num(&second);
free_num(&result);
return;
! } /* }}} */
/* {{{ proto string bcmod(string left_operand, string right_operand)
Returns the modulus of the two arbitrary precision operands */
--- 258,265 ----
free_num(&second);
free_num(&result);
return;
! }
! /* }}} */
/* {{{ proto string bcmod(string left_operand, string right_operand)
Returns the modulus of the two arbitrary precision operands */
***************
*** 295,301 ****
free_num(&second);
free_num(&result);
return;
! } /* }}} */
/* {{{ proto string bcpow(string x, string y [, int scale])
Returns the value of an arbitrary precision number raised to the power of another */
--- 299,306 ----
free_num(&second);
free_num(&result);
return;
! }
! /* }}} */
/* {{{ proto string bcpow(string x, string y [, int scale])
Returns the value of an arbitrary precision number raised to the power of another */
***************
*** 337,343 ****
free_num(&second);
free_num(&result);
return;
! } /* }}} */
/* {{{ proto string bcsqrt(string operand [, int scale])
Returns the square root of an arbitray precision number */
--- 342,349 ----
free_num(&second);
free_num(&result);
return;
! }
! /* }}} */
/* {{{ proto string bcsqrt(string operand [, int scale])
Returns the square root of an arbitray precision number */
***************
*** 376,382 ****
}
free_num(&result);
return;
! } /* }}} */
/* {{{ proto string bccomp(string left_operand, string right_operand [, int scale])
Compares two arbitrary precision numbers */
--- 382,389 ----
}
free_num(&result);
return;
! }
! /* }}} */
/* {{{ proto string bccomp(string left_operand, string right_operand [, int scale])
Compares two arbitrary precision numbers */
***************
*** 417,423 ****
free_num(&first);
free_num(&second);
return;
! } /* }}} */
/* {{{ proto string bcscale(int scale)
Sets default scale parameter for all bc math functions */
--- 424,431 ----
free_num(&first);
free_num(&second);
return;
! }
! /* }}} */
/* {{{ proto string bcscale(int scale)
Sets default scale parameter for all bc math functions */
***************
*** 432,438 ****
convert_to_long(new_scale);
GLOBAL(bc_precision) = new_scale->value.lval;
RETURN_TRUE;
! } /* }}} */
#endif
--- 440,447 ----
convert_to_long(new_scale);
GLOBAL(bc_precision) = new_scale->value.lval;
RETURN_TRUE;
! }
! /* }}} */
#endif
Index: php3/functions/cyr_convert.c
diff -c php3/functions/cyr_convert.c:1.3 php3/functions/cyr_convert.c:1.4
*** php3/functions/cyr_convert.c:1.3 Fri Nov 13 07:10:35 1998
--- php3/functions/cyr_convert.c Wed Nov 18 16:23:04 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: cyr_convert.c,v 1.3 1998/11/13 12:10:35 rasmus Exp $ */
#include <stdlib.h>
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: cyr_convert.c,v 1.4 1998/11/18 21:23:04 ssb Exp $ */
#include <stdlib.h>
***************
*** 298,301 ****
_php3_convert_cyr_string(str, fr_cs->value.str.val[0], to_cs->value.str.val[0]);
RETVAL_STRING((char *)str, 1)
! } /* }}} */
--- 298,302 ----
_php3_convert_cyr_string(str, fr_cs->value.str.val[0], to_cs->value.str.val[0]);
RETVAL_STRING((char *)str, 1)
! }
! /* }}} */
Index: php3/functions/dir.c
diff -c php3/functions/dir.c:1.54 php3/functions/dir.c:1.55
*** php3/functions/dir.c:1.54 Sun Nov 8 16:12:39 1998
--- php3/functions/dir.c Wed Nov 18 16:23:04 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: dir.c,v 1.54 1998/11/08 21:12:39 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: dir.c,v 1.55 1998/11/18 21:23:04 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 142,148 ****
RETURN_FALSE;
}
php3_list_delete(id_to_find);
! } /* }}} */
/* {{{ proto int chdir(string directory)
Change the current directory */
--- 142,149 ----
RETURN_FALSE;
}
php3_list_delete(id_to_find);
! }
! /* }}} */
/* {{{ proto int chdir(string directory)
Change the current directory */
***************
*** 163,169 ****
RETURN_FALSE;
}
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void rewinddir([int dir_handle])
Rewind dir_handle back to the start */
--- 164,171 ----
RETURN_FALSE;
}
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void rewinddir([int dir_handle])
Rewind dir_handle back to the start */
***************
*** 198,204 ****
RETURN_FALSE;
}
rewinddir(dirp);
! } /* }}} */
/* {{{ proto string readdir([int dir_handle])
Read directory entry from dir_handle */
--- 200,207 ----
RETURN_FALSE;
}
rewinddir(dirp);
! }
! /* }}} */
/* {{{ proto string readdir([int dir_handle])
Read directory entry from dir_handle */
***************
*** 238,244 ****
RETURN_STRINGL(direntp->d_name, strlen(direntp->d_name), 1);
}
RETURN_FALSE;
! } /* }}} */
/* {{{ proto class dir(string directory)
Directory class with properties, handle and class and methods read, rewind and close */
--- 241,248 ----
RETURN_STRINGL(direntp->d_name, strlen(direntp->d_name), 1);
}
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto class dir(string directory)
Directory class with properties, handle and class and methods read, rewind and close */
***************
*** 271,277 ****
add_method(return_value, "read", php3_readdir);
add_method(return_value, "rewind", php3_rewinddir);
add_method(return_value, "close", php3_closedir);
! } /* }}} */
/*
* Local variables:
--- 275,282 ----
add_method(return_value, "read", php3_readdir);
add_method(return_value, "rewind", php3_rewinddir);
add_method(return_value, "close", php3_closedir);
! }
! /* }}} */
/*
* Local variables:
Index: php3/functions/dl.c
diff -c php3/functions/dl.c:1.98 php3/functions/dl.c:1.99
*** php3/functions/dl.c:1.98 Wed Nov 11 17:14:38 1998
--- php3/functions/dl.c Wed Nov 18 16:23:04 1998
***************
*** 86,92 ****
} else {
php3_dl(file,MODULE_TEMPORARY,return_value);
}
! } /* }}} */
#if HAVE_LIBDL
--- 86,93 ----
} else {
php3_dl(file,MODULE_TEMPORARY,return_value);
}
! }
! /* }}} */
#if HAVE_LIBDL
Index: php3/functions/dns.c
diff -c php3/functions/dns.c:1.50 php3/functions/dns.c:1.51
*** php3/functions/dns.c:1.50 Mon Nov 9 08:41:59 1998
--- php3/functions/dns.c Wed Nov 18 16:23:04 1998
***************
*** 28,34 ****
+----------------------------------------------------------------------+
*/
! /* $Id: dns.c,v 1.50 1998/11/09 13:41:59 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 28,34 ----
+----------------------------------------------------------------------+
*/
! /* $Id: dns.c,v 1.51 1998/11/18 21:23:04 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 82,88 ****
return_value->value.str.val = _php3_gethostbyaddr(arg->value.str.val);
return_value->value.str.len = strlen(return_value->value.str.val);
return_value->type = IS_STRING;
! } /* }}} */
char *_php3_gethostbyaddr(char *ip)
--- 82,89 ----
return_value->value.str.val = _php3_gethostbyaddr(arg->value.str.val);
return_value->value.str.len = strlen(return_value->value.str.val);
return_value->type = IS_STRING;
! }
! /* }}} */
char *_php3_gethostbyaddr(char *ip)
***************
*** 121,127 ****
return_value->value.str.val = _php3_gethostbyname(arg->value.str.val);
return_value->value.str.len = strlen(return_value->value.str.val);
return_value->type = IS_STRING;
! } /* }}} */
/* {{{ proto array gethostbynamel(string hostname)
Return a list of IP addresses that a given hostname resolves to. */
--- 122,129 ----
return_value->value.str.val = _php3_gethostbyname(arg->value.str.val);
return_value->value.str.len = strlen(return_value->value.str.val);
return_value->type = IS_STRING;
! }
! /* }}} */
/* {{{ proto array gethostbynamel(string hostname)
Return a list of IP addresses that a given hostname resolves to. */
***************
*** 156,162 ****
}
return;
! } /* }}} */
char *_php3_gethostbyname(char *name)
{
--- 158,165 ----
}
return;
! }
! /* }}} */
char *_php3_gethostbyname(char *name)
{
***************
*** 222,228 ****
RETURN_FALSE;
}
RETURN_TRUE;
! } /* }}} */
#ifndef HFIXEDSZ
#define HFIXEDSZ 12 /* fixed data in header <arpa/nameser.h> */
--- 225,232 ----
RETURN_FALSE;
}
RETURN_TRUE;
! }
! /* }}} */
#ifndef HFIXEDSZ
#define HFIXEDSZ 12 /* fixed data in header <arpa/nameser.h> */
***************
*** 328,334 ****
}
}
RETURN_TRUE;
! } /* }}} */
#endif
/*
--- 332,339 ----
}
}
RETURN_TRUE;
! }
! /* }}} */
#endif
/*
Index: php3/functions/exec.c
diff -c php3/functions/exec.c:1.79 php3/functions/exec.c:1.80
*** php3/functions/exec.c:1.79 Fri Nov 6 17:53:29 1998
--- php3/functions/exec.c Wed Nov 18 16:23:05 1998
***************
*** 26,32 ****
| Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
! /* $Id: exec.c,v 1.79 1998/11/06 22:53:29 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
--- 26,32 ----
| Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
! /* $Id: exec.c,v 1.80 1998/11/18 21:23:05 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
***************
*** 226,232 ****
arg3->value.lval=ret;
break;
}
! } /* }}} */
/* {{{ proto int system(string command [, int return_value])
Execute an external program and display output */
--- 226,233 ----
arg3->value.lval=ret;
break;
}
! }
! /* }}} */
/* {{{ proto int system(string command [, int return_value])
Execute an external program and display output */
***************
*** 252,258 ****
arg2->value.lval=ret;
break;
}
! } /* }}} */
/* {{{ proto int passthru(string command [, int return_value])
Execute an external program and display raw output */
--- 253,260 ----
arg2->value.lval=ret;
break;
}
! }
! /* }}} */
/* {{{ proto int passthru(string command [, int return_value])
Execute an external program and display raw output */
***************
*** 278,284 ****
arg2->value.lval=ret;
break;
}
! } /* }}} */
static int php3_ind(char *s, char c)
{
--- 280,287 ----
arg2->value.lval=ret;
break;
}
! }
! /* }}} */
static int php3_ind(char *s, char c)
{
***************
*** 333,339 ****
RETVAL_STRING(cmd,1);
efree(cmd);
! } /* }}} */
/*
* Local variables:
* tab-width: 4
--- 336,343 ----
RETVAL_STRING(cmd,1);
efree(cmd);
! }
! /* }}} */
/*
* Local variables:
* tab-width: 4
Index: php3/functions/file.c
diff -c php3/functions/file.c:1.184 php3/functions/file.c:1.185
*** php3/functions/file.c:1.184 Wed Nov 11 18:19:03 1998
--- php3/functions/file.c Wed Nov 18 16:23:05 1998
***************
*** 26,32 ****
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
! /* $Id: file.c,v 1.184 1998/11/11 23:19:03 cschneid Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 26,32 ----
| Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
! /* $Id: file.c,v 1.185 1998/11/18 21:23:05 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 344,350 ****
} else {
fclose(fp);
}
! } /* }}} */
/* {{{ proto array file(string filename)
Read entire file into an array */
--- 344,351 ----
} else {
fclose(fp);
}
! }
! /* }}} */
/* {{{ proto array file(string filename)
Read entire file into an array */
***************
*** 412,418 ****
} else {
fclose(fp);
}
! } /* }}} */
static void __pclose(FILE *pipe)
--- 413,420 ----
} else {
fclose(fp);
}
! }
! /* }}} */
static void __pclose(FILE *pipe)
***************
*** 470,476 ****
t = tempnam(d,p);
efree(d);
RETURN_STRING(t,1);
! } /* }}} */
/* {{{ proto int fopen(string filename, string mode [, int use_include_path])
Open a file or a URL and return a file pointer */
--- 472,479 ----
t = tempnam(d,p);
efree(d);
RETURN_STRING(t,1);
! }
! /* }}} */
/* {{{ proto int fopen(string filename, string mode [, int use_include_path])
Open a file or a URL and return a file pointer */
***************
*** 528,534 ****
}
efree(p);
RETURN_LONG(id);
! } /* }}} */
/* {{{ proto int fclose(int fp)
Close an open file pointer */
--- 531,538 ----
}
efree(p);
RETURN_LONG(id);
! }
! /* }}} */
/* {{{ proto int fclose(int fp)
Close an open file pointer */
***************
*** 550,556 ****
}
php3_list_delete(id);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int popen(string command, string mode)
Execute a command and open either a read or a write pipe to it */
--- 554,561 ----
}
php3_list_delete(id);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int popen(string command, string mode)
Execute a command and open either a read or a write pipe to it */
***************
*** 600,606 ****
id = php3_list_insert(fp,GLOBAL(le_pp));
efree(p);
RETURN_LONG(id);
! } /* }}} */
/* {{{ proto int pclose(int fp)
Close a file pointer opened by popen() */
--- 605,612 ----
id = php3_list_insert(fp,GLOBAL(le_pp));
efree(p);
RETURN_LONG(id);
! }
! /* }}} */
/* {{{ proto int pclose(int fp)
Close a file pointer opened by popen() */
***************
*** 623,629 ****
}
php3_list_delete(id);
RETURN_LONG(GLOBAL(pclose_ret));
! } /* }}} */
/* {{{ proto int feof(int fp)
Test for end-of-file on a file pointer */
--- 629,636 ----
}
php3_list_delete(id);
RETURN_LONG(GLOBAL(pclose_ret));
! }
! /* }}} */
/* {{{ proto int feof(int fp)
Test for end-of-file on a file pointer */
***************
*** 657,663 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto int set_socket_blocking(int socket descriptor, int mode)
Set blocking/non-blocking mode on a socket */
--- 664,671 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto int set_socket_blocking(int socket descriptor, int mode)
Set blocking/non-blocking mode on a socket */
***************
*** 718,724 ****
fcntl(socketd,F_SETFL,flags);
/* FIXME: Shouldnt we return true on this function? */
#endif
! } /* }}} */
#if (0 && HAVE_SYS_TIME_H && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO)
&& defined(SO_RCVTIMEO))
--- 726,733 ----
fcntl(socketd,F_SETFL,flags);
/* FIXME: Shouldnt we return true on this function? */
#endif
! }
! /* }}} */
#if (0 && HAVE_SYS_TIME_H && HAVE_SETSOCKOPT && defined(SO_SNDTIMEO)
&& defined(SO_RCVTIMEO))
***************
*** 794,800 ****
return_value->type = IS_STRING;
}
return;
! } /* }}} */
/* {{{ proto string fgetc(int fp)
Get a character from file pointer */
--- 803,810 ----
return_value->type = IS_STRING;
}
return;
! }
! /* }}} */
/* {{{ proto string fgetc(int fp)
Get a character from file pointer */
***************
*** 834,840 ****
return_value->type = IS_STRING;
}
return;
! } /* }}} */
/* Strip any HTML tags while reading */
/* {{{ proto string fgetss(int fp, int length)
--- 844,851 ----
return_value->type = IS_STRING;
}
return;
! }
! /* }}} */
/* Strip any HTML tags while reading */
/* {{{ proto string fgetss(int fp, int length)
***************
*** 958,964 ****
efree(buf);
RETVAL_STRING(rbuf,1);
efree(rbuf);
! } /* }}} */
/* {{{ proto int fwrite(int fp, string str [, int length])
Binary-safe file write */
--- 969,976 ----
efree(buf);
RETVAL_STRING(rbuf,1);
efree(rbuf);
! }
! /* }}} */
/* {{{ proto int fwrite(int fp, string str [, int length])
Binary-safe file write */
***************
*** 1018,1024 ****
ret = fwrite(arg2->value.str.val,1,num_bytes,fp);
}
RETURN_LONG(ret);
! } /* }}} */
/* {{{ proto int rewind(int fp)
Rewind the position of a file pointer */
--- 1030,1037 ----
ret = fwrite(arg2->value.str.val,1,num_bytes,fp);
}
RETURN_LONG(ret);
! }
! /* }}} */
/* {{{ proto int rewind(int fp)
Rewind the position of a file pointer */
***************
*** 1040,1046 ****
}
rewind(fp);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int ftell(int fp)
Get file pointer's read/write position */
--- 1053,1060 ----
}
rewind(fp);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int ftell(int fp)
Get file pointer's read/write position */
***************
*** 1063,1069 ****
}
pos = ftell(fp);
RETURN_LONG(pos);
! } /* }}} */
/* {{{ proto int fseek(int fp, int offset)
Seek on a file pointer */
--- 1077,1084 ----
}
pos = ftell(fp);
RETURN_LONG(pos);
! }
! /* }}} */
/* {{{ proto int fseek(int fp, int offset)
Seek on a file pointer */
***************
*** 1098,1104 ****
ret = fseek(fp,pos,SEEK_SET);
#endif
RETURN_LONG(ret);
! } /* }}} */
/* {{{ proto int mkdir(string pathname, int mode)
Create a directory */
--- 1113,1120 ----
ret = fseek(fp,pos,SEEK_SET);
#endif
RETURN_LONG(ret);
! }
! /* }}} */
/* {{{ proto int mkdir(string pathname, int mode)
Create a directory */
***************
*** 1122,1128 ****
RETURN_FALSE;
}
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int rmdir(string dirname)
Remove a directory */
--- 1138,1145 ----
RETURN_FALSE;
}
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int rmdir(string dirname)
Remove a directory */
***************
*** 1144,1150 ****
RETURN_FALSE;
}
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int readfile(string filename [, int use_include_path])
Output a file or a URL */
--- 1161,1168 ----
RETURN_FALSE;
}
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int readfile(string filename [, int use_include_path])
Output a file or a URL */
***************
*** 1206,1212 ****
fclose(fp);
}
RETURN_LONG(size);
! } /* }}} */
/* {{{ proto int umask([int mask])
Return or change the umask */
--- 1224,1231 ----
fclose(fp);
}
RETURN_LONG(size);
! }
! /* }}} */
/* {{{ proto int umask([int mask])
Return or change the umask */
***************
*** 1229,1235 ****
umask(arg1->value.lval);
}
RETURN_LONG(oldumask);
! } /* }}} */
/*
* Read to EOF on a file descriptor and write the output to stdout.
--- 1248,1255 ----
umask(arg1->value.lval);
}
RETURN_LONG(oldumask);
! }
! /* }}} */
/*
* Read to EOF on a file descriptor and write the output to stdout.
***************
*** 1280,1286 ****
*/
php3_list_delete(id);
RETURN_LONG(size);
! } /* }}} */
/* {{{ proto int rename(string old_name, string new_name)
Rename a file */
--- 1300,1307 ----
*/
php3_list_delete(id);
RETURN_LONG(size);
! }
! /* }}} */
/* {{{ proto int rename(string old_name, string new_name)
Rename a file */
***************
*** 1312,1318 ****
}
RETVAL_TRUE;
! } /* }}} */
/* {{{ proto int copy(string source_file, string destination_file)
Copy a file */
--- 1333,1340 ----
}
RETVAL_TRUE;
! }
! /* }}} */
/* {{{ proto int copy(string source_file, string destination_file)
Copy a file */
***************
*** 1365,1371 ****
close(fd_t);
RETVAL_TRUE;
! } /* }}} */
/* {{{ proto int fread(int fp, int length)
Binary-safe file read */
--- 1387,1394 ----
close(fd_t);
RETVAL_TRUE;
! }
! /* }}} */
/* {{{ proto int fread(int fp, int length)
Binary-safe file read */
***************
*** 1409,1415 ****
return_value->value.str.val =
_php3_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1);
}
return_value->type = IS_STRING;
! } /* }}} */
/*
--- 1432,1439 ----
return_value->value.str.val =
_php3_addslashes(return_value->value.str.val,return_value->value.str.len,&return_value->value.str.len,1);
}
return_value->type = IS_STRING;
! }
! /* }}} */
/*
Index: php3/functions/fsock.c
diff -c php3/functions/fsock.c:1.75 php3/functions/fsock.c:1.76
*** php3/functions/fsock.c:1.75 Fri Nov 13 05:45:10 1998
--- php3/functions/fsock.c Wed Nov 18 16:23:06 1998
***************
*** 27,33 ****
| Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
! /* $Id: fsock.c,v 1.75 1998/11/13 10:45:10 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
| Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
! /* $Id: fsock.c,v 1.76 1998/11/18 21:23:06 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 208,214 ****
*sock=socketd;
id = php3_list_insert(sock,GLOBAL(wsa_fp));
RETURN_LONG(id);
! } /* }}} */
int _php3_sock_fgets(char *buf, int maxlen, int socket)
--- 208,215 ----
*sock=socketd;
id = php3_list_insert(sock,GLOBAL(wsa_fp));
RETURN_LONG(id);
! }
! /* }}} */
int _php3_sock_fgets(char *buf, int maxlen, int socket)
Index: php3/functions/gd.c
diff -c php3/functions/gd.c:1.100 php3/functions/gd.c:1.101
*** php3/functions/gd.c:1.100 Fri Nov 13 13:43:26 1998
--- php3/functions/gd.c Wed Nov 18 16:23:06 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: gd.c,v 1.100 1998/11/13 18:43:26 ssb Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: gd.c,v 1.101 1998/11/18 21:23:06 ssb Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
***************
*** 356,362 ****
ind = 5 + php3_list_insert(font, GD_GLOBAL(le_gd_font));
RETURN_LONG(ind);
! } /* }}} */
/* {{{ proto int imagecreate(int x_size, int y_size)
Create a new image */
--- 356,363 ----
ind = 5 + php3_list_insert(font, GD_GLOBAL(le_gd_font));
RETURN_LONG(ind);
! }
! /* }}} */
/* {{{ proto int imagecreate(int x_size, int y_size)
Create a new image */
***************
*** 377,383 ****
ind = php3_list_insert(im, GD_GLOBAL(le_gd));
RETURN_LONG(ind);
! } /* }}} */
/* {{{ proto int imagecreatefromgif(string filename)
Create a new image from file or URL */
--- 378,385 ----
ind = php3_list_insert(im, GD_GLOBAL(le_gd));
RETURN_LONG(ind);
! }
! /* }}} */
/* {{{ proto int imagecreatefromgif(string filename)
Create a new image from file or URL */
***************
*** 418,424 ****
ind = php3_list_insert(im, GD_GLOBAL(le_gd));
RETURN_LONG(ind);
! } /* }}} */
/* {{{ proto int imagedestroy(int im)
Destroy an image */
--- 420,427 ----
ind = php3_list_insert(im, GD_GLOBAL(le_gd));
RETURN_LONG(ind);
! }
! /* }}} */
/* {{{ proto int imagedestroy(int im)
Destroy an image */
***************
*** 434,440 ****
php3_list_delete(imgind->value.lval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int imagecolorallocate(int im, int red, int green, int blue)
Allocate a color for an image */
--- 437,444 ----
php3_list_delete(imgind->value.lval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int imagecolorallocate(int im, int red, int green, int blue)
Allocate a color for an image */
***************
*** 468,474 ****
}
col = gdImageColorAllocate(im, r, g, b);
RETURN_LONG(col);
! } /* }}} */
/* im, x, y */
/* {{{ proto int imagecolorat(int im, int x, int y)
--- 472,479 ----
}
col = gdImageColorAllocate(im, r, g, b);
RETURN_LONG(col);
! }
! /* }}} */
/* im, x, y */
/* {{{ proto int imagecolorat(int im, int x, int y)
***************
*** 504,510 ****
else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto int imagecolorclosest(int im, int red, int green, int blue)
Get the index of the closest color to the specified color */
--- 509,516 ----
else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto int imagecolorclosest(int im, int red, int green, int blue)
Get the index of the closest color to the specified color */
***************
*** 538,544 ****
}
col = gdImageColorClosest(im, r, g, b);
RETURN_LONG(col);
! } /* }}} */
/* {{{ proto int imagecolordeallocate(int im, int index)
De-allocate a color for an image */
--- 544,551 ----
}
col = gdImageColorClosest(im, r, g, b);
RETURN_LONG(col);
! }
! /* }}} */
/* {{{ proto int imagecolordeallocate(int im, int index)
De-allocate a color for an image */
***************
*** 571,577 ****
php3_error(E_WARNING, "Color index out of range");
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto int imagecolorresolve(int im, int red, int green, int blue)
Get the index of the specified color or its closest possible alternative */
--- 578,585 ----
php3_error(E_WARNING, "Color index out of range");
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto int imagecolorresolve(int im, int red, int green, int blue)
Get the index of the specified color or its closest possible alternative */
***************
*** 605,611 ****
}
col = gdImageColorResolve(im, r, g, b);
RETURN_LONG(col);
! } /* }}} */
/* {{{ proto int imagecolorexact(int im, int red, int green, int blue)
Get the index of the specified color */
--- 613,620 ----
}
col = gdImageColorResolve(im, r, g, b);
RETURN_LONG(col);
! }
! /* }}} */
/* {{{ proto int imagecolorexact(int im, int red, int green, int blue)
Get the index of the specified color */
***************
*** 639,645 ****
}
col = gdImageColorExact(im, r, g, b);
RETURN_LONG(col);
! } /* }}} */
/* {{{ proto int imagecolorset(int im, int col, int red, int green, int blue)
Set the color for the specified palette index */
--- 648,655 ----
}
col = gdImageColorExact(im, r, g, b);
RETURN_LONG(col);
! }
! /* }}} */
/* {{{ proto int imagecolorset(int im, int col, int red, int green, int blue)
Set the color for the specified palette index */
***************
*** 680,686 ****
else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto array imagecolorsforindex(int im, int col)
Get the colors for an index */
--- 690,697 ----
else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto array imagecolorsforindex(int im, int col)
Get the colors for an index */
***************
*** 717,723 ****
php3_error(E_WARNING, "Color index out of range");
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto int imagegif(int im, string filename)
Output image to browser or file */
--- 728,735 ----
php3_error(E_WARNING, "Color index out of range");
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto int imagegif(int im, string filename)
Output image to browser or file */
***************
*** 793,799 ****
}
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int imagesetpixel(int im, int x, int y, int col)
Set a single pixel */
--- 805,812 ----
}
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int imagesetpixel(int im, int x, int y, int col)
Set a single pixel */
***************
*** 828,834 ****
gdImageSetPixel(im,x,y,col);
RETURN_TRUE;
! } /* }}} */
/* im, x1, y1, x2, y2, col */
/* {{{ proto int imageline(int im, int x1, int y1, int x2, int y2, int col)
--- 841,848 ----
gdImageSetPixel(im,x,y,col);
RETURN_TRUE;
! }
! /* }}} */
/* im, x1, y1, x2, y2, col */
/* {{{ proto int imageline(int im, int x1, int y1, int x2, int y2, int col)
***************
*** 867,873 ****
gdImageLine(im,x1,y1,x2,y2,col);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int imagedashedline(int im, int x1, int y1, int x2, int y2, int col)
Draw a dashed line */
--- 881,888 ----
gdImageLine(im,x1,y1,x2,y2,col);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int imagedashedline(int im, int x1, int y1, int x2, int y2, int col)
Draw a dashed line */
***************
*** 904,910 ****
gdImageDashedLine(im,x1,y1,x2,y2,col);
RETURN_TRUE;
! } /* }}} */
/* im, x1, y1, x2, y2, col */
/* {{{ proto int imagerectangle(int im, int x1, int y1, int x2, int y2, int col)
--- 919,926 ----
gdImageDashedLine(im,x1,y1,x2,y2,col);
RETURN_TRUE;
! }
! /* }}} */
/* im, x1, y1, x2, y2, col */
/* {{{ proto int imagerectangle(int im, int x1, int y1, int x2, int y2, int col)
***************
*** 943,949 ****
gdImageRectangle(im,x1,y1,x2,y2,col);
RETURN_TRUE;
! } /* }}} */
/* im, x1, y1, x2, y2, col */
/* {{{ proto int imagefilledrectangle(int im, int x1, int y1, int x2, int y2, int col)
--- 959,966 ----
gdImageRectangle(im,x1,y1,x2,y2,col);
RETURN_TRUE;
! }
! /* }}} */
/* im, x1, y1, x2, y2, col */
/* {{{ proto int imagefilledrectangle(int im, int x1, int y1, int x2, int y2, int col)
***************
*** 982,988 ****
gdImageFilledRectangle(im,x1,y1,x2,y2,col);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int imagearc(int im, int cx, int cy, int w, int h, int s, int e, int col)
Draw a partial ellipse */
--- 999,1006 ----
gdImageFilledRectangle(im,x1,y1,x2,y2,col);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int imagearc(int im, int cx, int cy, int w, int h, int s, int e, int col)
Draw a partial ellipse */
***************
*** 1031,1037 ****
gdImageArc(im,cx,cy,w,h,st,e,col);
RETURN_TRUE;
! } /* }}} */
/* im, x, y, border, col */
/* {{{ proto int imagefilltoborder(int im, int x, int y, int border, int col)
--- 1049,1056 ----
gdImageArc(im,cx,cy,w,h,st,e,col);
RETURN_TRUE;
! }
! /* }}} */
/* im, x, y, border, col */
/* {{{ proto int imagefilltoborder(int im, int x, int y, int border, int col)
***************
*** 1068,1074 ****
gdImageFillToBorder(im,x,y,border,col);
RETURN_TRUE;
! } /* }}} */
/* im, x, y, col */
/* {{{ proto int imagefill(int im, int x, int y, int col)
--- 1087,1094 ----
gdImageFillToBorder(im,x,y,border,col);
RETURN_TRUE;
! }
! /* }}} */
/* im, x, y, col */
/* {{{ proto int imagefill(int im, int x, int y, int col)
***************
*** 1103,1109 ****
gdImageFill(im,x,y,col);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int imagecolorstotal(int im)
Find out the number of colors in an image's palette */
--- 1123,1130 ----
gdImageFill(im,x,y,col);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int imagecolorstotal(int im)
Find out the number of colors in an image's palette */
***************
*** 1125,1131 ****
}
RETURN_LONG(gdImageColorsTotal(im));
! } /* }}} */
/* im, col */
/* {{{ proto int imagecolortransparent(int im [, int col])
--- 1146,1153 ----
}
RETURN_LONG(gdImageColorsTotal(im));
! }
! /* }}} */
/* im, col */
/* {{{ proto int imagecolortransparent(int im [, int col])
***************
*** 1166,1172 ****
}
col = gdImageGetTransparent(im);
RETURN_LONG(col);
! } /* }}} */
/* im, interlace */
/* {{{ proto int imageinterlace(int im [, int interlace])
--- 1188,1195 ----
}
col = gdImageGetTransparent(im);
RETURN_LONG(col);
! }
! /* }}} */
/* im, interlace */
/* {{{ proto int imageinterlace(int im [, int interlace])
***************
*** 1207,1213 ****
}
interlace = gdImageGetInterlaced(im);
RETURN_LONG(interlace);
! } /* }}} */
/* arg = 0 normal polygon
arg = 1 filled polygon */
--- 1230,1237 ----
}
interlace = gdImageGetInterlaced(im);
RETURN_LONG(interlace);
! }
! /* }}} */
/* arg = 0 normal polygon
arg = 1 filled polygon */
***************
*** 1299,1312 ****
void php3_imagepolygon(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! } /* }}} */
/* {{{ proto int imagefilledpolygon(int im, array point, int num_points, int col)
Draw a filled polygon */
void php3_imagefilledpolygon(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! } /* }}} */
static gdFontPtr _php3_find_gd_font(HashTable *list, int size)
--- 1323,1338 ----
void php3_imagepolygon(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! }
! /* }}} */
/* {{{ proto int imagefilledpolygon(int im, array point, int num_points, int col)
Draw a filled polygon */
void php3_imagefilledpolygon(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! }
! /* }}} */
static gdFontPtr _php3_find_gd_font(HashTable *list, int size)
***************
*** 1370,1383 ****
void php3_imagefontwidth(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! } /* }}} */
/* {{{ proto int imagefontheight(int font)
Get font height */
void php3_imagefontheight(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! } /* }}} */
/* workaround for a bug in gd 1.2 */
--- 1396,1411 ----
void php3_imagefontwidth(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! }
! /* }}} */
/* {{{ proto int imagefontheight(int font)
Get font height */
void php3_imagefontheight(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! }
! /* }}} */
/* workaround for a bug in gd 1.2 */
***************
*** 1487,1511 ****
Draw a character */
void php3_imagechar(INTERNAL_FUNCTION_PARAMETERS) {
_php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! } /* }}} */
/* {{{ proto int imagecharup(int im, int font, int x, int y, string c, int col)
Draw a character rotated 90 degrees counter-clockwise */
void php3_imagecharup(INTERNAL_FUNCTION_PARAMETERS) {
_php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! } /* }}} */
/* {{{ proto int imagestring(int im, int font, int x, int y, string str, int col)
Draw a string horizontally */
void php3_imagestring(INTERNAL_FUNCTION_PARAMETERS) {
_php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2);
! } /* }}} */
/* {{{ proto int imagestringup(int im, int font, int x, int y, string str, int col)
Draw a string vertically - rotated 90 degrees counter-clockwise */
void php3_imagestringup(INTERNAL_FUNCTION_PARAMETERS) {
_php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3);
! } /* }}} */
/* {{{ proto int imagecopy(int dst_im, int src_im, int dstX, int dstY, int srcX, int srcY, int
srcW, int srcH)
Copy part of an image */
--- 1515,1543 ----
Draw a character */
void php3_imagechar(INTERNAL_FUNCTION_PARAMETERS) {
_php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! }
! /* }}} */
/* {{{ proto int imagecharup(int im, int font, int x, int y, string c, int col)
Draw a character rotated 90 degrees counter-clockwise */
void php3_imagecharup(INTERNAL_FUNCTION_PARAMETERS) {
_php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! }
! /* }}} */
/* {{{ proto int imagestring(int im, int font, int x, int y, string str, int col)
Draw a string horizontally */
void php3_imagestring(INTERNAL_FUNCTION_PARAMETERS) {
_php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2);
! }
! /* }}} */
/* {{{ proto int imagestringup(int im, int font, int x, int y, string str, int col)
Draw a string vertically - rotated 90 degrees counter-clockwise */
void php3_imagestringup(INTERNAL_FUNCTION_PARAMETERS) {
_php3_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3);
! }
! /* }}} */
/* {{{ proto int imagecopy(int dst_im, int src_im, int dstX, int dstY, int srcX, int srcY, int
srcW, int srcH)
Copy part of an image */
***************
*** 1554,1560 ****
gdImageCopy(im_dst, im_src, dstX, dstY, srcX, srcY, srcW, srcH);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int imagecopyresized(int dst_im, int src_im, int dstX, int dstY, int srcX, int srcY,
int dstW, int dstH, int srcW, int srcH);
Copy and resize part of an image */
--- 1586,1593 ----
gdImageCopy(im_dst, im_src, dstX, dstY, srcX, srcY, srcW, srcH);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int imagecopyresized(int dst_im, int src_im, int dstX, int dstY, int srcX, int srcY,
int dstW, int dstH, int srcW, int srcH);
Copy and resize part of an image */
***************
*** 1608,1614 ****
gdImageCopyResized(im_dst, im_src, dstX, dstY, srcX, srcY, dstW, dstH,
srcW, srcH);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int imagesx(int im)
Get image width */
--- 1641,1648 ----
gdImageCopyResized(im_dst, im_src, dstX, dstY, srcX, srcY, dstW, dstH,
srcW, srcH);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int imagesx(int im)
Get image width */
***************
*** 1630,1636 ****
}
RETURN_LONG(gdImageSX(im));
! } /* }}} */
/* {{{ proto int imagesy(int im)
Get image height */
--- 1664,1671 ----
}
RETURN_LONG(gdImageSX(im));
! }
! /* }}} */
/* {{{ proto int imagesy(int im)
Get image height */
***************
*** 1652,1658 ****
}
RETURN_LONG(gdImageSY(im));
! } /* }}} */
#if HAVE_LIBTTF
--- 1687,1694 ----
}
RETURN_LONG(gdImageSY(im));
! }
! /* }}} */
#if HAVE_LIBTTF
***************
*** 1664,1677 ****
void php3_imagettfbbox(INTERNAL_FUNCTION_PARAMETERS)
{
php3_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_BBOX);
! } /* }}} */
/* {{{ proto array imagettftext(int im, int size, int angle, int x, int y, int col, string
font_file, string text)
Write text to the image using a TrueType font */
void php3_imagettftext(INTERNAL_FUNCTION_PARAMETERS)
{
php3_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_DRAW);
! } /* }}} */
static
void php3_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode)
--- 1700,1715 ----
void php3_imagettfbbox(INTERNAL_FUNCTION_PARAMETERS)
{
php3_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_BBOX);
! }
! /* }}} */
/* {{{ proto array imagettftext(int im, int size, int angle, int x, int y, int col, string
font_file, string text)
Write text to the image using a TrueType font */
void php3_imagettftext(INTERNAL_FUNCTION_PARAMETERS)
{
php3_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_DRAW);
! }
! /* }}} */
static
void php3_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode)
Index: php3/functions/html.c
diff -c php3/functions/html.c:1.23 php3/functions/html.c:1.24
*** php3/functions/html.c:1.23 Wed Nov 11 17:14:38 1998
--- php3/functions/html.c Wed Nov 18 16:23:06 1998
***************
*** 116,129 ****
void php3_htmlspecialchars(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_htmlentities(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
! } /* }}} */
/* {{{ proto string htmlentities(string string)
Convert all applicable characters to HTML entities */
void php3_htmlentities(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_htmlentities(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
! } /* }}} */
/*
* Local variables:
--- 116,131 ----
void php3_htmlspecialchars(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_htmlentities(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
! }
! /* }}} */
/* {{{ proto string htmlentities(string string)
Convert all applicable characters to HTML entities */
void php3_htmlentities(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_htmlentities(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
! }
! /* }}} */
/*
* Local variables:
Index: php3/functions/hw.c
diff -c php3/functions/hw.c:1.16 php3/functions/hw.c:1.17
*** php3/functions/hw.c:1.16 Fri Nov 13 04:57:48 1998
--- php3/functions/hw.c Wed Nov 18 16:23:06 1998
***************
*** 23,29 ****
+----------------------------------------------------------------------+
*/
! /* $Id: hw.c,v 1.16 1998/11/13 09:57:48 steinm Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
#endif
--- 23,29 ----
+----------------------------------------------------------------------+
*/
! /* $Id: hw.c,v 1.17 1998/11/18 21:23:06 ssb Exp $ */
#if COMPILE_DL
#include "dl/phpdl.h"
#endif
***************
*** 679,692 ****
void php3_hw_connect(INTERNAL_FUNCTION_PARAMETERS)
{
php3_hw_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
! } /* }}} */
/* {{{ proto int hw_pconnect(string host, int port [string username [, string password]])
Connect to the Hyperwave server persistent */
void php3_hw_pconnect(INTERNAL_FUNCTION_PARAMETERS)
{
php3_hw_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
! } /* }}} */
/* {{{ proto void hw_close(int link)
Close connection to Hyperwave server */
--- 679,694 ----
void php3_hw_connect(INTERNAL_FUNCTION_PARAMETERS)
{
php3_hw_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
! }
! /* }}} */
/* {{{ proto int hw_pconnect(string host, int port [string username [, string password]])
Connect to the Hyperwave server persistent */
void php3_hw_pconnect(INTERNAL_FUNCTION_PARAMETERS)
{
php3_hw_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
! }
! /* }}} */
/* {{{ proto void hw_close(int link)
Close connection to Hyperwave server */
***************
*** 708,714 ****
}
php3_list_delete(id);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void hw_info(int link)
Outputs info string */
--- 710,717 ----
}
php3_list_delete(id);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void hw_info(int link)
Outputs info string */
***************
*** 741,747 ****
return;
}
RETURN_FALSE;
! } /* }}} */
/* {{{ proto int hw_error(int link)
Returns last error number */
--- 744,751 ----
return;
}
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto int hw_error(int link)
Returns last error number */
***************
*** 763,769 ****
RETURN_FALSE;
}
RETURN_LONG(ptr->lasterror);
! } /* }}} */
/* {{{ proto string hw_errormsg(int link)
Returns last error message */
--- 767,774 ----
RETURN_FALSE;
}
RETURN_LONG(ptr->lasterror);
! }
! /* }}} */
/* {{{ proto string hw_errormsg(int link)
Returns last error message */
***************
*** 851,857 ****
sprintf(errstr, "Unknown error: %d", ptr->lasterror);
}
RETURN_STRING(errstr, 1);
! } /* }}} */
/* {{{ proto hw_root(void)
Returns object id of root collection */
--- 856,863 ----
sprintf(errstr, "Unknown error: %d", ptr->lasterror);
}
RETURN_STRING(errstr, 1);
! }
! /* }}} */
/* {{{ proto hw_root(void)
Returns object id of root collection */
***************
*** 860,866 ****
TLS_VARS;
return_value->value.lval = 0;
return_value->type = IS_LONG;
! } /* }}} */
char *php3_hw_command(INTERNAL_FUNCTION_PARAMETERS, int comm) {
pval *arg1;
--- 866,873 ----
TLS_VARS;
return_value->value.lval = 0;
return_value->type = IS_LONG;
! }
! /* }}} */
char *php3_hw_command(INTERNAL_FUNCTION_PARAMETERS, int comm) {
pval *arg1;
***************
*** 901,907 ****
return_value->value.str.val = object;
return_value->value.str.len = strlen(object);
return_value->type = IS_STRING;
! } /* }}} */
/* {{{ proto array hw_who(int link)
Returns names and info of users loged in */
--- 908,915 ----
return_value->value.str.val = object;
return_value->value.str.len = strlen(object);
return_value->type = IS_STRING;
! }
! /* }}} */
/* {{{ proto array hw_who(int link)
Returns names and info of users loged in */
***************
*** 1011,1017 ****
efree(temp);
efree(object);
! } /* }}} */
void php3_hw_dummy(INTERNAL_FUNCTION_PARAMETERS) {
pval *arg1, *arg2, *arg3;
--- 1019,1026 ----
efree(temp);
efree(object);
! }
! /* }}} */
void php3_hw_dummy(INTERNAL_FUNCTION_PARAMETERS) {
pval *arg1, *arg2, *arg3;
***************
*** 1080,1086 ****
efree(object);
*/
}
! } /* }}} */
/* {{{ proto int hw_insertobject(int link, string objrec, string parms)
Inserts an object */
--- 1089,1096 ----
efree(object);
*/
}
! }
! /* }}} */
/* {{{ proto int hw_insertobject(int link, string objrec, string parms)
Inserts an object */
***************
*** 1114,1120 ****
RETURN_LONG(objid);
}
! } /* }}} */
/* {{{ proto string hw_getandlock(int link, int objid)
Returns object record and locks object */
--- 1124,1131 ----
RETURN_LONG(objid);
}
! }
! /* }}} */
/* {{{ proto string hw_getandlock(int link, int objid)
Returns object record and locks object */
***************
*** 1146,1152 ****
RETURN_STRING(object, 0);
}
! } /* }}} */
/* {{{ proto void hw_unlock(int link, int objid)
Unlocks object */
--- 1157,1164 ----
RETURN_STRING(object, 0);
}
! }
! /* }}} */
/* {{{ proto void hw_unlock(int link, int objid)
Unlocks object */
***************
*** 1174,1180 ****
RETURN_FALSE;
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void hw_deleteobject(int link, int objid)
Deletes object */
--- 1186,1193 ----
RETURN_FALSE;
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void hw_deleteobject(int link, int objid)
Deletes object */
***************
*** 1201,1207 ****
if (0 != (ptr->lasterror = send_deleteobject(ptr->socket, id)))
RETURN_FALSE;
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void hw_changeobject(int link, int objid, array attributes)
Changes attributes of an object */
--- 1214,1221 ----
if (0 != (ptr->lasterror = send_deleteobject(ptr->socket, id)))
RETURN_FALSE;
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void hw_changeobject(int link, int objid, array attributes)
Changes attributes of an object */
***************
*** 1283,1289 ****
RETURN_FALSE;
free(modification);
RETURN_TRUE;
! } /* }}} */
void php3_hw_mvcp(INTERNAL_FUNCTION_PARAMETERS, int mvcp) {
pval *arg1, *arg2, *arg3, *arg4, **objvIDs;
--- 1297,1304 ----
RETURN_FALSE;
free(modification);
RETURN_TRUE;
! }
! /* }}} */
void php3_hw_mvcp(INTERNAL_FUNCTION_PARAMETERS, int mvcp) {
pval *arg1, *arg2, *arg3, *arg4, **objvIDs;
***************
*** 1387,1399 ****
Moves object */
void php3_hw_mv(INTERNAL_FUNCTION_PARAMETERS) {
php3_hw_mvcp(INTERNAL_FUNCTION_PARAM_PASSTHRU, MOVE);
! } /* }}} */
/* {{{ proto void hw_cp(int link, array objrec, int dest)
Copies object */
void php3_hw_cp(INTERNAL_FUNCTION_PARAMETERS) {
php3_hw_mvcp(INTERNAL_FUNCTION_PARAM_PASSTHRU, COPY);
! } /* }}} */
/* {{{ proto hwdoc hw_gettext(int link, int objid[, int rootid])
Returns text document. Links are relative to rootid if given */
--- 1402,1416 ----
Moves object */
void php3_hw_mv(INTERNAL_FUNCTION_PARAMETERS) {
php3_hw_mvcp(INTERNAL_FUNCTION_PARAM_PASSTHRU, MOVE);
! }
! /* }}} */
/* {{{ proto void hw_cp(int link, array objrec, int dest)
Copies object */
void php3_hw_cp(INTERNAL_FUNCTION_PARAMETERS) {
php3_hw_mvcp(INTERNAL_FUNCTION_PARAM_PASSTHRU, COPY);
! }
! /* }}} */
/* {{{ proto hwdoc hw_gettext(int link, int objid[, int rootid])
Returns text document. Links are relative to rootid if given */
***************
*** 1445,1451 ****
return_value->value.lval = php3_list_insert(doc,php3_hw_module.le_document);
return_value->type = IS_LONG;
}
! } /* }}} */
/* {{{ proto void hw_edittext(int link, hwdoc doc)
Modifies text document */
--- 1462,1469 ----
return_value->value.lval = php3_list_insert(doc,php3_hw_module.le_document);
return_value->type = IS_LONG;
}
! }
! /* }}} */
/* {{{ proto void hw_edittext(int link, hwdoc doc)
Modifies text document */
***************
*** 1486,1492 ****
}
}
RETURN_TRUE;
! } /* }}} */
/* {{{ proto hwdoc hw_getcgi(int link, int objid)
Returns the output of a cgi script */
--- 1504,1511 ----
}
}
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto hwdoc hw_getcgi(int link, int objid)
Returns the output of a cgi script */
***************
*** 1547,1553 ****
return_value->value.lval = php3_list_insert(doc,php3_hw_module.le_document);
return_value->type = IS_LONG;
}
! } /* }}} */
/* {{{ proto hwdoc hw_getremote(int link, int objid)
Returns the output of a remote document */
--- 1566,1573 ----
return_value->value.lval = php3_list_insert(doc,php3_hw_module.le_document);
return_value->type = IS_LONG;
}
! }
! /* }}} */
/* {{{ proto hwdoc hw_getremote(int link, int objid)
Returns the output of a remote document */
***************
*** 1587,1593 ****
return_value->value.lval = php3_list_insert(doc,php3_hw_module.le_document);
return_value->type = IS_LONG;
}
! } /* }}} */
/* {{{ proto [array|hwdoc] hw_getremotechildren(int link, int objid)
Returns the remote document if only one or an array of object records */
--- 1607,1614 ----
return_value->value.lval = php3_list_insert(doc,php3_hw_module.le_document);
return_value->type = IS_LONG;
}
! }
! /* }}} */
/* {{{ proto [array|hwdoc] hw_getremotechildren(int link, int objid)
Returns the remote document if only one or an array of object records */
***************
*** 1645,1651 ****
efree(offsets);
efree(remainder);
}
! } /* }}} */
/* {{{ proto void hw_setlinkroot(int link, int rootid)
Set the id to which links are calculated */
--- 1666,1673 ----
efree(offsets);
efree(remainder);
}
! }
! /* }}} */
/* {{{ proto void hw_setlinkroot(int link, int rootid)
Set the id to which links are calculated */
***************
*** 1670,1676 ****
ptr->linkroot = rootid;
RETURN_LONG(rootid);
! } /* }}} */
/* {{{ proto hwdoc hw_pipedocument(int link, int objid)
Returns document */
--- 1692,1699 ----
ptr->linkroot = rootid;
RETURN_LONG(rootid);
! }
! /* }}} */
/* {{{ proto hwdoc hw_pipedocument(int link, int objid)
Returns document */
***************
*** 2728,2734 ****
else
ptr->username = NULL;
}
! } /* }}} */
/* {{{ proto array hw_objrec2array(string objrec)
Returns object array of object record*/
--- 2751,2758 ----
else
ptr->username = NULL;
}
! }
! /* }}} */
/* {{{ proto array hw_objrec2array(string objrec)
Returns object array of object record*/
***************
*** 2741,2747 ****
}
convert_to_string(arg1);
make_return_array_from_objrec(&return_value, arg1->value.str.val);
! } /* }}} */
/* {{{ proto string hw_array2objrec(array objarr)
Returns object record of object array */
--- 2765,2772 ----
}
convert_to_string(arg1);
make_return_array_from_objrec(&return_value, arg1->value.str.val);
! }
! /* }}} */
/* {{{ proto string hw_array2objrec(array objarr)
Returns object record of object array */
***************
*** 2761,2767 ****
RETURN_STRING(retobj, 0);
} else
RETURN_FALSE;
! } /* }}} */
/* {{{ proto array hw_incollections(int link, array objids, array collids, int para)
Returns object ids which are in collections */
--- 2786,2793 ----
RETURN_STRING(retobj, 0);
} else
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto array hw_incollections(int link, array objids, array collids, int para)
Returns object ids which are in collections */
***************
*** 2822,2828 ****
add_index_long(return_value, i, retIDs[i]);
efree(retIDs);
! } /* }}} */
/* {{{ proto void hw_inscoll(int link, int parentid, array objarr)
Inserts collection */
--- 2848,2855 ----
add_index_long(return_value, i, retIDs[i]);
efree(retIDs);
! }
! /* }}} */
/* {{{ proto void hw_inscoll(int link, int parentid, array objarr)
Inserts collection */
***************
*** 2860,2866 ****
if(objrec) free(objrec);
RETURN_LONG(newid);
! } /* }}} */
/* {{{ proto void hw_inscoll(int link, int parentid, array objarr [, string text])
Inserts document */
--- 2887,2894 ----
if(objrec) free(objrec);
RETURN_LONG(newid);
! }
! /* }}} */
/* {{{ proto void hw_inscoll(int link, int parentid, array objarr [, string text])
Inserts document */
***************
*** 2902,2908 ****
}
RETURN_LONG(newid);
! } /* }}} */
/* {{{ proto int hw_getsrcbydestobj(int link, int destid)
Returns object id of source docuent by destination anchor */
--- 2930,2937 ----
}
RETURN_LONG(newid);
! }
! /* }}} */
/* {{{ proto int hw_getsrcbydestobj(int link, int destid)
Returns object id of source docuent by destination anchor */
***************
*** 2936,2942 ****
/* create return value and free all memory */
if( 0 > make_return_objrec(&return_value, childObjRecs, count))
RETURN_FALSE;
! } /* }}} */
/* {{{ proto string hw_getrellink(int link, int rootid, int sourceid, int destid)
Get link form source to dest relative to rootid */
--- 2965,2972 ----
/* create return value and free all memory */
if( 0 > make_return_objrec(&return_value, childObjRecs, count))
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto string hw_getrellink(int link, int rootid, int sourceid, int destid)
Get link form source to dest relative to rootid */
***************
*** 2972,2978 ****
}
RETURN_STRING(anchorstr, 0);
! } /* }}} */
void php3_info_hw()
--- 3002,3009 ----
}
RETURN_STRING(anchorstr, 0);
! }
! /* }}} */
void php3_info_hw()
Index: php3/functions/imap.c
diff -c php3/functions/imap.c:1.47 php3/functions/imap.c:1.48
*** php3/functions/imap.c:1.47 Wed Nov 11 11:29:13 1998
--- php3/functions/imap.c Wed Nov 18 16:23:07 1998
***************
*** 31,37 ****
| Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
! /* $Id: imap.c,v 1.47 1998/11/11 16:29:13 rasmus Exp $ */
#define IMAP41
--- 31,37 ----
| Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
! /* $Id: imap.c,v 1.48 1998/11/18 21:23:07 ssb Exp $ */
#define IMAP41
***************
*** 456,462 ****
RETURN_LONG(ind);
}
return;
! } /* }}} */
/* {{{ proto int imap_reopen(int stream_id, string mailbox [, int options])
Reopen IMAP stream to new mailbox */
--- 456,463 ----
RETURN_LONG(ind);
}
return;
! }
! /* }}} */
/* {{{ proto int imap_reopen(int stream_id, string mailbox [, int options])
Reopen IMAP stream to new mailbox */
***************
*** 500,506 ****
RETURN_FALSE;
}
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int imap_append(int stream_id, string folder, string message [, string flags])
Append a string message to a specified mailbox */
--- 501,508 ----
RETURN_FALSE;
}
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int imap_append(int stream_id, string folder, string message [, string flags])
Append a string message to a specified mailbox */
***************
*** 537,543 ****
{
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto imap_num_msg(int stream_id)
Gives the number of messages in the current mailbox */
--- 539,546 ----
{
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto imap_num_msg(int stream_id)
Gives the number of messages in the current mailbox */
***************
*** 563,569 ****
}
RETURN_LONG(imap_le_struct->imap_stream->nmsgs);
! } /* }}} */
/* {{{ proto int imap_ping(int stream_id)
Check if the IMAP stream is still active */
--- 566,573 ----
}
RETURN_LONG(imap_le_struct->imap_stream->nmsgs);
! }
! /* }}} */
/* {{{ proto int imap_ping(int stream_id)
Check if the IMAP stream is still active */
***************
*** 586,592 ****
RETURN_FALSE;
}
RETURN_LONG( mail_ping( imap_le_struct->imap_stream ) );
! } /* }}} */
/* {{{ proto int imap_num_recent(int stream_id)
Gives the number of recent messages in current mailbox */
--- 590,597 ----
RETURN_FALSE;
}
RETURN_LONG( mail_ping( imap_le_struct->imap_stream ) );
! }
! /* }}} */
/* {{{ proto int imap_num_recent(int stream_id)
Gives the number of recent messages in current mailbox */
***************
*** 606,612 ****
RETURN_FALSE;
}
RETURN_LONG(imap_le_struct->imap_stream->recent);
! } /* }}} */
/* {{{ proto int imap_expunge(int stream_id)
Delete all messages marked for deletion */
--- 611,618 ----
RETURN_FALSE;
}
RETURN_LONG(imap_le_struct->imap_stream->recent);
! }
! /* }}} */
/* {{{ proto int imap_expunge(int stream_id)
Delete all messages marked for deletion */
***************
*** 634,640 ****
mail_expunge (imap_le_struct->imap_stream);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int imap_close(int stream_id [, int options])
Close an IMAP stream */
--- 640,647 ----
mail_expunge (imap_le_struct->imap_stream);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int imap_close(int stream_id [, int options])
Close an IMAP stream */
***************
*** 668,674 ****
}
php3_list_delete(ind);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto array imap_headers(int stream_id)
Returns headers for all messages in a mailbox */
--- 675,682 ----
}
php3_list_delete(ind);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto array imap_headers(int stream_id)
Returns headers for all messages in a mailbox */
***************
*** 728,734 ****
sprintf (t+=strlen(t)," (%ld chars)",cache->rfc822_size);
add_next_index_string(return_value,tmp,1);
}
! } /* }}} */
/* {{{ proto imap_body(int stream_id, int msg_no [, int options])
Read the message body */
--- 736,743 ----
sprintf (t+=strlen(t)," (%ld chars)",cache->rfc822_size);
add_next_index_string(return_value,tmp,1);
}
! }
! /* }}} */
/* {{{ proto imap_body(int stream_id, int msg_no [, int options])
Read the message body */
***************
*** 753,759 ****
RETURN_FALSE;
}
RETVAL_STRING(mail_fetchtext_full (imap_le_struct->imap_stream,msgno->value.lval,NIL,myargc
== 3 ? flags->value.lval : NIL),1);
! } /* }}} */
/* v--- add proto here when this function is done */
/* {{{ string imap_fetchtext_full(int stream_id, int msg_no [, int options])
--- 762,769 ----
RETURN_FALSE;
}
RETVAL_STRING(mail_fetchtext_full (imap_le_struct->imap_stream,msgno->value.lval,NIL,myargc
== 3 ? flags->value.lval : NIL),1);
! }
! /* }}} */
/* v--- add proto here when this function is done */
/* {{{ string imap_fetchtext_full(int stream_id, int msg_no [, int options])
***************
*** 779,785 ****
RETURN_FALSE;
}
RETVAL_STRING(mail_fetchtext_full
(imap_le_struct->imap_stream,msgno->value.lval,NIL,myargcount==3?flags->value.lval:NIL),1);
! } /* }}} */
/* {{{ proto int imap_mail_copy(int stream_id, int msg_no, string mailbox [, int options])
Copy specified message to a mailbox */
--- 789,796 ----
RETURN_FALSE;
}
RETVAL_STRING(mail_fetchtext_full
(imap_le_struct->imap_stream,msgno->value.lval,NIL,myargcount==3?flags->value.lval:NIL),1);
! }
! /* }}} */
/* {{{ proto int imap_mail_copy(int stream_id, int msg_no, string mailbox [, int options])
Copy specified message to a mailbox */
***************
*** 810,816 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto imap_mail_move(int stream_id, int msg_no, string mailbox)
Move specified message to a mailbox */
--- 821,828 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto imap_mail_move(int stream_id, int msg_no, string mailbox)
Move specified message to a mailbox */
***************
*** 841,847 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto int imap_createmailbox(int stream_id, string mailbox)
Create a new mailbox */
--- 853,860 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto int imap_createmailbox(int stream_id, string mailbox)
Create a new mailbox */
***************
*** 870,876 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto int imap_renamemailbox(int stream_id, string old_name, string new_name)
Rename a mailbox */
--- 883,890 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto int imap_renamemailbox(int stream_id, string old_name, string new_name)
Rename a mailbox */
***************
*** 900,906 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto imap_deletemailbox(int stream_id, string mailbox)
Delete a mailbox */
--- 914,921 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto imap_deletemailbox(int stream_id, string mailbox)
Delete a mailbox */
***************
*** 929,935 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto array imap_list(int stream_id, string ref, string pattern)
Read the list of mailboxes */
--- 944,951 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto array imap_list(int stream_id, string ref, string pattern)
Read the list of mailboxes */
***************
*** 968,974 ****
cur=cur->next;
}
mail_free_stringlist (&imap_folders);
! } /* }}} */
/* {{{ proto imap_scan(int stream_id, string ref, string pattern, string content)
Read list of mailboxes containing a certain string */
--- 984,991 ----
cur=cur->next;
}
mail_free_stringlist (&imap_folders);
! }
! /* }}} */
/* {{{ proto imap_scan(int stream_id, string ref, string pattern, string content)
Read list of mailboxes containing a certain string */
***************
*** 1007,1013 ****
cur=cur->next;
}
mail_free_stringlist (&imap_folders);
! } /* }}} */
/* {{{ proto object imap_check(int stream_id)
Get mailbox properties */
--- 1024,1031 ----
cur=cur->next;
}
mail_free_stringlist (&imap_folders);
! }
! /* }}} */
/* {{{ proto object imap_check(int stream_id)
Get mailbox properties */
***************
*** 1046,1052 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto int imap_delete(int stream_id, int msg_no)
Mark a message for deletion */
--- 1064,1071 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto int imap_delete(int stream_id, int msg_no)
Mark a message for deletion */
***************
*** 1073,1079 ****
mail_setflag(imap_le_struct->imap_stream,msgno->value.str.val,"\\DELETED");
RETVAL_TRUE;
! } /* }}} */
/* {{{ proto int imap_undelete(int stream_id, int msg_no)
Remove the delete flag from a message */
--- 1092,1099 ----
mail_setflag(imap_le_struct->imap_stream,msgno->value.str.val,"\\DELETED");
RETVAL_TRUE;
! }
! /* }}} */
/* {{{ proto int imap_undelete(int stream_id, int msg_no)
Remove the delete flag from a message */
***************
*** 1100,1106 ****
mail_clearflag (imap_le_struct->imap_stream,msgno->value.str.val,"\\DELETED");
RETVAL_TRUE;
! } /* }}} */
/* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length
[, string default_host]]])
Read the header of the message */
--- 1120,1127 ----
mail_clearflag (imap_le_struct->imap_stream,msgno->value.str.val,"\\DELETED");
RETVAL_TRUE;
! }
! /* }}} */
/* {{{ proto object imap_header(int stream_id, int msg_no [, int from_length [, int subject_length
[, string default_host]]])
Read the header of the message */
***************
*** 1455,1462 ****
fulladdress[0]=0x00;
mail_fetchsubject(fulladdress,imap_le_struct->imap_stream,msgno->value.lval,subjectlength->value.lval);
add_property_string(return_value,"fetchsubject",fulladdress,1);
}
! } /* }}} */
/* KMLANG */
/* {{{ proto array imap_lsub(int stream_id, string ref, string pattern)
--- 1476,1484 ----
fulladdress[0]=0x00;
mail_fetchsubject(fulladdress,imap_le_struct->imap_stream,msgno->value.lval,subjectlength->value.lval);
add_property_string(return_value,"fetchsubject",fulladdress,1);
+ }
}
! /* }}} */
/* KMLANG */
/* {{{ proto array imap_lsub(int stream_id, string ref, string pattern)
***************
*** 1495,1501 ****
cur=cur->next;
}
mail_free_stringlist (&imap_sfolders);
! } /* }}} */
/* {{{ proto int imap_subscribe(int stream_id, string mailbox)
Subscribe to a mailbox */
--- 1517,1524 ----
cur=cur->next;
}
mail_free_stringlist (&imap_sfolders);
! }
! /* }}} */
/* {{{ proto int imap_subscribe(int stream_id, string mailbox)
Subscribe to a mailbox */
***************
*** 1524,1530 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto int imap_unsubscribe(int stream_id, string mailbox)
Unsubscribe from a mailbox */
--- 1547,1554 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto int imap_unsubscribe(int stream_id, string mailbox)
Unsubscribe from a mailbox */
***************
*** 1552,1558 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
void imap_add_body( pval *arg, BODY *body )
{
--- 1576,1583 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
void imap_add_body( pval *arg, BODY *body )
{
***************
*** 1685,1691 ****
}
imap_add_body( return_value, body );
! } /* }}} */
/* {{{ proto string imap_fetchbody(int stream_id, int msg_no, int section [, int options])
Get a specific body section */
--- 1710,1717 ----
}
imap_add_body( return_value, body );
! }
! /* }}} */
/* {{{ proto string imap_fetchbody(int stream_id, int msg_no, int section [, int options])
Get a specific body section */
***************
*** 1721,1727 ****
RETURN_FALSE;
}
RETVAL_STRINGL( body ,len,1);
! } /* }}} */
/* {{{ proto string imap_base64(string text)
Decode BASE64 encoded text */
--- 1747,1754 ----
RETURN_FALSE;
}
RETVAL_STRINGL( body ,len,1);
! }
! /* }}} */
/* {{{ proto string imap_base64(string text)
Decode BASE64 encoded text */
***************
*** 1739,1745 ****
decode = (char *) rfc822_base64((unsigned char *) text->value.str.val,
text->value.str.len,&newlength);
RETVAL_STRINGL(decode,newlength,1);
! } /* }}} */
/* {{{ proto string imap_qprint(string text)
Convert a quoted-printable string to an 8-bit string */
--- 1766,1773 ----
decode = (char *) rfc822_base64((unsigned char *) text->value.str.val,
text->value.str.len,&newlength);
RETVAL_STRINGL(decode,newlength,1);
! }
! /* }}} */
/* {{{ proto string imap_qprint(string text)
Convert a quoted-printable string to an 8-bit string */
***************
*** 1757,1763 ****
decode = (char *) rfc822_qprint((unsigned char *) text->value.str.val,
text->value.str.len,&newlength);
RETVAL_STRINGL(decode,newlength,1);
! } /* }}} */
/* {{{ proto string imap_8bit(string text)
Convert an 8-bit string to a quoted-printable string */
--- 1785,1792 ----
decode = (char *) rfc822_qprint((unsigned char *) text->value.str.val,
text->value.str.len,&newlength);
RETVAL_STRINGL(decode,newlength,1);
! }
! /* }}} */
/* {{{ proto string imap_8bit(string text)
Convert an 8-bit string to a quoted-printable string */
***************
*** 1775,1781 ****
decode = (char *) rfc822_8bit((unsigned char *) text->value.str.val,
text->value.str.len,&newlength);
RETVAL_STRINGL(decode,newlength,1);
! } /* }}} */
/* {{{ proto string imap_binary(string text)
Convert an 8bit string to a base64 string */
--- 1804,1811 ----
decode = (char *) rfc822_8bit((unsigned char *) text->value.str.val,
text->value.str.len,&newlength);
RETVAL_STRINGL(decode,newlength,1);
! }
! /* }}} */
/* {{{ proto string imap_binary(string text)
Convert an 8bit string to a base64 string */
***************
*** 1788,1794 ****
}
convert_to_string(text);
RETVAL_STRINGL(rfc822_binary(text->value.str.val,text->value.str.len,&len),len,1);
! } /* }}} */
/* {{{ proto array imap_mailboxmsginfo(int stream_id)
Returns info about the current mailbox in an associative array */
--- 1818,1825 ----
}
convert_to_string(text);
RETVAL_STRINGL(rfc822_binary(text->value.str.val,text->value.str.len,&len),len,1);
! }
! /* }}} */
/* {{{ proto array imap_mailboxmsginfo(int stream_id)
Returns info about the current mailbox in an associative array */
***************
*** 1838,1844 ****
add_property_string(return_value,"Driver",imap_le_struct->imap_stream->dtb->name,1);
add_property_string(return_value,"Mailbox",imap_le_struct->imap_stream->mailbox,1);
add_property_long(return_value,"Recent",imap_le_struct->imap_stream->recent);
! } /* }}} */
/* {{{ proto string imap_rfc822_write_address(string mailbox, string host, string personal)
Returns a properly formatted email address given the mailbox, host, and personal info */
--- 1869,1876 ----
add_property_string(return_value,"Driver",imap_le_struct->imap_stream->dtb->name,1);
add_property_string(return_value,"Mailbox",imap_le_struct->imap_stream->mailbox,1);
add_property_long(return_value,"Recent",imap_le_struct->imap_stream->recent);
! }
! /* }}} */
/* {{{ proto string imap_rfc822_write_address(string mailbox, string host, string personal)
Returns a properly formatted email address given the mailbox, host, and personal info */
***************
*** 1866,1872 ****
rfc822_write_address(string,addr);
RETVAL_STRING(string,1);
! } /* }}} */
/* {{{ proto array imap_rfc822_parse_adrlist(string address_string, string default_host)
Parses an address string */
--- 1898,1905 ----
rfc822_write_address(string,addr);
RETVAL_STRING(string,1);
! }
! /* }}} */
/* {{{ proto array imap_rfc822_parse_adrlist(string address_string, string default_host)
Parses an address string */
***************
*** 1897,1903 ****
if(addresstmp->adl) add_property_string(&tovals,"adl",addresstmp->adl,1);
add_next_index_object(return_value, tovals);
} while ((addresstmp = addresstmp->next));
! } /* }}} */
/* {{{ proto int imap_setflag_full(int stream_id, string sequence, string flag [, int options])
Sets flags on messages */
--- 1930,1937 ----
if(addresstmp->adl) add_property_string(&tovals,"adl",addresstmp->adl,1);
add_next_index_object(return_value, tovals);
} while ((addresstmp = addresstmp->next));
! }
! /* }}} */
/* {{{ proto int imap_setflag_full(int stream_id, string sequence, string flag [, int options])
Sets flags on messages */
***************
*** 1927,1933 ****
}
mail_setflag_full(imap_le_struct->imap_stream,sequence->value.str.val,flag->value.str.val,myargc
== 4 ? flags->value.lval : NIL);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto imap_clearflag_full(int stream_id, string sequence, string flag [, int options])
Clears flags on messages */
--- 1961,1968 ----
}
mail_setflag_full(imap_le_struct->imap_stream,sequence->value.str.val,flag->value.str.val,myargc
== 4 ? flags->value.lval : NIL);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto imap_clearflag_full(int stream_id, string sequence, string flag [, int options])
Clears flags on messages */
***************
*** 1954,1960 ****
RETURN_FALSE;
}
mail_clearflag_full(imap_le_struct->imap_stream,sequence->value.str.val,flag->value.str.val,myargc
== 4 ? flags->value.lval : NIL);
! } /* }}} */
/* {{{ proto array imap_sort(int stream_id, int criteria, int reverse [, int options])
Sort an array of message headers */
--- 1989,1996 ----
RETURN_FALSE;
}
mail_clearflag_full(imap_le_struct->imap_stream,sequence->value.str.val,flag->value.str.val,myargc
== 4 ? flags->value.lval : NIL);
! }
! /* }}} */
/* {{{ proto array imap_sort(int stream_id, int criteria, int reverse [, int options])
Sort an array of message headers */
***************
*** 2003,2009 ****
}
fs_give ((void **) &slst);
! } /* }}} */
/* {{{ proto string imap_fetchheader(int stream_id, int msg_no [, int options])
Get the full unfiltered header for a message */
--- 2039,2046 ----
}
fs_give ((void **) &slst);
! }
! /* }}} */
/* {{{ proto string imap_fetchheader(int stream_id, int msg_no [, int options])
Get the full unfiltered header for a message */
***************
*** 2029,2035 ****
}
RETVAL_STRING(mail_fetchheader_full
(imap_le_struct->imap_stream,msgno->value.lval,NIL,NIL,myargc == 3 ? flags->value.lval :
NIL),1);
! } /* }}} */
/* {{{ proto int imap_uid(int stream_id, int msg_no)
Get the unique message id associated with a standard sequential message number */
--- 2066,2073 ----
}
RETVAL_STRING(mail_fetchheader_full
(imap_le_struct->imap_stream,msgno->value.lval,NIL,NIL,myargc == 3 ? flags->value.lval :
NIL),1);
! }
! /* }}} */
/* {{{ proto int imap_uid(int stream_id, int msg_no)
Get the unique message id associated with a standard sequential message number */
***************
*** 2056,2062 ****
}
RETURN_LONG(mail_uid(imap_le_struct->imap_stream, msgno->value.lval));
! } /* }}} */
/* {{{ proto int imap_msgno(int stream_id, int unique_msg_id)
Get the sequence number associated with a UID */
--- 2094,2101 ----
}
RETURN_LONG(mail_uid(imap_le_struct->imap_stream, msgno->value.lval));
! }
! /* }}} */
/* {{{ proto int imap_msgno(int stream_id, int unique_msg_id)
Get the sequence number associated with a UID */
***************
*** 2083,2089 ****
}
RETURN_LONG(mail_msgno(imap_le_struct->imap_stream, msgno->value.lval));
! } /* }}} */
/* {{{ proto object imap_status(int stream_id, string mailbox, int options)
Get status info from a mailbox */
--- 2122,2129 ----
}
RETURN_LONG(mail_msgno(imap_le_struct->imap_stream, msgno->value.lval));
! }
! /* }}} */
/* {{{ proto object imap_status(int stream_id, string mailbox, int options)
Get status info from a mailbox */
***************
*** 2125,2131 ****
{
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto object imap_bodystruct(int stream_id, int msg_no, int section)
Read the structure of a specified body section of a specific message */
--- 2165,2172 ----
{
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto object imap_bodystruct(int stream_id, int msg_no, int section)
Read the structure of a specified body section of a specific message */
***************
*** 2224,2230 ****
add_property_long( return_value, "ifparameters", 0 );
}
add_assoc_object( return_value, "parameters", parametres );
! } /* }}} */
/* {{{ proto array imap_fetch_overview(int stream_id, int msg_no)
Read an overview of the information in the headers of the given message */
--- 2265,2272 ----
add_property_long( return_value, "ifparameters", 0 );
}
add_assoc_object( return_value, "parameters", parametres );
! }
! /* }}} */
/* {{{ proto array imap_fetch_overview(int stream_id, int msg_no)
Read an overview of the information in the headers of the given message */
***************
*** 2277,2283 ****
add_next_index_object(return_value,myoverview);
}
}
! } /* }}} */
/* {{{ proto string imap_mail_compose(array envelope, array body)
Create a MIME message based on given envelope and body sections */
--- 2319,2326 ----
add_next_index_object(return_value,myoverview);
}
}
! }
! /* }}} */
/* {{{ proto string imap_mail_compose(array envelope, array body)
Create a MIME message based on given envelope and body sections */
***************
*** 2491,2497 ****
}
RETURN_STRINGL(mystring,strlen(mystring),1);
! } /* }}} */
--- 2534,2541 ----
}
RETURN_STRINGL(mystring,strlen(mystring),1);
! }
! /* }}} */
Index: php3/functions/info.c
diff -c php3/functions/info.c:1.66 php3/functions/info.c:1.67
*** php3/functions/info.c:1.66 Fri Nov 6 18:40:54 1998
--- php3/functions/info.c Wed Nov 18 16:23:08 1998
***************
*** 392,398 ****
_php3_info();
RETURN_TRUE;
! } /* }}} */
/* {{{ proto string phpversion(void)
Return the current PHP version */
--- 392,399 ----
_php3_info();
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto string phpversion(void)
Return the current PHP version */
***************
*** 401,407 ****
TLS_VARS;
RETURN_STRING(PHP_VERSION,1);
! } /* }}} */
/*
* Local variables:
--- 402,409 ----
TLS_VARS;
RETURN_STRING(PHP_VERSION,1);
! }
! /* }}} */
/*
* Local variables:
Index: php3/functions/ldap.c
diff -c php3/functions/ldap.c:1.62 php3/functions/ldap.c:1.63
*** php3/functions/ldap.c:1.62 Mon Nov 9 11:24:51 1998
--- php3/functions/ldap.c Wed Nov 18 16:23:08 1998
***************
*** 30,36 ****
*/
! /* $Id: ldap.c,v 1.62 1998/11/09 16:24:51 rasmus Exp $ */
#define IS_EXT_MODULE
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
--- 30,36 ----
*/
! /* $Id: ldap.c,v 1.63 1998/11/18 21:23:08 ssb Exp $ */
#define IS_EXT_MODULE
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
***************
*** 305,311 ****
php3_printf("<table>"
"<tr><td>Total links:</td><td>%d/%s</td></tr>\n"
! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.62 1998/11/09
16:24:51 rasmus Exp $</td></tr>\n"
#if HAVE_NSLDAP
"<tr><td>SDK Version:</td><td>%f</td></tr>"
"<tr><td>Highest LDAP Protocol
Supported:</td><td>%f</td></tr>"
--- 305,311 ----
php3_printf("<table>"
"<tr><td>Total links:</td><td>%d/%s</td></tr>\n"
! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.63 1998/11/18
21:23:08 ssb Exp $</td></tr>\n"
#if HAVE_NSLDAP
"<tr><td>SDK Version:</td><td>%f</td></tr>"
"<tr><td>Highest LDAP Protocol
Supported:</td><td>%f</td></tr>"
***************
*** 399,405 ****
RETURN_LONG(php3_list_insert((void*)ldap,LDAP_GLOBAL(le_link)));
}
! } /* }}} */
static LDAP * _get_ldap_link(pval *link, HashTable *list)
--- 399,406 ----
RETURN_LONG(php3_list_insert((void*)ldap,LDAP_GLOBAL(le_link)));
}
! }
! /* }}} */
static LDAP * _get_ldap_link(pval *link, HashTable *list)
***************
*** 537,543 ****
} else {
RETURN_TRUE;
}
! } /* }}} */
/* {{{ proto int ldap_unbind(int link)
Unbind from LDAP directory */
--- 538,545 ----
} else {
RETURN_TRUE;
}
! }
! /* }}} */
/* {{{ proto int ldap_unbind(int link)
Unbind from LDAP directory */
***************
*** 557,563 ****
php3_list_delete(link->value.lval);
RETURN_TRUE;
! } /* }}} */
static void php3_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
--- 559,566 ----
php3_list_delete(link->value.lval);
RETURN_TRUE;
! }
! /* }}} */
static void php3_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
***************
*** 664,677 ****
void php3_ldap_read(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_BASE);
! } /* }}} */
/* {{{ proto int ldap_list(int link, string base_dn, string filter [, string attributes])
Single-level search */
void php3_ldap_list(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_ONELEVEL);
! } /* }}} */
/* {{{ proto int ldap_search(int link, string base_dn, string filter [, string attributes])
--- 667,682 ----
void php3_ldap_read(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_BASE);
! }
! /* }}} */
/* {{{ proto int ldap_list(int link, string base_dn, string filter [, string attributes])
Single-level search */
void php3_ldap_list(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_ONELEVEL);
! }
! /* }}} */
/* {{{ proto int ldap_search(int link, string base_dn, string filter [, string attributes])
***************
*** 679,685 ****
void php3_ldap_search(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_SUBTREE);
! } /* }}} */
/* {{{ proto int ldap_free_result(int result)
Free result memory */
--- 684,691 ----
void php3_ldap_search(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_search(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_SCOPE_SUBTREE);
! }
! /* }}} */
/* {{{ proto int ldap_free_result(int result)
Free result memory */
***************
*** 700,706 ****
RETVAL_TRUE;
}
return;
! } /* }}} */
/* {{{ proto int ldap_count_entries(int link, int result)
Count the number of entries in a search result */
--- 706,713 ----
RETVAL_TRUE;
}
return;
! }
! /* }}} */
/* {{{ proto int ldap_count_entries(int link, int result)
Count the number of entries in a search result */
***************
*** 721,727 ****
if (ldap_result == NULL) RETURN_FALSE;
RETURN_LONG(ldap_count_entries(ldap, ldap_result));
! } /* }}} */
/* {{{ proto int ldap_first_entry(int link, int result)
Return first result id */
--- 728,735 ----
if (ldap_result == NULL) RETURN_FALSE;
RETURN_LONG(ldap_count_entries(ldap, ldap_result));
! }
! /* }}} */
/* {{{ proto int ldap_first_entry(int link, int result)
Return first result id */
***************
*** 748,754 ****
} else {
RETURN_LONG(php3_list_insert(ldap_result_entry, LDAP_GLOBAL(le_result_entry)));
}
! } /* }}} */
/* {{{ proto int ldap_next_entry(int link, int entry)
Get next result entry */
--- 756,763 ----
} else {
RETURN_LONG(php3_list_insert(ldap_result_entry, LDAP_GLOBAL(le_result_entry)));
}
! }
! /* }}} */
/* {{{ proto int ldap_next_entry(int link, int entry)
Get next result entry */
***************
*** 774,780 ****
} else {
RETURN_LONG(php3_list_insert(ldap_result_entry_next, LDAP_GLOBAL(le_result_entry)));
}
! } /* }}} */
/* {{{ proto array ldap_get_entries(int link, int result)
Get all result entries */
--- 783,790 ----
} else {
RETURN_LONG(php3_list_insert(ldap_result_entry_next, LDAP_GLOBAL(le_result_entry)));
}
! }
! /* }}} */
/* {{{ proto array ldap_get_entries(int link, int result)
Get all result entries */
***************
*** 856,862 ****
}
add_assoc_long(return_value, "count", num_entries);
! } /* }}} */
/* {{{ proto string ldap_first_attribute(int link, int result, int ber)
Return first attribute */
--- 866,873 ----
}
add_assoc_long(return_value, "count", num_entries);
! }
! /* }}} */
/* {{{ proto string ldap_first_attribute(int link, int result, int ber)
Return first attribute */
***************
*** 891,897 ****
ldap_memfree(attribute);
#endif
}
! } /* }}} */
/* {{{ proto string ldap_next_attribute(int link, int result, int ber)
Get the next attribute in result */
--- 902,909 ----
ldap_memfree(attribute);
#endif
}
! }
! /* }}} */
/* {{{ proto string ldap_next_attribute(int link, int result, int ber)
Get the next attribute in result */
***************
*** 923,929 ****
ldap_memfree(attribute);
#endif
}
! } /* }}} */
/* {{{ proto array ldap_get_attributes(int link, int result)
Get attributes from a search result entry */
--- 935,942 ----
ldap_memfree(attribute);
#endif
}
! }
! /* }}} */
/* {{{ proto array ldap_get_attributes(int link, int result)
Get attributes from a search result entry */
***************
*** 979,985 ****
}
add_assoc_long(return_value, "count", num_attrib);
! } /* }}} */
/* {{{ proto array ldap_get_values(int link, int result, string attribute)
Get all values from a result entry */
--- 992,999 ----
}
add_assoc_long(return_value, "count", num_attrib);
! }
! /* }}} */
/* {{{ proto array ldap_get_values(int link, int result, string attribute)
Get all values from a result entry */
***************
*** 1029,1035 ****
add_assoc_long(return_value, "count", num_values);
ldap_value_free(ldap_value);
! } /* }}} */
/* {{{ proto string ldap_get_dn(int link, int result)
Get the DN of a result entry */
--- 1043,1050 ----
add_assoc_long(return_value, "count", num_values);
ldap_value_free(ldap_value);
! }
! /* }}} */
/* {{{ proto string ldap_get_dn(int link, int result)
Get the DN of a result entry */
***************
*** 1059,1065 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
/* {{{ proto array ldap_explode_dn(string dn, int with_attrib)
Splits DN into its component parts */
--- 1074,1081 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
/* {{{ proto array ldap_explode_dn(string dn, int with_attrib)
Splits DN into its component parts */
***************
*** 1092,1098 ****
}
ldap_value_free(ldap_value);
! } /* }}} */
/* {{{ proto string ldap_dn2ufn(string dn)
Convert DN to User Friendly Naming format */
--- 1108,1115 ----
}
ldap_value_free(ldap_value);
! }
! /* }}} */
/* {{{ proto string ldap_dn2ufn(string dn)
Convert DN to User Friendly Naming format */
***************
*** 1117,1123 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
static void php3_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
--- 1134,1141 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
static void php3_ldap_do_modify(INTERNAL_FUNCTION_PARAMETERS, int oper)
***************
*** 1217,1223 ****
void php3_ldap_add(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD);
! } /* }}} */
/* {{{ proto int ldap_modify(int link, string dn, array entry)
--- 1235,1242 ----
void php3_ldap_add(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_ADD);
! }
! /* }}} */
/* {{{ proto int ldap_modify(int link, string dn, array entry)
***************
*** 1225,1231 ****
void php3_ldap_modify(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE);
! } /* }}} */
/* {{{ proto int ldap_delete(int link, string dn)
Delete an entry from a directory */
--- 1244,1251 ----
void php3_ldap_modify(INTERNAL_FUNCTION_PARAMETERS)
{
php3_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE);
! }
! /* }}} */
/* {{{ proto int ldap_delete(int link, string dn)
Delete an entry from a directory */
***************
*** 1251,1256 ****
}
RETURN_TRUE;
! } /* }}} */
#endif
--- 1271,1277 ----
}
RETURN_TRUE;
! }
! /* }}} */
#endif
Index: php3/functions/link.c
diff -c php3/functions/link.c:1.33 php3/functions/link.c:1.34
*** php3/functions/link.c:1.33 Wed Nov 11 11:11:11 1998
--- php3/functions/link.c Wed Nov 18 16:23:08 1998
***************
*** 28,34 ****
+----------------------------------------------------------------------+
*/
! /* $Id: link.c,v 1.33 1998/11/11 16:11:11 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 28,34 ----
+----------------------------------------------------------------------+
*/
! /* $Id: link.c,v 1.34 1998/11/18 21:23:08 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 85,91 ****
buff[ret] = '\0';
RETURN_STRING(buff,1);
#endif
! } /* }}} */
/* {{{ proto int linkinfo(string filename)
Returns the st_dev field of the UNIX C stat structure describing the link */
--- 85,92 ----
buff[ret] = '\0';
RETURN_STRING(buff,1);
#endif
! }
! /* }}} */
/* {{{ proto int linkinfo(string filename)
Returns the st_dev field of the UNIX C stat structure describing the link */
***************
*** 108,114 ****
}
RETURN_LONG((long) sb.st_dev);
#endif
! } /* }}} */
/* {{{ proto int symlink(string target, string link)
Create a symbolic link */
--- 109,116 ----
}
RETURN_LONG((long) sb.st_dev);
#endif
! }
! /* }}} */
/* {{{ proto int symlink(string target, string link)
Create a symbolic link */
***************
*** 135,141 ****
}
RETURN_TRUE;
#endif
! } /* }}} */
/* {{{ proto int link(string target, string link)
Create a hard link */
--- 137,144 ----
}
RETURN_TRUE;
#endif
! }
! /* }}} */
/* {{{ proto int link(string target, string link)
Create a hard link */
***************
*** 162,168 ****
}
RETURN_TRUE;
#endif
! } /* }}} */
/* {{{ proto int unlink(string filename)
Delete a file */
--- 165,172 ----
}
RETURN_TRUE;
#endif
! }
! /* }}} */
/* {{{ proto int unlink(string filename)
Delete a file */
***************
*** 189,195 ****
/* Clear stat cache */
php3_clearstatcache(INTERNAL_FUNCTION_PARAM_PASSTHRU);
RETURN_TRUE;
! } /* }}} */
function_entry link_functions[] = {
{"readlink", php3_readlink, NULL},
--- 193,200 ----
/* Clear stat cache */
php3_clearstatcache(INTERNAL_FUNCTION_PARAM_PASSTHRU);
RETURN_TRUE;
! }
! /* }}} */
function_entry link_functions[] = {
{"readlink", php3_readlink, NULL},
Index: php3/functions/mail.c
diff -c php3/functions/mail.c:1.57 php3/functions/mail.c:1.58
*** php3/functions/mail.c:1.57 Fri Nov 6 18:40:55 1998
--- php3/functions/mail.c Wed Nov 18 16:23:09 1998
***************
*** 28,34 ****
+----------------------------------------------------------------------+
*/
! /* $Id: mail.c,v 1.57 1998/11/06 23:40:55 rasmus Exp $ */
#include <stdlib.h>
#include <ctype.h>
--- 28,34 ----
+----------------------------------------------------------------------+
*/
! /* $Id: mail.c,v 1.58 1998/11/18 21:23:09 ssb Exp $ */
#include <stdlib.h>
#include <ctype.h>
***************
*** 119,125 ****
} else {
RETURN_FALSE;
}
! } /* }}} */
int _php3_mail(char *to, char *subject, char *message, char *headers)
{
--- 119,126 ----
} else {
RETURN_FALSE;
}
! }
! /* }}} */
int _php3_mail(char *to, char *subject, char *message, char *headers)
{
Index: php3/functions/math.c
diff -c php3/functions/math.c:1.42 php3/functions/math.c:1.43
*** php3/functions/math.c:1.42 Tue Nov 17 09:27:52 1998
--- php3/functions/math.c Wed Nov 18 16:23:09 1998
***************
*** 66,72 ****
}
RETURN_FALSE;
! } /* }}} */
/* {{{ proto int ceil(double number)
Returns the next highest integer value of the number */
--- 66,73 ----
}
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto int ceil(double number)
Returns the next highest integer value of the number */
***************
*** 90,96 ****
}
RETURN_FALSE;
! } /* }}} */
/* {{{ proto int floor(double number)
Returns the next lowest integer value from the number */
--- 91,98 ----
}
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto int floor(double number)
Returns the next lowest integer value from the number */
***************
*** 114,120 ****
}
RETURN_FALSE;
! } /* }}} */
#ifndef HAVE_RINT
/* emulate rint */
--- 116,123 ----
}
RETURN_FALSE;
! }
! /* }}} */
#ifndef HAVE_RINT
/* emulate rint */
***************
*** 150,156 ****
RETURN_DOUBLE((double)value->value.lval);
}
RETURN_FALSE;
! } /* }}} */
/* {{{ proto double sin(double number)
Returns the sine of the number in radians */
--- 153,160 ----
RETURN_DOUBLE((double)value->value.lval);
}
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto double sin(double number)
Returns the sine of the number in radians */
***************
*** 164,170 ****
convert_to_double(num);
return_value->value.dval = sin(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double cos(double number)
Returns the cosine of the number in radians */
--- 168,175 ----
convert_to_double(num);
return_value->value.dval = sin(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double cos(double number)
Returns the cosine of the number in radians */
***************
*** 178,184 ****
convert_to_double(num);
return_value->value.dval = cos(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double tan(double number)
Returns the tangent of the number in radians */
--- 183,190 ----
convert_to_double(num);
return_value->value.dval = cos(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double tan(double number)
Returns the tangent of the number in radians */
***************
*** 192,198 ****
convert_to_double(num);
return_value->value.dval = tan(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double asin(double number)
Returns the arc sine of the number in radians */
--- 198,205 ----
convert_to_double(num);
return_value->value.dval = tan(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double asin(double number)
Returns the arc sine of the number in radians */
***************
*** 206,212 ****
convert_to_double(num);
return_value->value.dval = asin(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double acos(double number)
Return the arc cosine of the number in radians */
--- 213,220 ----
convert_to_double(num);
return_value->value.dval = asin(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double acos(double number)
Return the arc cosine of the number in radians */
***************
*** 220,226 ****
convert_to_double(num);
return_value->value.dval = acos(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double atan(double number)
Returns the arc tangent of the number in radians */
--- 228,235 ----
convert_to_double(num);
return_value->value.dval = acos(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double atan(double number)
Returns the arc tangent of the number in radians */
***************
*** 234,240 ****
convert_to_double(num);
return_value->value.dval = atan(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double atan2(double y, double x)
Returns the arc tangent of y/x, with the resulting quadrant determined by the signs of y and x
*/
--- 243,250 ----
convert_to_double(num);
return_value->value.dval = atan(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double atan2(double y, double x)
Returns the arc tangent of y/x, with the resulting quadrant determined by the signs of y and x
*/
***************
*** 249,255 ****
convert_to_double(num2);
return_value->value.dval = atan2(num1->value.dval,num2->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double pi(void)
Returns an approximation of pi */
--- 259,266 ----
convert_to_double(num2);
return_value->value.dval = atan2(num1->value.dval,num2->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double pi(void)
Returns an approximation of pi */
***************
*** 257,263 ****
{
return_value->value.dval = M_PI;
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double pow(double base, double exponent)
Returns base raised to the power of expopent */
--- 268,275 ----
{
return_value->value.dval = M_PI;
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double pow(double base, double exponent)
Returns base raised to the power of expopent */
***************
*** 272,278 ****
convert_to_double(num1);
convert_to_double(num2);
RETURN_DOUBLE(pow(num1->value.dval, num2->value.dval));
! } /* }}} */
/* {{{ proto double exp(double number)
Returns e raised to the power of the number */
--- 284,291 ----
convert_to_double(num1);
convert_to_double(num2);
RETURN_DOUBLE(pow(num1->value.dval, num2->value.dval));
! }
! /* }}} */
/* {{{ proto double exp(double number)
Returns e raised to the power of the number */
***************
*** 286,292 ****
convert_to_double(num);
return_value->value.dval = exp(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double log(double number)
Returns the natural logarithm of the number */
--- 299,306 ----
convert_to_double(num);
return_value->value.dval = exp(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double log(double number)
Returns the natural logarithm of the number */
***************
*** 300,306 ****
convert_to_double(num);
return_value->value.dval = log(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double log10(double number)
Returns the base-10 logarithm of the number */
--- 314,321 ----
convert_to_double(num);
return_value->value.dval = log(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double log10(double number)
Returns the base-10 logarithm of the number */
***************
*** 314,320 ****
convert_to_double(num);
return_value->value.dval = log10(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double sqrt(double number)
Returns the square root of the number */
--- 329,336 ----
convert_to_double(num);
return_value->value.dval = log10(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double sqrt(double number)
Returns the square root of the number */
***************
*** 328,334 ****
convert_to_double(num);
return_value->value.dval = sqrt(num->value.dval);
return_value->type = IS_DOUBLE;
! } /* }}} */
/* {{{ proto double deg2rad(double number)
Converts the number in degrees to the radian equivalent */
--- 344,351 ----
convert_to_double(num);
return_value->value.dval = sqrt(num->value.dval);
return_value->type = IS_DOUBLE;
! }
! /* }}} */
/* {{{ proto double deg2rad(double number)
Converts the number in degrees to the radian equivalent */
***************
*** 342,348 ****
}
convert_to_double(deg);
RETVAL_DOUBLE((deg->value.dval / 180.0) * M_PI);
! } /* }}} */
/* {{{ proto double rad2deg(double number)
Converts the radian number to the equivalent number in degrees */
--- 359,366 ----
}
convert_to_double(deg);
RETVAL_DOUBLE((deg->value.dval / 180.0) * M_PI);
! }
! /* }}} */
/* {{{ proto double rad2deg(double number)
Converts the radian number to the equivalent number in degrees */
***************
*** 356,362 ****
}
convert_to_double(rad);
RETVAL_DOUBLE((rad->value.dval / M_PI) * 180);
! } /* }}} */
/*
--- 374,381 ----
}
convert_to_double(rad);
RETVAL_DOUBLE((rad->value.dval / M_PI) * 180);
! }
! /* }}} */
/*
***************
*** 447,453 ****
ret = _php3_basetolong(arg, 2);
RETVAL_LONG(ret);
! } /* }}} */
/* {{{ proto int hexdec(string hexadimal_number)
Returns the decimal equivalent of the hexadecimal number */
--- 466,473 ----
ret = _php3_basetolong(arg, 2);
RETVAL_LONG(ret);
! }
! /* }}} */
/* {{{ proto int hexdec(string hexadimal_number)
Returns the decimal equivalent of the hexadecimal number */
***************
*** 465,471 ****
ret = _php3_basetolong(arg, 16);
RETVAL_LONG(ret);
! } /* }}} */
/* {{{ proto int octdec(string octal_number)
Returns the decimal equivalent of an octal string */
--- 485,492 ----
ret = _php3_basetolong(arg, 16);
RETVAL_LONG(ret);
! }
! /* }}} */
/* {{{ proto int octdec(string octal_number)
Returns the decimal equivalent of an octal string */
***************
*** 483,489 ****
ret = _php3_basetolong(arg, 8);
RETVAL_LONG(ret);
! } /* }}} */
/* {{{ proto string decbin(int decimal_number)
Returns a string containing a binary representation of the number */
--- 504,511 ----
ret = _php3_basetolong(arg, 8);
RETVAL_LONG(ret);
! }
! /* }}} */
/* {{{ proto string decbin(int decimal_number)
Returns a string containing a binary representation of the number */
***************
*** 502,508 ****
return_value->type = IS_STRING;
return_value->value.str.len = strlen(result);
return_value->value.str.val = result;
! } /* }}} */
/* {{{ proto string decoct(int decimal_number)
Returns a string containing an octal representation of the given number */
--- 524,531 ----
return_value->type = IS_STRING;
return_value->value.str.len = strlen(result);
return_value->value.str.val = result;
! }
! /* }}} */
/* {{{ proto string decoct(int decimal_number)
Returns a string containing an octal representation of the given number */
***************
*** 521,527 ****
return_value->type = IS_STRING;
return_value->value.str.len = strlen(result);
return_value->value.str.val = result;
! } /* }}} */
/* {{{ proto string dechex(int decimal_number)
Returns a string containing a hexadecimal representation of the given number */
--- 544,551 ----
return_value->type = IS_STRING;
return_value->value.str.len = strlen(result);
return_value->value.str.val = result;
! }
! /* }}} */
/* {{{ proto string dechex(int decimal_number)
Returns a string containing a hexadecimal representation of the given number */
***************
*** 540,546 ****
return_value->type = IS_STRING;
return_value->value.str.len = strlen(result);
return_value->value.str.val = result;
! } /* }}} */
/* {{{ proto string base_convert(string number, int frombase, int tobase)
--- 564,571 ----
return_value->type = IS_STRING;
return_value->value.str.len = strlen(result);
return_value->value.str.val = result;
! }
! /* }}} */
/* {{{ proto string base_convert(string number, int frombase, int tobase)
***************
*** 674,680 ****
WRONG_PARAM_COUNT;
break;
}
! } /* }}} */
/*
* Local variables:
* tab-width: 4
--- 699,706 ----
WRONG_PARAM_COUNT;
break;
}
! }
! /* }}} */
/*
* Local variables:
* tab-width: 4
Index: php3/functions/md5.c
diff -c php3/functions/md5.c:1.30 php3/functions/md5.c:1.31
*** php3/functions/md5.c:1.30 Wed Nov 11 17:14:39 1998
--- php3/functions/md5.c Wed Nov 18 16:23:09 1998
***************
*** 66,72 ****
}
*r = '\0';
RETVAL_STRING(md5str,1);
! } /* }}} */
/*
* The remaining code is the reference MD5 code (md5c.c) from rfc1321
--- 66,73 ----
}
*r = '\0';
RETVAL_STRING(md5str,1);
! }
! /* }}} */
/*
* The remaining code is the reference MD5 code (md5c.c) from rfc1321
Index: php3/functions/microtime.c
diff -c php3/functions/microtime.c:1.21 php3/functions/microtime.c:1.22
*** php3/functions/microtime.c:1.21 Mon Nov 9 08:23:01 1998
--- php3/functions/microtime.c Wed Nov 18 16:23:10 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: microtime.c,v 1.21 1998/11/09 13:23:01 rasmus Exp $ */
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: microtime.c,v 1.22 1998/11/18 21:23:10 ssb Exp $ */
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
***************
*** 78,84 ****
snprintf(ret, 100, "%.8f %ld", msec, sec);
RETVAL_STRING(ret,1);
#endif
! } /* }}} */
/*
* Local variables:
--- 78,85 ----
snprintf(ret, 100, "%.8f %ld", msec, sec);
RETVAL_STRING(ret,1);
#endif
! }
! /* }}} */
/*
* Local variables:
Index: php3/functions/pack.c
diff -c php3/functions/pack.c:1.17 php3/functions/pack.c:1.18
*** php3/functions/pack.c:1.17 Mon Nov 9 08:23:02 1998
--- php3/functions/pack.c Wed Nov 18 16:23:10 1998
***************
*** 26,32 ****
| Authors: Steve Willer <willer@interlog.com> |
+----------------------------------------------------------------------+
*/
! /* $Id: pack.c,v 1.17 1998/11/09 13:23:02 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 26,32 ----
| Authors: Steve Willer <willer@interlog.com> |
+----------------------------------------------------------------------+
*/
! /* $Id: pack.c,v 1.18 1998/11/18 21:23:10 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 251,257 ****
efree(outstart);
return;
! } /* }}} */
/* unpack() is based on Perl's unpack(), but is modified quite a bit from there.
--- 251,258 ----
efree(outstart);
return;
! }
! /* }}} */
/* unpack() is based on Perl's unpack(), but is modified quite a bit from there.
Index: php3/functions/pageinfo.c
diff -c php3/functions/pageinfo.c:1.38 php3/functions/pageinfo.c:1.39
*** php3/functions/pageinfo.c:1.38 Sat Nov 14 10:39:44 1998
--- php3/functions/pageinfo.c Wed Nov 18 16:23:10 1998
***************
*** 26,32 ****
| Authors: Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: pageinfo.c,v 1.38 1998/11/14 15:39:44 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 26,32 ----
| Authors: Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
! /* $Id: pageinfo.c,v 1.39 1998/11/18 21:23:10 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 109,115 ****
} else {
RETURN_LONG(uid);
}
! } /* }}} */
/* {{{ proto int getmypid(void)
Get current process ID */
--- 109,116 ----
} else {
RETURN_LONG(uid);
}
! }
! /* }}} */
/* {{{ proto int getmypid(void)
Get current process ID */
***************
*** 124,130 ****
} else {
RETURN_LONG((long) pid);
}
! } /* }}} */
/* {{{ proto int getmyinode(void)
Get the inode of the current script being parsed */
--- 125,132 ----
} else {
RETURN_LONG((long) pid);
}
! }
! /* }}} */
/* {{{ proto int getmyinode(void)
Get the inode of the current script being parsed */
***************
*** 138,144 ****
} else {
RETURN_LONG(GLOBAL(page_inode));
}
! } /* }}} */
/* {{{ proto int getlastmod(void)
Get time of last page modification */
--- 140,147 ----
} else {
RETURN_LONG(GLOBAL(page_inode));
}
! }
! /* }}} */
/* {{{ proto int getlastmod(void)
Get time of last page modification */
***************
*** 152,155 ****
} else {
RETURN_LONG(GLOBAL(page_mtime));
}
! } /* }}} */
--- 155,159 ----
} else {
RETURN_LONG(GLOBAL(page_mtime));
}
! }
! /* }}} */
Index: php3/functions/pdf.c
diff -c php3/functions/pdf.c:1.9 php3/functions/pdf.c:1.10
*** php3/functions/pdf.c:1.9 Fri Nov 13 19:09:31 1998
--- php3/functions/pdf.c Wed Nov 18 16:23:10 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: pdf.c,v 1.9 1998/11/14 00:09:31 rasmus Exp $ */
/* pdflib 0.6 is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997 Thomas Merz. */
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: pdf.c,v 1.10 1998/11/18 21:23:10 ssb Exp $ */
/* pdflib 0.6 is subject to the ALADDIN FREE PUBLIC LICENSE.
Copyright (C) 1997 Thomas Merz. */
***************
*** 188,194 ****
id = php3_list_insert(pdf_info,PDF_GLOBAL(le_pdf_info));
RETURN_LONG(id);
! } /* }}} */
/* {{{ proto pdf_set_info_creator(int info, string creator)
Fills the creator field of the info structure */
--- 188,195 ----
id = php3_list_insert(pdf_info,PDF_GLOBAL(le_pdf_info));
RETURN_LONG(id);
! }
! /* }}} */
/* {{{ proto pdf_set_info_creator(int info, string creator)
Fills the creator field of the info structure */
***************
*** 215,221 ****
pdf_info->Creator = estrdup(arg2->value.str.val);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto pdf_set_info_title(int info, string title)
Fills the title field of the info structure */
--- 216,223 ----
pdf_info->Creator = estrdup(arg2->value.str.val);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto pdf_set_info_title(int info, string title)
Fills the title field of the info structure */
***************
*** 242,248 ****
pdf_info->Title = estrdup(arg2->value.str.val);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto pdf_set_info_subject(int info, string subject)
Fills the subject field of the info structure */
--- 244,251 ----
pdf_info->Title = estrdup(arg2->value.str.val);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto pdf_set_info_subject(int info, string subject)
Fills the subject field of the info structure */
***************
*** 269,275 ****
pdf_info->Subject = estrdup(arg2->value.str.val);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto pdf_set_info_author(int info, string author)
Fills the author field of the info structure */
--- 272,279 ----
pdf_info->Subject = estrdup(arg2->value.str.val);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto pdf_set_info_author(int info, string author)
Fills the author field of the info structure */
***************
*** 296,302 ****
pdf_info->Author = estrdup(arg2->value.str.val);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto pdf_set_info_keywords(int info, string keywords)
Fills the keywords field of the info structure */
--- 300,307 ----
pdf_info->Author = estrdup(arg2->value.str.val);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto pdf_set_info_keywords(int info, string keywords)
Fills the keywords field of the info structure */
***************
*** 323,329 ****
pdf_info->Keywords = estrdup(arg2->value.str.val);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int pdf_open(int filedesc, int info)
Opens a new pdf document */
--- 328,335 ----
pdf_info->Keywords = estrdup(arg2->value.str.val);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int pdf_open(int filedesc, int info)
Opens a new pdf document */
***************
*** 363,369 ****
id = php3_list_insert(pdf,PDF_GLOBAL(le_pdf));
RETURN_LONG(id);
! } /* }}} */
/* {{{ proto void pdf_close(int pdfdoc)
Closes the pdf document */
--- 369,376 ----
id = php3_list_insert(pdf,PDF_GLOBAL(le_pdf));
RETURN_LONG(id);
! }
! /* }}} */
/* {{{ proto void pdf_close(int pdfdoc)
Closes the pdf document */
***************
*** 388,394 ****
PDF_close(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_begin_page(int pdfdoc, double height, double width)
Starts page */
--- 395,402 ----
PDF_close(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_begin_page(int pdfdoc, double height, double width)
Starts page */
***************
*** 418,424 ****
PDF_begin_page(pdf, (float) height, (float) width);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_end_page(int pdfdoc)
Ends page */
--- 426,433 ----
PDF_begin_page(pdf, (float) height, (float) width);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_end_page(int pdfdoc)
Ends page */
***************
*** 443,449 ****
PDF_end_page(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_show(int pdfdoc, string text)
Output text at current position */
--- 452,459 ----
PDF_end_page(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_show(int pdfdoc, string text)
Output text at current position */
***************
*** 469,475 ****
PDF_show(pdf, arg2->value.str.val);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_show_xy(int pdfdoc, string text)
Output text at position */
--- 479,486 ----
PDF_show(pdf, arg2->value.str.val);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_show_xy(int pdfdoc, string text)
Output text at position */
***************
*** 497,503 ****
PDF_show_xy(pdf, arg2->value.str.val, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_font(int pdfdoc, string font, double size, string encoding)
Select the current font face and size */
--- 508,515 ----
PDF_show_xy(pdf, arg2->value.str.val, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_font(int pdfdoc, string font, double size, string encoding)
Select the current font face and size */
***************
*** 525,531 ****
PDF_set_font(pdf, arg2->value.str.val, (float) arg3->value.dval, builtin);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_leading(int pdfdoc, double distance)
Sets distance between text lines */
--- 537,544 ----
PDF_set_font(pdf, arg2->value.str.val, (float) arg3->value.dval, builtin);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_leading(int pdfdoc, double distance)
Sets distance between text lines */
***************
*** 551,557 ****
PDF_set_leading(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_text_rendering(int pdfdoc, int mode)
Determines how text is rendered */
--- 564,571 ----
PDF_set_leading(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_text_rendering(int pdfdoc, int mode)
Determines how text is rendered */
***************
*** 577,583 ****
PDF_set_text_rendering(pdf, (byte) arg2->value.lval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_horiz_scaling(int pdfdoc, double scale)
Sets horizontal scaling of text */
--- 591,598 ----
PDF_set_text_rendering(pdf, (byte) arg2->value.lval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_horiz_scaling(int pdfdoc, double scale)
Sets horizontal scaling of text */
***************
*** 603,609 ****
PDF_set_horiz_scaling(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_text_rise(int pdfdoc, double value)
Sets the text rise */
--- 618,625 ----
PDF_set_horiz_scaling(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_text_rise(int pdfdoc, double value)
Sets the text rise */
***************
*** 629,635 ****
PDF_set_text_rise(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_text_matrix(int pdfdoc, arry matrix)
Sets the text matrix */
--- 645,652 ----
PDF_set_text_rise(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_text_matrix(int pdfdoc, arry matrix)
Sets the text matrix */
***************
*** 677,683 ****
PDF_set_text_matrix(pdf, pdfmatrix);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_text_pos(int pdfdoc, double x, double y)
*/
--- 694,701 ----
PDF_set_text_matrix(pdf, pdfmatrix);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_text_pos(int pdfdoc, double x, double y)
*/
***************
*** 704,710 ****
PDF_set_text_pos(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_char_spacing(int pdfdoc, double space)
Sets character spacing */
--- 722,729 ----
PDF_set_text_pos(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_char_spacing(int pdfdoc, double space)
Sets character spacing */
***************
*** 730,736 ****
PDF_set_char_spacing(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_word_spacing(int pdfdoc, double space)
Sets spacing between words */
--- 749,756 ----
PDF_set_char_spacing(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_word_spacing(int pdfdoc, double space)
Sets spacing between words */
***************
*** 756,762 ****
PDF_set_word_spacing(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_continue_text(int pdfdoc, string text)
Output text in next line */
--- 776,783 ----
PDF_set_word_spacing(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_continue_text(int pdfdoc, string text)
Output text in next line */
***************
*** 782,788 ****
PDF_continue_text(pdf, arg2->value.str.val);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto double pdf_stringwidth(int pdfdoc, string text)
Returns width of text in current font*/
--- 803,810 ----
PDF_continue_text(pdf, arg2->value.str.val);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto double pdf_stringwidth(int pdfdoc, string text)
Returns width of text in current font*/
***************
*** 809,815 ****
width = (double) PDF_stringwidth(pdf, arg2->value.str.val);
RETURN_DOUBLE((double)width);
! } /* }}} */
/* {{{ proto void pdf_save(int pdfdoc)
Saves current enviroment */
--- 831,838 ----
width = (double) PDF_stringwidth(pdf, arg2->value.str.val);
RETURN_DOUBLE((double)width);
! }
! /* }}} */
/* {{{ proto void pdf_save(int pdfdoc)
Saves current enviroment */
***************
*** 834,840 ****
PDF_save(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_restore(int pdfdoc)
Restores formerly saved enviroment */
--- 857,864 ----
PDF_save(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_restore(int pdfdoc)
Restores formerly saved enviroment */
***************
*** 859,865 ****
PDF_restore(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_translate(int pdfdoc, double x, double y)
Sets origin of coordinate system */
--- 883,890 ----
PDF_restore(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_translate(int pdfdoc, double x, double y)
Sets origin of coordinate system */
***************
*** 886,892 ****
PDF_translate(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_scale(int pdfdoc, double x-scale, double y-scale)
Sets scaling */
--- 911,918 ----
PDF_translate(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_scale(int pdfdoc, double x-scale, double y-scale)
Sets scaling */
***************
*** 913,919 ****
PDF_scale(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_rotate(int pdfdoc, double angle)
Sets rotation */
--- 939,946 ----
PDF_scale(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_rotate(int pdfdoc, double angle)
Sets rotation */
***************
*** 939,945 ****
PDF_rotate(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setflat(int pdfdoc, double value)
Sets flatness */
--- 966,973 ----
PDF_rotate(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setflat(int pdfdoc, double value)
Sets flatness */
***************
*** 970,976 ****
PDF_setflat(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setlinejoin(int pdfdoc, int value)
Sets linejoin parameter */
--- 998,1005 ----
PDF_setflat(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setlinejoin(int pdfdoc, int value)
Sets linejoin parameter */
***************
*** 1001,1007 ****
PDF_setlinejoin(pdf, (byte) arg2->value.lval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setlinecap(int pdfdoc, int value)
Sets linecap parameter */
--- 1030,1037 ----
PDF_setlinejoin(pdf, (byte) arg2->value.lval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setlinecap(int pdfdoc, int value)
Sets linecap parameter */
***************
*** 1032,1038 ****
PDF_setlinecap(pdf, (byte) arg2->value.lval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setmiterlimit(int pdfdoc, double value)
Sets miter limit */
--- 1062,1069 ----
PDF_setlinecap(pdf, (byte) arg2->value.lval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setmiterlimit(int pdfdoc, double value)
Sets miter limit */
***************
*** 1063,1069 ****
PDF_setmiterlimit(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setlinewidth(int pdfdoc, double width)
Sets line width */
--- 1094,1101 ----
PDF_setmiterlimit(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setlinewidth(int pdfdoc, double width)
Sets line width */
***************
*** 1089,1095 ****
PDF_setlinewidth(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setdash(int pdfdoc, double white, double black)
Sets dash pattern */
--- 1121,1128 ----
PDF_setlinewidth(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setdash(int pdfdoc, double white, double black)
Sets dash pattern */
***************
*** 1116,1122 ****
PDF_setdash(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_moveto(int pdfdoc, double x, double y)
Sets current point */
--- 1149,1156 ----
PDF_setdash(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_moveto(int pdfdoc, double x, double y)
Sets current point */
***************
*** 1143,1149 ****
PDF_moveto(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_curveto(int pdfdoc, double x1, double y1, double x2, double y2, double x3,
double y3)
Draws a curve */
--- 1177,1184 ----
PDF_moveto(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_curveto(int pdfdoc, double x1, double y1, double x2, double y2, double x3,
double y3)
Draws a curve */
***************
*** 1179,1185 ****
(float) arg7->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_lineto(int pdfdoc, double x, double y)
Draws a line */
--- 1214,1221 ----
(float) arg7->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_lineto(int pdfdoc, double x, double y)
Draws a line */
***************
*** 1206,1212 ****
PDF_lineto(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_circle(int pdfdoc, double x, double y, double radius)
Draws a circle */
--- 1242,1249 ----
PDF_lineto(pdf, (float) arg2->value.dval, (float) arg3->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_circle(int pdfdoc, double x, double y, double radius)
Draws a circle */
***************
*** 1234,1240 ****
PDF_circle(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_arc(int pdfdoc, double x, double y, double radius, double start, double end)
Draws an arc */
--- 1271,1278 ----
PDF_circle(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_arc(int pdfdoc, double x, double y, double radius, double start, double end)
Draws an arc */
***************
*** 1265,1271 ****
PDF_arc(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval, (float) arg5->value.dval, (float) arg6->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_rect(int pdfdoc, double x, double y, double width, double height)
Draws a rectangle */
--- 1303,1310 ----
PDF_arc(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval, (float) arg5->value.dval, (float) arg6->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_rect(int pdfdoc, double x, double y, double width, double height)
Draws a rectangle */
***************
*** 1297,1303 ****
(float) arg5->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_closepath(int pdfdoc)
Close path */
--- 1336,1343 ----
(float) arg5->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_closepath(int pdfdoc)
Close path */
***************
*** 1322,1328 ****
PDF_closepath(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_closepath_stroke(int pdfdoc)
Close path and draw line along path */
--- 1362,1369 ----
PDF_closepath(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_closepath_stroke(int pdfdoc)
Close path and draw line along path */
***************
*** 1347,1353 ****
PDF_closepath_stroke(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_closepath_stroke(int pdfdoc)
Draw line along path path */
--- 1388,1395 ----
PDF_closepath_stroke(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_closepath_stroke(int pdfdoc)
Draw line along path path */
***************
*** 1372,1378 ****
PDF_stroke(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_fill(int pdfdoc)
Fill current path */
--- 1414,1421 ----
PDF_stroke(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_fill(int pdfdoc)
Fill current path */
***************
*** 1397,1403 ****
PDF_fill(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_fill_stroke(int pdfdoc)
Fill and stroke current path */
--- 1440,1447 ----
PDF_fill(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_fill_stroke(int pdfdoc)
Fill and stroke current path */
***************
*** 1422,1428 ****
PDF_fill_stroke(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_closepath_fill_stroke(int pdfdoc)
Close, fill and stroke current path */
--- 1466,1473 ----
PDF_fill_stroke(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_closepath_fill_stroke(int pdfdoc)
Close, fill and stroke current path */
***************
*** 1447,1453 ****
PDF_closepath_fill_stroke(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_endpath(int pdfdoc)
Ends current path */
--- 1492,1499 ----
PDF_closepath_fill_stroke(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_endpath(int pdfdoc)
Ends current path */
***************
*** 1472,1478 ****
PDF_endpath(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_clip(int pdfdoc)
Clips to current path */
--- 1518,1525 ----
PDF_endpath(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_clip(int pdfdoc)
Clips to current path */
***************
*** 1497,1503 ****
PDF_clip(pdf);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setgray_fill(int pdfdoc, double value)
Sets filling color to gray value */
--- 1544,1551 ----
PDF_clip(pdf);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setgray_fill(int pdfdoc, double value)
Sets filling color to gray value */
***************
*** 1523,1529 ****
PDF_setgray_fill(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setgray_stroke(int pdfdoc, double value)
Sets drawing color to gray value */
--- 1571,1578 ----
PDF_setgray_fill(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setgray_stroke(int pdfdoc, double value)
Sets drawing color to gray value */
***************
*** 1549,1555 ****
PDF_setgray_stroke(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setgray(int pdfdoc, double value)
Sets drawing and filling color to gray value */
--- 1598,1605 ----
PDF_setgray_stroke(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setgray(int pdfdoc, double value)
Sets drawing and filling color to gray value */
***************
*** 1575,1581 ****
PDF_setgray(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setrgbcolor_fill(int pdfdoc, double red, double green, double blue)
Sets filling color to rgb color value */
--- 1625,1632 ----
PDF_setgray(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setrgbcolor_fill(int pdfdoc, double red, double green, double blue)
Sets filling color to rgb color value */
***************
*** 1601,1607 ****
PDF_setrgbcolor_fill(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setrgbcolor_stroke(int pdfdoc, double red, double green, double blue)
Sets drawing color to rgb color value */
--- 1652,1659 ----
PDF_setrgbcolor_fill(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setrgbcolor_stroke(int pdfdoc, double red, double green, double blue)
Sets drawing color to rgb color value */
***************
*** 1627,1633 ****
PDF_setrgbcolor_stroke(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_setrgbcolor(int pdfdoc, double red, double green, double blue)
Sets drawing and filling color to rgb color value */
--- 1679,1686 ----
PDF_setrgbcolor_stroke(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_setrgbcolor(int pdfdoc, double red, double green, double blue)
Sets drawing and filling color to rgb color value */
***************
*** 1653,1659 ****
PDF_setrgbcolor(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_add_outline(int pdfdoc, string text);
Add bookmark for current page */
--- 1706,1713 ----
PDF_setrgbcolor(pdf, (float) arg2->value.dval, (float) arg3->value.dval, (float)
arg4->value.dval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_add_outline(int pdfdoc, string text);
Add bookmark for current page */
***************
*** 1679,1685 ****
PDF_add_outline(pdf, arg2->value.str.val);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_transition(int pdfdoc, int transition)
Sets transition between pages */
--- 1733,1740 ----
PDF_add_outline(pdf, arg2->value.str.val);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_transition(int pdfdoc, int transition)
Sets transition between pages */
***************
*** 1705,1711 ****
PDF_set_transition(pdf, arg2->value.lval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto void pdf_set_duration(int pdfdoc, double duration)
Sets duration between pages */
--- 1760,1767 ----
PDF_set_transition(pdf, arg2->value.lval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto void pdf_set_duration(int pdfdoc, double duration)
Sets duration between pages */
***************
*** 1731,1737 ****
PDF_set_duration(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! } /* }}} */
#endif
--- 1787,1794 ----
PDF_set_duration(pdf, (float) arg2->value.dval);
RETURN_TRUE;
! }
! /* }}} */
#endif
Index: php3/functions/quot_print.c
diff -c php3/functions/quot_print.c:1.3 php3/functions/quot_print.c:1.4
*** php3/functions/quot_print.c:1.3 Fri Nov 13 07:10:36 1998
--- php3/functions/quot_print.c Wed Nov 18 16:23:11 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: quot_print.c,v 1.3 1998/11/13 12:10:36 rasmus Exp $ */
#include <stdlib.h>
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: quot_print.c,v 1.4 1998/11/18 21:23:11 ssb Exp $ */
#include <stdlib.h>
***************
*** 106,109 ****
str[j] = '\0';
RETVAL_STRINGL(str, j, 1)
! } /* }}} */
--- 106,110 ----
str[j] = '\0';
RETVAL_STRINGL(str, j, 1)
! }
! /* }}} */
Index: php3/functions/reg.c
diff -c php3/functions/reg.c:1.87 php3/functions/reg.c:1.88
*** php3/functions/reg.c:1.87 Fri Nov 6 17:53:29 1998
--- php3/functions/reg.c Wed Nov 18 16:23:11 1998
***************
*** 28,34 ****
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
! /* $Id: reg.c,v 1.87 1998/11/06 22:53:29 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 28,34 ----
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
! /* $Id: reg.c,v 1.88 1998/11/18 21:23:11 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 214,227 ****
void php3_ereg(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_ereg(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! } /* }}} */
/* {{{ proto int eregi(string pattern, string string [, array registers])
Case-insensitive regular expression match */
void php3_eregi(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_ereg(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! } /* }}} */
/* this is the meat and potatoes of regex replacement! */
char *_php3_regreplace(const char *pattern, const char *replace, const char *string, int icase,
int extended)
--- 214,229 ----
void php3_ereg(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_ereg(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! }
! /* }}} */
/* {{{ proto int eregi(string pattern, string string [, array registers])
Case-insensitive regular expression match */
void php3_eregi(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_ereg(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! }
! /* }}} */
/* this is the meat and potatoes of regex replacement! */
char *_php3_regreplace(const char *pattern, const char *replace, const char *string, int icase,
int extended)
***************
*** 427,440 ****
void php3_eregreplace(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_eregreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! } /* }}} */
/* {{{ proto string eregi_replace(string pattern, string string [, array registers])
Case insensitive replace regular expression */
void php3_eregireplace(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_eregreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! } /* }}} */
/* ("root", "passwd", "uid", "gid",
"other:stuff:like:/bin/sh")
= split(":", $passwd_file, 5); */
--- 429,444 ----
void php3_eregreplace(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_eregreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
! }
! /* }}} */
/* {{{ proto string eregi_replace(string pattern, string string [, array registers])
Case insensitive replace regular expression */
void php3_eregireplace(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_eregreplace(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
! }
! /* }}} */
/* ("root", "passwd", "uid", "gid",
"other:stuff:like:/bin/sh")
= split(":", $passwd_file, 5); */
***************
*** 531,537 ****
regfree(&re);
return;
! } /* }}} */
/* {{{ proto string sql_regcase(string string)
Make regular expression for case insensitive match */
--- 535,542 ----
regfree(&re);
return;
! }
! /* }}} */
/* {{{ proto string sql_regcase(string string)
Make regular expression for case insensitive match */
***************
*** 560,566 ****
return_value->value.str.val = tmp;
return_value->value.str.len = string->value.str.len*4;
return_value->type = IS_STRING;
! } /* }}} */
/*
* Local variables:
--- 565,572 ----
return_value->value.str.val = tmp;
return_value->value.str.len = string->value.str.len*4;
return_value->type = IS_STRING;
! }
! /* }}} */
/*
* Local variables:
Index: php3/functions/soundex.c
diff -c php3/functions/soundex.c:1.28 php3/functions/soundex.c:1.29
*** php3/functions/soundex.c:1.28 Fri Nov 13 19:09:32 1998
--- php3/functions/soundex.c Wed Nov 18 16:23:11 1998
***************
*** 26,32 ****
| Author: Bjørn Borud - Guardian Networks AS <borud@guardian.no> |
+----------------------------------------------------------------------+
*/
! /* $Id: soundex.c,v 1.28 1998/11/14 00:09:32 rasmus Exp $ */
#include "php.h"
#include "internal_functions.h"
--- 26,32 ----
| Author: Bjørn Borud - Guardian Networks AS <borud@guardian.no> |
+----------------------------------------------------------------------+
*/
! /* $Id: soundex.c,v 1.29 1998/11/18 21:23:11 ssb Exp $ */
#include "php.h"
#include "internal_functions.h"
***************
*** 126,132 ****
return_value->value.str.val = estrndup(soundex, 4);
return_value->value.str.len = strlen(soundex);
return_value->type = IS_STRING;
! } /* }}} */
/*
* Local variables:
--- 126,133 ----
return_value->value.str.val = estrndup(soundex, 4);
return_value->value.str.len = strlen(soundex);
return_value->type = IS_STRING;
! }
! /* }}} */
/*
* Local variables:
Index: php3/functions/string.c
diff -c php3/functions/string.c:1.146 php3/functions/string.c:1.147
*** php3/functions/string.c:1.146 Sat Nov 7 10:56:19 1998
--- php3/functions/string.c Wed Nov 18 16:23:11 1998
***************
*** 30,36 ****
*/
! /* $Id: string.c,v 1.146 1998/11/07 15:56:19 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 30,36 ----
*/
! /* $Id: string.c,v 1.147 1998/11/18 21:23:11 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 56,62 ****
}
convert_to_string(str);
RETVAL_LONG(str->value.str.len);
! } /* }}} */
/* {{{ proto int strcmp(string str1, string str2)
Binary safe string comparison */
--- 56,63 ----
}
convert_to_string(str);
RETVAL_LONG(str->value.str.len);
! }
! /* }}} */
/* {{{ proto int strcmp(string str1, string str2)
Binary safe string comparison */
***************
*** 70,76 ****
convert_to_string(s1);
convert_to_string(s2);
RETURN_LONG(php3_binary_strcmp(s1,s2));
! } /* }}} */
/* {{{ proto int strcasecmp(string str1, string str2)
Binary safe case-insensitive string comparison */
--- 71,78 ----
convert_to_string(s1);
convert_to_string(s2);
RETURN_LONG(php3_binary_strcmp(s1,s2));
! }
! /* }}} */
/* {{{ proto int strcasecmp(string str1, string str2)
Binary safe case-insensitive string comparison */
***************
*** 84,90 ****
convert_to_string(s1);
convert_to_string(s2);
RETURN_LONG(strcasecmp(s1->value.str.val,s2->value.str.val));
! } /* }}} */
/* {{{ proto int strspn(string str, string mask)
Find length of initial segment consisting entirely of characters found in mask */
--- 86,93 ----
convert_to_string(s1);
convert_to_string(s2);
RETURN_LONG(strcasecmp(s1->value.str.val,s2->value.str.val));
! }
! /* }}} */
/* {{{ proto int strspn(string str, string mask)
Find length of initial segment consisting entirely of characters found in mask */
***************
*** 98,104 ****
convert_to_string(s1);
convert_to_string(s2);
RETURN_LONG(strspn(s1->value.str.val,s2->value.str.val));
! } /* }}} */
/* {{{ proto int strcspn(string str, string mask)
Find length of initial segment consisting entirely of characters not found in mask */
--- 101,108 ----
convert_to_string(s1);
convert_to_string(s2);
RETURN_LONG(strspn(s1->value.str.val,s2->value.str.val));
! }
! /* }}} */
/* {{{ proto int strcspn(string str, string mask)
Find length of initial segment consisting entirely of characters not found in mask */
***************
*** 112,118 ****
convert_to_string(s1);
convert_to_string(s2);
RETURN_LONG(strcspn(s1->value.str.val,s2->value.str.val));
! } /* }}} */
/* {{{ proto string chop(string str)
Remove trailing whitespace */
--- 116,123 ----
convert_to_string(s1);
convert_to_string(s2);
RETURN_LONG(strcspn(s1->value.str.val,s2->value.str.val));
! }
! /* }}} */
/* {{{ proto string chop(string str)
Remove trailing whitespace */
***************
*** 142,148 ****
return;
}
RETURN_FALSE;
! } /* }}} */
/* {{{ proto string trim(string str)
Strip whitespace from the beginning and end of a string */
--- 147,154 ----
return;
}
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto string trim(string str)
Strip whitespace from the beginning and end of a string */
***************
*** 183,189 ****
return;
}
RETURN_FALSE;
! } /* }}} */
/* {{{ proto string ltrim(string str)
Strip whitespace from the beginning of a string */
--- 189,196 ----
return;
}
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto string ltrim(string str)
Strip whitespace from the beginning of a string */
***************
*** 214,220 ****
return;
}
RETURN_FALSE;
! } /* }}} */
/* {{{ proto array(string separator, string str)
Split a string on string separator and return array of components */
--- 221,228 ----
return;
}
RETURN_FALSE;
! }
! /* }}} */
/* {{{ proto array(string separator, string str)
Split a string on string separator and return array of components */
***************
*** 251,257 ****
add_index_string(return_value, i++, p1, 1);
}
efree(work_str);
! } /* }}} */
/* {{{ proto string implode(array src, string glue)
Join array elements placing glue string between items and return one string */
--- 259,266 ----
add_index_string(return_value, i++, p1, 1);
}
efree(work_str);
! }
! /* }}} */
/* {{{ proto string implode(array src, string glue)
Join array elements placing glue string between items and return one string */
***************
*** 309,315 ****
}
return_value->type = IS_STRING;
return_value->value.str.len = len;
! } /* }}} */
#ifndef THREAD_SAFE
char *strtok_string;
--- 318,325 ----
}
return_value->type = IS_STRING;
return_value->value.str.len = len;
! }
! /* }}} */
#ifndef THREAD_SAFE
char *strtok_string;
***************
*** 374,380 ****
} else {
RETVAL_FALSE;
}
! } /* }}} */
PHPAPI char *_php3_strtoupper(char *s)
{
--- 384,391 ----
} else {
RETVAL_FALSE;
}
! }
! /* }}} */
PHPAPI char *_php3_strtoupper(char *s)
{
***************
*** 404,410 ****
ret = _php3_strtoupper(arg->value.str.val);
RETVAL_STRING(ret,1);
! } /* }}} */
PHPAPI char *_php3_strtolower(char *s)
--- 415,422 ----
ret = _php3_strtoupper(arg->value.str.val);
RETVAL_STRING(ret,1);
! }
! /* }}} */
PHPAPI char *_php3_strtolower(char *s)
***************
*** 435,441 ****
ret = _php3_strtolower(str->value.str.val);
RETVAL_STRING(ret,1);
! } /* }}} */
/* {{{ proto string basename(string path)
Return the filename component of the path */
--- 447,454 ----
ret = _php3_strtolower(str->value.str.val);
RETVAL_STRING(ret,1);
! }
! /* }}} */
/* {{{ proto string basename(string path)
Return the filename component of the path */
***************
*** 468,474 ****
RETVAL_STRING(str->value.str.val,1);
}
efree(ret);
! } /* }}} */
PHPAPI void _php3_dirname(char *str, int len) {
register char *c;
--- 481,488 ----
RETVAL_STRING(str->value.str.val,1);
}
efree(ret);
! }
! /* }}} */
PHPAPI void _php3_dirname(char *str, int len) {
register char *c;
***************
*** 505,511 ****
_php3_dirname(ret,str->value.str.len);
RETVAL_STRING(ret,1);
efree(ret);
! } /* }}} */
/* {{{ proto string strstr(string haystack, string needle)
Find first occurrence of a string within another */
--- 519,526 ----
_php3_dirname(ret,str->value.str.len);
RETVAL_STRING(ret,1);
efree(ret);
! }
! /* }}} */
/* {{{ proto string strstr(string haystack, string needle)
Find first occurrence of a string within another */
***************
*** 538,544 ****
} else {
RETVAL_FALSE;
}
! } /* }}} */
/* {{{ proto int strpos(string haystack, string needle)
Find position of first occurrence of a string within another */
--- 553,560 ----
} else {
RETVAL_FALSE;
}
! }
! /* }}} */
/* {{{ proto int strpos(string haystack, string needle)
Find position of first occurrence of a string within another */
***************
*** 587,593 ****
} else {
RETVAL_FALSE;
}
! } /* }}} */
/* {{{ proto int strrpos(string haystack, string needle)
Find the last occurrence of a character in a string within another */
--- 603,610 ----
} else {
RETVAL_FALSE;
}
! }
! /* }}} */
/* {{{ proto int strrpos(string haystack, string needle)
Find the last occurrence of a character in a string within another */
***************
*** 614,620 ****
} else {
RETVAL_FALSE;
}
! } /* }}} */
/* {{{ proto string strrchr(string haystack, string needle)
Find the last occurrence of a character in a string within another */
--- 631,638 ----
} else {
RETVAL_FALSE;
}
! }
! /* }}} */
/* {{{ proto string strrchr(string haystack, string needle)
Find the last occurrence of a character in a string within another */
***************
*** 644,650 ****
} else {
RETVAL_FALSE;
}
! } /* }}} */
/* {{{ proto string substr(string str, int start [, int length])
Return part of a string */
--- 662,669 ----
} else {
RETVAL_FALSE;
}
! }
! /* }}} */
/* {{{ proto string substr(string str, int start [, int length])
Return part of a string */
***************
*** 701,707 ****
string->value.str.val[f + l] = '\0';
}
RETVAL_STRING(string->value.str.val + f,1);
! } /* }}} */
/* {{{ proto string quotemeta(string str)
Quote meta characters */
--- 720,727 ----
string->value.str.val[f + l] = '\0';
}
RETVAL_STRING(string->value.str.val + f,1);
! }
! /* }}} */
/* {{{ proto string quotemeta(string str)
Quote meta characters */
***************
*** 743,749 ****
str[y] = '\0';
RETVAL_STRING(str,1);
efree(str);
! } /* }}} */
/* {{{ proto int ord(string character)
Return ASCII value of character */
--- 763,770 ----
str[y] = '\0';
RETVAL_STRING(str,1);
efree(str);
! }
! /* }}} */
/* {{{ proto int ord(string character)
Return ASCII value of character */
***************
*** 757,763 ****
}
convert_to_string(str);
RETVAL_LONG((unsigned char)str->value.str.val[0]);
! } /* }}} */
/* {{{ proto string chr(int ascii)
Convert ASCII code to a character */
--- 778,785 ----
}
convert_to_string(str);
RETVAL_LONG((unsigned char)str->value.str.val[0]);
! }
! /* }}} */
/* {{{ proto string chr(int ascii)
Convert ASCII code to a character */
***************
*** 774,780 ****
temp[0] = (char) num->value.lval;
temp[1] = '\0';
RETVAL_STRINGL(temp, 1,1);
! } /* }}} */
/* {{{ proto string(string str)
Make a string's first character uppercase */
--- 796,803 ----
temp[0] = (char) num->value.lval;
temp[1] = '\0';
RETVAL_STRINGL(temp, 1,1);
! }
! /* }}} */
/* {{{ proto string(string str)
Make a string's first character uppercase */
***************
*** 792,798 ****
}
*arg->value.str.val = toupper((unsigned char)*arg->value.str.val);
RETVAL_STRING(arg->value.str.val,1);
! } /* }}} */
/* {{{ proto string ucwords(string str)
Uppercase the first character of every word in a string */
--- 815,822 ----
}
*arg->value.str.val = toupper((unsigned char)*arg->value.str.val);
RETVAL_STRING(arg->value.str.val,1);
! }
! /* }}} */
/* {{{ proto string ucwords(string str)
Uppercase the first character of every word in a string */
***************
*** 818,824 ****
}
}
RETVAL_STRING(arg->value.str.val,1);
! } /* }}} */
/* {{{ proto string strtr(string str, string from, string to)
Translate characters in str using given translation tables */
--- 842,849 ----
}
}
RETVAL_STRING(arg->value.str.val,1);
! }
! /* }}} */
/* {{{ proto string strtr(string str, string from, string to)
Translate characters in str using given translation tables */
***************
*** 860,866 ****
}
RETVAL_STRING((char *)string,1);
! } /* }}} */
/* {{{ proto string strrev(string str)
--- 885,892 ----
}
RETVAL_STRING((char *)string,1);
! }
! /* }}} */
/* {{{ proto string strrev(string str)
***************
*** 887,893 ****
*return_value = *str;
pval_copy_constructor(return_value);
! } /* }}} */
/* be careful, this edits the string in-place */
--- 913,920 ----
*return_value = *str;
pval_copy_constructor(return_value);
! }
! /* }}} */
/* be careful, this edits the string in-place */
***************
*** 950,956 ****
convert_to_string(str);
return_value->value.str.val =
_php3_addslashes(str->value.str.val,str->value.str.len,&return_value->value.str.len,0);
return_value->type = IS_STRING;
! } /* }}} */
/* {{{ proto string stripslashes(string str)
Strip backslashes from a string */
--- 977,984 ----
convert_to_string(str);
return_value->value.str.val =
_php3_addslashes(str->value.str.val,str->value.str.len,&return_value->value.str.len,0);
return_value->type = IS_STRING;
! }
! /* }}} */
/* {{{ proto string stripslashes(string str)
Strip backslashes from a string */
***************
*** 967,973 ****
/* let RETVAL do the estrdup() */
RETVAL_STRING(str->value.str.val,1);
_php3_stripslashes(return_value->value.str.val,&return_value->value.str.len);
! } /* }}} */
#ifndef HAVE_STRERROR
#if !APACHE
--- 995,1002 ----
/* let RETVAL do the estrdup() */
RETVAL_STRING(str->value.str.val,1);
_php3_stripslashes(return_value->value.str.val,&return_value->value.str.len);
! }
! /* }}} */
#ifndef HAVE_STRERROR
#if !APACHE
***************
*** 1256,1269 ****
void php3_hebrev(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_hebrev(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
! } /* }}} */
/* {{{ proto string hebrev(string str [, int max_chars_per_line])
Convert logical Hebrew text to visual text with newline conversion */
void php3_hebrev_with_conversion(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_hebrev(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
! } /* }}} */
/* {{{ proto string nl2br(string str)
Converts newlines to HTML line breaks */
--- 1285,1300 ----
void php3_hebrev(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_hebrev(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
! }
! /* }}} */
/* {{{ proto string hebrev(string str [, int max_chars_per_line])
Convert logical Hebrew text to visual text with newline conversion */
void php3_hebrev_with_conversion(INTERNAL_FUNCTION_PARAMETERS)
{
_php3_hebrev(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
! }
! /* }}} */
/* {{{ proto string nl2br(string str)
Converts newlines to HTML line breaks */
***************
*** 1278,1284 ****
convert_to_string(str);
_php3_char_to_str(str->value.str.val,str->value.str.len,'\n',"<br>\n",5,return_value);
! } /* }}} */
/* {{{ proto string setlocale(string category, string locale)
Set locale information */
--- 1309,1316 ----
convert_to_string(str);
_php3_char_to_str(str->value.str.val,str->value.str.len,'\n',"<br>\n",5,return_value);
! }
! /* }}} */
/* {{{ proto string setlocale(string category, string locale)
Set locale information */
***************
*** 1320,1326 ****
}
#endif
RETURN_FALSE;
! } /* }}} */
/*
* Local variables:
--- 1352,1359 ----
}
#endif
RETURN_FALSE;
! }
! /* }}} */
/*
* Local variables:
Index: php3/functions/syslog.c
diff -c php3/functions/syslog.c:1.41 php3/functions/syslog.c:1.42
*** php3/functions/syslog.c:1.41 Mon Nov 9 08:41:59 1998
--- php3/functions/syslog.c Wed Nov 18 16:23:12 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: syslog.c,v 1.41 1998/11/09 13:41:59 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: syslog.c,v 1.42 1998/11/18 21:23:12 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 229,235 ****
syslog_device = estrndup(ident->value.str.val,ident->value.str.len);
openlog(syslog_device, option->value.lval, facility->value.lval);
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int closelog(void)
Close connection to system logger */
--- 229,236 ----
syslog_device = estrndup(ident->value.str.val,ident->value.str.len);
openlog(syslog_device, option->value.lval, facility->value.lval);
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int closelog(void)
Close connection to system logger */
***************
*** 241,247 ****
syslog_device=NULL;
}
RETURN_TRUE;
! } /* }}} */
/* {{{ proto int syslog(int priority, string message)
Generate a system log message */
--- 242,249 ----
syslog_device=NULL;
}
RETURN_TRUE;
! }
! /* }}} */
/* {{{ proto int syslog(int priority, string message)
Generate a system log message */
***************
*** 262,268 ****
syslog(priority->value.lval, message->value.str.val);
RETURN_TRUE;
! } /* }}} */
function_entry syslog_functions[] = {
--- 264,271 ----
syslog(priority->value.lval, message->value.str.val);
RETURN_TRUE;
! }
! /* }}} */
function_entry syslog_functions[] = {
Index: php3/functions/uniqid.c
diff -c php3/functions/uniqid.c:1.30 php3/functions/uniqid.c:1.31
*** php3/functions/uniqid.c:1.30 Fri Nov 13 19:09:32 1998
--- php3/functions/uniqid.c Wed Nov 18 16:23:12 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: uniqid.c,v 1.30 1998/11/14 00:09:32 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: uniqid.c,v 1.31 1998/11/18 21:23:12 ssb Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 88,94 ****
RETURN_STRING(uniqid,1);
#endif
! } /* }}} */
function_entry uniqid_functions[] = {
{"uniqid", php3_uniqid, NULL},
--- 88,95 ----
RETURN_STRING(uniqid,1);
#endif
! }
! /* }}} */
function_entry uniqid_functions[] = {
{"uniqid", php3_uniqid, NULL},
Index: php3/functions/url.c
diff -c php3/functions/url.c:1.41 php3/functions/url.c:1.42
*** php3/functions/url.c:1.41 Fri Nov 13 05:24:58 1998
--- php3/functions/url.c Wed Nov 18 16:23:12 1998
***************
*** 26,32 ****
| Author: Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
! /* $Id: url.c,v 1.41 1998/11/13 10:24:58 steinm Exp $ */
#include <stdlib.h>
#include <string.h>
--- 26,32 ----
| Author: Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
! /* $Id: url.c,v 1.42 1998/11/18 21:23:12 ssb Exp $ */
#include <stdlib.h>
#include <string.h>
***************
*** 201,207 ****
if (resource->fragment != NULL)
add_assoc_string(return_value, "fragment", resource->fragment, 1);
free_url(resource);
! } /* }}} */
static int php3_htoi(char *s)
{
--- 201,208 ----
if (resource->fragment != NULL)
add_assoc_string(return_value, "fragment", resource->fragment, 1);
free_url(resource);
! }
! /* }}} */
static int php3_htoi(char *s)
{
***************
*** 286,292 ****
str = _php3_urlencode(arg->value.str.val, arg->value.str.len);
RETVAL_STRING(str, 1);
efree(str);
! } /* }}} */
/* {{{ proto string urldecode(string str)
Decodes URL-encoded string */
--- 287,294 ----
str = _php3_urlencode(arg->value.str.val, arg->value.str.len);
RETVAL_STRING(str, 1);
efree(str);
! }
! /* }}} */
/* {{{ proto string urldecode(string str)
Decodes URL-encoded string */
***************
*** 307,313 ****
len = _php3_urldecode(arg->value.str.val, arg->value.str.len);
RETVAL_STRINGL(arg->value.str.val, len, 1);
! } /* }}} */
int _php3_urldecode(char *str, int len)
{
--- 309,316 ----
len = _php3_urldecode(arg->value.str.val, arg->value.str.len);
RETVAL_STRINGL(arg->value.str.val, len, 1);
! }
! /* }}} */
int _php3_urldecode(char *str, int len)
{
***************
*** 381,387 ****
str = _php3_rawurlencode(arg->value.str.val, arg->value.str.len);
RETVAL_STRING(str, 1);
efree(str);
! } /* }}} */
/* {{{ proto string rawurldecode(string str)
Decodes URL-encodes string */
--- 384,391 ----
str = _php3_rawurlencode(arg->value.str.val, arg->value.str.len);
RETVAL_STRING(str, 1);
efree(str);
! }
! /* }}} */
/* {{{ proto string rawurldecode(string str)
Decodes URL-encodes string */
***************
*** 402,408 ****
len = _php3_rawurldecode(arg->value.str.val, arg->value.str.len);
RETVAL_STRINGL(arg->value.str.val, len, 1);
! } /* }}} */
int _php3_rawurldecode(char *str, int len)
{
--- 406,413 ----
len = _php3_rawurldecode(arg->value.str.val, arg->value.str.len);
RETVAL_STRINGL(arg->value.str.val, len, 1);
! }
! /* }}} */
int _php3_rawurldecode(char *str, int len)
{
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net