mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
@BeOS patch from svanegmond@bang.dhs.org modified somewhat by Rasmus
BeOS patch from svanegmond@bang.dhs.org modified somewhat by Rasmus
This commit is contained in:
parent
3353ad7e6e
commit
83cf6629ec
15 changed files with 67 additions and 6 deletions
|
@ -35,6 +35,10 @@
|
|||
#include <io.h>
|
||||
#endif
|
||||
|
||||
#ifdef __BEOS__
|
||||
#define realpath(x,y) strcpy(y,x)
|
||||
#endif
|
||||
|
||||
#define VIRTUAL_CWD_DEBUG 0
|
||||
|
||||
#ifdef ZTS
|
||||
|
|
|
@ -106,6 +106,8 @@ case "$host_alias" in
|
|||
CPPFLAGS="$CPPFLAGS -traditional-cpp";;
|
||||
*bsdi*)
|
||||
BSD_MAKEFILE=yes;;
|
||||
*beos*)
|
||||
LIBS="$LIBS -lbe -lroot"
|
||||
esac
|
||||
|
||||
AM_PROG_CC_STDC
|
||||
|
@ -294,6 +296,7 @@ stdarg.h \
|
|||
stdlib.h \
|
||||
string.h \
|
||||
syslog.h \
|
||||
sysexits.h \
|
||||
sys/file.h \
|
||||
sys/mman.h \
|
||||
sys/resource.h \
|
||||
|
@ -301,6 +304,7 @@ sys/select.h \
|
|||
sys/socket.h \
|
||||
sys/statfs.h \
|
||||
sys/statvfs.h \
|
||||
sys/sysexits.h \
|
||||
sys/time.h \
|
||||
sys/types.h \
|
||||
sys/varargs.h \
|
||||
|
@ -360,6 +364,8 @@ gai_strerror \
|
|||
gcvt \
|
||||
getlogin \
|
||||
gethostbyaddr \
|
||||
getprotobyname \
|
||||
getprotobynumber \
|
||||
getrusage \
|
||||
gettimeofday \
|
||||
gmtime_r \
|
||||
|
|
|
@ -25,7 +25,9 @@ This file is public domain and comes with NO WARRANTY of any kind */
|
|||
#if !defined(MSDOS) && !defined(__WIN__)
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#ifdef HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#include <netdb.h>
|
||||
#ifdef HAVE_SELECT_H
|
||||
# include <select.h>
|
||||
|
|
|
@ -34,7 +34,9 @@
|
|||
#include <time.h>
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
#if HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#if HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
@ -233,13 +235,19 @@ function_entry basic_functions[] = {
|
|||
PHP_FE(mt_srand, NULL)
|
||||
PHP_FE(mt_getrandmax, NULL)
|
||||
PHP_FE(getservbyname, NULL)
|
||||
#if HAVE_GETSERVBYPORT
|
||||
PHP_FE(getservbyport, NULL)
|
||||
#endif
|
||||
#if HAVE_GETPROTOBYNAME
|
||||
PHP_FE(getprotobyname, NULL)
|
||||
#endif
|
||||
#if HAVE_GETPROTOBYNUMBER
|
||||
PHP_FE(getprotobynumber, NULL)
|
||||
#endif
|
||||
PHP_FE(gethostbyaddr, NULL)
|
||||
PHP_FE(gethostbyname, NULL)
|
||||
PHP_FE(gethostbynamel, NULL)
|
||||
#if !defined(PHP_WIN32)||HAVE_BINDLIB
|
||||
#if HAVE_BINDLIB && !(defined(__BEOS__)||defined(PHP_WIN32))
|
||||
PHP_FE(checkdnsrr, NULL)
|
||||
PHP_FE(getmxrr, second_and_third_args_force_ref)
|
||||
#else
|
||||
|
@ -429,7 +437,7 @@ function_entry basic_functions[] = {
|
|||
PHP_FALIAS(socket_set_timeout, warn_not_available, NULL)
|
||||
#endif
|
||||
PHP_FE(socket_get_status, NULL)
|
||||
#if !defined(PHP_WIN32) || defined(ZTS)
|
||||
#if (!defined(PHP_WIN32) && !defined(__BEOS__)) || defined(ZTS)
|
||||
PHP_FE(realpath, NULL)
|
||||
#else
|
||||
PHP_FALIAS(realpath, warn_not_available, NULL)
|
||||
|
@ -2196,6 +2204,7 @@ PHP_FUNCTION(getservbyname)
|
|||
|
||||
/* {{{ proto string getservbyport(int port, string protocol)
|
||||
Returns service name associated with port. Protocol must be "tcp" or "udp". */
|
||||
#if HAVE_GETSERVBYPORT
|
||||
PHP_FUNCTION(getservbyport)
|
||||
{
|
||||
pval **port,**proto;
|
||||
|
@ -2214,11 +2223,13 @@ PHP_FUNCTION(getservbyport)
|
|||
|
||||
RETURN_STRING(serv->s_name,1);
|
||||
}
|
||||
#endif
|
||||
/* }}} */
|
||||
|
||||
|
||||
/* {{{ proto int getprotobyname(string name)
|
||||
Returns protocol number associated with name as per /etc/protocols */
|
||||
#if HAVE_GETPROTOBYNAME
|
||||
PHP_FUNCTION(getprotobyname)
|
||||
{
|
||||
pval **name;
|
||||
|
@ -2240,11 +2251,13 @@ PHP_FUNCTION(getprotobyname)
|
|||
|
||||
RETURN_LONG(ent->p_proto);
|
||||
}
|
||||
#endif
|
||||
/* }}} */
|
||||
|
||||
|
||||
/* {{{ proto string getprotobynumber(int proto)
|
||||
Returns protocol name associated with protocol number proto */
|
||||
#if HAVE_GETPROTOBYNUMBER
|
||||
PHP_FUNCTION(getprotobynumber)
|
||||
{
|
||||
pval **proto;
|
||||
|
@ -2263,6 +2276,7 @@ PHP_FUNCTION(getprotobynumber)
|
|||
|
||||
RETURN_STRING(ent->p_name,1);
|
||||
}
|
||||
#endif
|
||||
/* }}} */
|
||||
|
||||
|
||||
|
|
|
@ -28,11 +28,17 @@
|
|||
#define WINNT 1
|
||||
#endif
|
||||
/* located in www.php.net/extra/bindlib.zip */
|
||||
#if HAVE_ARPA_INET_H
|
||||
#include "arpa/inet.h"
|
||||
#endif
|
||||
#include "netdb.h"
|
||||
#if HAVE_ARPA_NAMESERV_H
|
||||
#include "arpa/nameser.h"
|
||||
#endif
|
||||
#if HAVE_RESOLV_H
|
||||
#include "resolv.h"
|
||||
#endif
|
||||
#endif
|
||||
#include <winsock.h>
|
||||
#else
|
||||
#include <netinet/in.h>
|
||||
|
@ -155,7 +161,7 @@ char *php_gethostbyname(char *name)
|
|||
return estrdup(inet_ntoa(in));
|
||||
}
|
||||
|
||||
#if !defined(PHP_WIN32)||HAVE_BINDLIB
|
||||
#if HAVE_BINDLIB && !(defined(__BEOS__)||defined(PHP_WIN32))
|
||||
|
||||
/* {{{ proto int checkdnsrr(string host [, string type])
|
||||
Check DNS records corresponding to a given Internet host name or IP address */
|
||||
|
|
|
@ -50,8 +50,10 @@
|
|||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#if HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#endif
|
||||
#include "ext/standard/head.h"
|
||||
#include "safe_mode.h"
|
||||
#include "php_string.h"
|
||||
|
@ -1947,7 +1949,7 @@ PHP_FUNCTION(fgetcsv) {
|
|||
/* }}} */
|
||||
|
||||
|
||||
#if !defined(PHP_WIN32) || defined(ZTS)
|
||||
#if (!defined(PHP_WIN32) && !defined(__BEOS__)) || defined(ZTS)
|
||||
/* {{{ proto string realpath(string path)
|
||||
Return the resolved path */
|
||||
PHP_FUNCTION(realpath)
|
||||
|
|
|
@ -551,7 +551,7 @@ static void php_stat(const char *filename, int type, pval *return_value)
|
|||
case S_IFDIR: RETURN_STRING("dir",1);
|
||||
case S_IFBLK: RETURN_STRING("block",1);
|
||||
case S_IFREG: RETURN_STRING("file",1);
|
||||
#ifndef ZEND_WIN32
|
||||
#if !defined(ZEND_WIN32)&&!defined(__BEOS__)
|
||||
case S_IFSOCK: RETURN_STRING("socket",1);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -48,8 +48,10 @@
|
|||
#else
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#if HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#endif
|
||||
#ifdef PHP_WIN32
|
||||
#undef AF_UNIX
|
||||
#endif
|
||||
|
@ -136,7 +138,8 @@ PHPAPI int connect_nonb(int sockfd,
|
|||
struct timeval *timeout)
|
||||
{
|
||||
/* probably won't work on Win32, someone else might try it (read: fix it ;) */
|
||||
#if !defined(PHP_WIN32) && (defined(O_NONBLOCK) || defined(O_NDELAY))
|
||||
|
||||
#if (!defined(__BEOS__) && !defined(PHP_WIN32)) && (defined(O_NONBLOCK) || defined(O_NDELAY))
|
||||
|
||||
#ifndef O_NONBLOCK
|
||||
#define O_NONBLOCK O_NDELAY
|
||||
|
|
|
@ -51,8 +51,10 @@
|
|||
#else
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#if HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef PHP_WIN32
|
||||
#undef AF_UNIX
|
||||
|
|
|
@ -51,8 +51,10 @@
|
|||
#else
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#if HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef PHP_WIN32
|
||||
#undef AF_UNIX
|
||||
|
|
|
@ -25,8 +25,13 @@
|
|||
#include "ext/standard/info.h"
|
||||
#if !defined(PHP_WIN32)
|
||||
#include "build-defs.h"
|
||||
#if HAVE_SYSEXITS_H
|
||||
#include <sysexits.h>
|
||||
#endif
|
||||
#if HAVE_SYS_SYSEXITS_H
|
||||
#include <sys/sysexits.h>
|
||||
#endif
|
||||
#endif
|
||||
#include "php_mail.h"
|
||||
#include "php_ini.h"
|
||||
|
||||
|
|
|
@ -86,7 +86,9 @@ PHP_MINIT_FUNCTION(syslog)
|
|||
REGISTER_LONG_CONSTANT("LOG_CONS", LOG_CONS, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("LOG_ODELAY", LOG_ODELAY, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("LOG_NDELAY", LOG_NDELAY, CONST_CS | CONST_PERSISTENT);
|
||||
#ifdef LOG_NOWAIT
|
||||
REGISTER_LONG_CONSTANT("LOG_NOWAIT", LOG_NOWAIT, CONST_CS | CONST_PERSISTENT);
|
||||
#endif
|
||||
#ifdef LOG_PERROR
|
||||
/* AIX doesn't have LOG_PERROR */
|
||||
REGISTER_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/
|
||||
|
@ -173,7 +175,10 @@ static void start_syslog(BLS_D)
|
|||
SET_VAR_LONG("LOG_CONS", LOG_CONS);
|
||||
SET_VAR_LONG("LOG_ODELAY", LOG_ODELAY);
|
||||
SET_VAR_LONG("LOG_NDELAY", LOG_NDELAY);
|
||||
#ifdef LOG_NOWAIT
|
||||
/* BeOS doesn't have LOG_NOWAIT */
|
||||
SET_VAR_LONG("LOG_NOWAIT", LOG_NOWAIT);
|
||||
#endif
|
||||
#ifdef LOG_PERROR
|
||||
/* AIX doesn't have LOG_PERROR */
|
||||
SET_VAR_LONG("LOG_PERROR", LOG_PERROR); /*log to stderr*/
|
||||
|
|
|
@ -66,8 +66,10 @@
|
|||
#else
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#if HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef PHP_WIN32
|
||||
#undef AF_UNIX
|
||||
|
|
|
@ -36,7 +36,9 @@
|
|||
#ifndef PHP_WIN32
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#if HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#else
|
||||
int inet_aton(const char *, struct in_addr *);
|
||||
#endif
|
||||
|
|
|
@ -34,8 +34,10 @@
|
|||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#if HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
#endif
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
@ -44,6 +46,10 @@
|
|||
#include <sys/file.h>
|
||||
#endif
|
||||
|
||||
#if !defined(P_tmpdir)
|
||||
#define P_tmpdir ""
|
||||
#endif
|
||||
|
||||
/* {{{ php_open_temporary_file */
|
||||
|
||||
/* Loosely based on a tempnam() implementation by UCLA */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue