diff options
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/basic_functions.c | 20 | ||||
| -rw-r--r-- | ext/standard/dl.c | 3 | ||||
| -rw-r--r-- | ext/standard/dns.c | 11 | ||||
| -rw-r--r-- | ext/standard/file.c | 12 | ||||
| -rw-r--r-- | ext/standard/file.h | 2 | ||||
| -rw-r--r-- | ext/standard/filestat.c | 20 | ||||
| -rw-r--r-- | ext/standard/flock_compat.c | 4 | ||||
| -rw-r--r-- | ext/standard/ftp_fopen_wrapper.c | 4 | ||||
| -rw-r--r-- | ext/standard/http_fopen_wrapper.c | 4 | ||||
| -rw-r--r-- | ext/standard/info.c | 25 | ||||
| -rw-r--r-- | ext/standard/mail.c | 9 | ||||
| -rw-r--r-- | ext/standard/math.c | 2 | ||||
| -rw-r--r-- | ext/standard/microtime.c | 3 | ||||
| -rw-r--r-- | ext/standard/pack.c | 7 | ||||
| -rw-r--r-- | ext/standard/php_dns.h | 4 | ||||
| -rw-r--r-- | ext/standard/proc_open.c | 62 | ||||
| -rw-r--r-- | ext/standard/string.c | 4 |
17 files changed, 27 insertions, 169 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index ba616dff23..dde29fbb69 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -62,10 +62,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #include <sys/stat.h> #endif -#ifdef NETWARE -#include <netinet/in.h> -#endif - #ifndef PHP_WIN32 # include <netdb.h> #else @@ -965,7 +961,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_gethostname, 0) ZEND_END_ARG_INFO() #endif -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) +#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, type) @@ -987,7 +983,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_mx, 0, 0, 2) ZEND_END_ARG_INFO() # endif -#endif /* defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) */ +#endif /* defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) */ /* }}} */ /* {{{ exec.c */ @@ -1206,7 +1202,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fgetcsv, 0, 0, 1) ZEND_ARG_INFO(0, escape) ZEND_END_ARG_INFO() -#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS) +#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) ZEND_BEGIN_ARG_INFO(arginfo_realpath, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() @@ -1232,7 +1228,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_disk_free_space, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() -#ifndef NETWARE ZEND_BEGIN_ARG_INFO(arginfo_chgrp, 0) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, group) @@ -1242,7 +1237,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_chown, 0) ZEND_ARG_INFO(0, filename) ZEND_ARG_INFO(0, user) ZEND_END_ARG_INFO() -#endif #if HAVE_LCHOWN ZEND_BEGIN_ARG_INFO(arginfo_lchgrp, 0) @@ -3063,7 +3057,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(gethostname, arginfo_gethostname) #endif -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) +#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) PHP_FE(dns_check_record, arginfo_dns_check_record) PHP_FALIAS(checkdnsrr, dns_check_record, arginfo_dns_check_record) @@ -3192,7 +3186,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FALIAS(socket_get_status, stream_get_meta_data, arginfo_stream_get_meta_data) -#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS) +#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) PHP_FE(realpath, arginfo_realpath) #endif @@ -3251,10 +3245,8 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(is_link, arginfo_is_link) PHP_NAMED_FE(stat, php_if_stat, arginfo_stat) PHP_NAMED_FE(lstat, php_if_lstat, arginfo_lstat) -#ifndef NETWARE PHP_FE(chown, arginfo_chown) PHP_FE(chgrp, arginfo_chgrp) -#endif #if HAVE_LCHOWN PHP_FE(lchown, arginfo_lchown) #endif @@ -3705,7 +3697,7 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */ php_register_url_stream_wrapper("http", &php_stream_http_wrapper); php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper); -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) +#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) # if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS BASIC_MINIT_SUBMODULE(dns) # endif diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 8908fee5b6..8ff8674fc2 100644 --- a/ext/standard/dl.c +++ b/ext/standard/dl.c @@ -40,9 +40,6 @@ #include "win32/param.h" #include "win32/winutil.h" #define GET_DL_ERROR() php_win_err() -#elif defined(NETWARE) -#include <sys/param.h> -#define GET_DL_ERROR() dlerror() #else #include <sys/param.h> #define GET_DL_ERROR() DL_ERROR() diff --git a/ext/standard/dns.c b/ext/standard/dns.c index de40649e69..f92015eee9 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -33,7 +33,7 @@ # include <winsock2.h> # include <windows.h> # include <Ws2tcpip.h> -#else /* This holds good for NetWare too, both for Winsock and Berkeley sockets */ +#else #include <netinet/in.h> #if HAVE_ARPA_INET_H #include <arpa/inet.h> @@ -57,11 +57,6 @@ #endif #endif -/* Borrowed from SYS/SOCKET.H */ -#if defined(NETWARE) && defined(USE_WINSOCK) -#define AF_INET 2 /* internetwork: UDP, TCP, etc. */ -#endif - #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 255 #endif @@ -305,7 +300,7 @@ static zend_string *php_gethostbyname(char *name) #endif /* HAVE_FULL_DNS_FUNCS || defined(PHP_WIN32) */ /* Note: These functions are defined in ext/standard/dns_win32.c for Windows! */ -#if !defined(PHP_WIN32) && (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) +#if !defined(PHP_WIN32) && (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) #ifndef HFIXEDSZ #define HFIXEDSZ 12 /* fixed data in header <arpa/nameser.h> */ @@ -1085,7 +1080,7 @@ PHP_FUNCTION(dns_get_mx) } /* }}} */ #endif /* HAVE_FULL_DNS_FUNCS */ -#endif /* !defined(PHP_WIN32) && (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) */ +#endif /* !defined(PHP_WIN32) && (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) */ #if HAVE_FULL_DNS_FUNCS || defined(PHP_WIN32) PHP_MINIT_FUNCTION(dns) { diff --git a/ext/standard/file.c b/ext/standard/file.c index c75d2d3fa0..f5f489d43f 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -57,13 +57,9 @@ # if HAVE_SYS_SELECT_H # include <sys/select.h> # endif -# if defined(NETWARE) && defined(USE_WINSOCK) -# include <novsock2.h> -# else -# include <sys/socket.h> -# include <netinet/in.h> -# include <netdb.h> -# endif +# include <sys/socket.h> +# include <netinet/in.h> +# include <netdb.h> # if HAVE_ARPA_INET_H # include <arpa/inet.h> # endif @@ -2293,7 +2289,7 @@ out: } /* }}} */ -#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS) +#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) /* {{{ proto string realpath(string path) Return the resolved path */ PHP_FUNCTION(realpath) diff --git a/ext/standard/file.h b/ext/standard/file.h index a9b96d6b38..9d6a9e8c16 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -62,7 +62,7 @@ PHP_FUNCTION(get_meta_tags); PHP_FUNCTION(flock); PHP_FUNCTION(fd_set); PHP_FUNCTION(fd_isset); -#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS) +#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) PHP_FUNCTION(realpath); #endif #ifdef HAVE_FNMATCH diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 439e1741ad..370805a27e 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -261,12 +261,8 @@ static int php_disk_free_space(char *path, double *space) /* {{{ */ php_error_docref(NULL, E_WARNING, "%s", strerror(errno)); return FAILURE; } -#ifdef NETWARE - bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bfree)); -#else bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bavail)); #endif -#endif *space = bytesfree; return SUCCESS; @@ -298,7 +294,7 @@ PHP_FUNCTION(disk_free_space) } /* }}} */ -#if !defined(WINDOWS) && !defined(NETWARE) +#ifndef PHP_WIN32 PHPAPI int php_get_gid_by_name(const char *name, gid_t *gid) { #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX) @@ -411,7 +407,6 @@ static void php_do_chgrp(INTERNAL_FUNCTION_PARAMETERS, int do_lchgrp) /* {{{ */ } /* }}} */ -#ifndef NETWARE /* {{{ proto bool chgrp(string filename, mixed group) Change file group */ PHP_FUNCTION(chgrp) @@ -433,9 +428,8 @@ PHP_FUNCTION(lchgrp) } #endif /* }}} */ -#endif /* !NETWARE */ -#if !defined(WINDOWS) && !defined(NETWARE) +#ifndef PHP_WIN32 PHPAPI uid_t php_get_uid_by_name(const char *name, uid_t *uid) { #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R) @@ -550,7 +544,6 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */ /* }}} */ -#ifndef NETWARE /* {{{ proto bool chown (string filename, mixed user) Change file owner */ PHP_FUNCTION(chown) @@ -573,7 +566,6 @@ PHP_FUNCTION(lchown) } #endif /* }}} */ -#endif /* !NETWARE */ /* {{{ proto bool chmod(string filename, int mode) Change file mode */ @@ -826,8 +818,6 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ stat_sb = &ssb.sb; - -#ifndef NETWARE if (type >= FS_IS_W && type <= FS_IS_X) { if(ssb.sb.st_uid==getuid()) { rmask=S_IRUSR; @@ -857,12 +847,9 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ } } } -#endif -#ifndef NETWARE if (IS_ABLE_CHECK(type) && getuid() == 0) { - /* root has special perms on plain_wrapper - But we don't know about root under Netware */ + /* root has special perms on plain_wrapper */ if (wrapper == &php_plain_files_wrapper) { if (type == FS_IS_X) { xmask = S_IXROOT; @@ -871,7 +858,6 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ } } } -#endif switch (type) { case FS_PERMS: diff --git a/ext/standard/flock_compat.c b/ext/standard/flock_compat.c index c2c795ac8d..0a9ea4770d 100644 --- a/ext/standard/flock_compat.c +++ b/ext/standard/flock_compat.c @@ -33,10 +33,6 @@ #include "config.w32.h" #endif -#ifdef NETWARE -#include <netinet/in.h> -#endif - #ifndef HAVE_FLOCK PHPAPI int flock(int fd, int operation) { diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index a5e00a6df9..5e156c5cf4 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -49,8 +49,6 @@ #ifdef PHP_WIN32 #include <winsock2.h> -#elif defined(NETWARE) && defined(USE_WINSOCK) -#include <novsock2.h> #else #include <netinet/in.h> #include <netdb.h> @@ -59,7 +57,7 @@ #endif #endif -#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE) +#if defined(PHP_WIN32) || defined(__riscos__) #undef AF_UNIX #endif diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 9c10c4907b..c2d6c51a56 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -52,8 +52,6 @@ #ifdef PHP_WIN32 #include <winsock2.h> -#elif defined(NETWARE) && defined(USE_WINSOCK) -#include <novsock2.h> #else #include <netinet/in.h> #include <netdb.h> @@ -62,7 +60,7 @@ #endif #endif -#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE) +#if defined(PHP_WIN32) || defined(__riscos__) #undef AF_UNIX #endif diff --git a/ext/standard/info.c b/ext/standard/info.c index b62679528c..38c537c119 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -733,30 +733,6 @@ PHPAPI zend_string *php_get_uname(char mode) if (uname((struct utsname *)&buf) == -1) { php_uname = PHP_UNAME; } else { -#ifdef NETWARE - if (mode == 's') { - php_uname = buf.sysname; - } else if (mode == 'r') { - snprintf(tmp_uname, sizeof(tmp_uname), "%d.%d.%d", - buf.netware_major, buf.netware_minor, buf.netware_revision); - php_uname = tmp_uname; - } else if (mode == 'n') { - php_uname = buf.servername; - } else if (mode == 'v') { - snprintf(tmp_uname, sizeof(tmp_uname), "libc-%d.%d.%d #%d", - buf.libmajor, buf.libminor, buf.librevision, buf.libthreshold); - php_uname = tmp_uname; - } else if (mode == 'm') { - php_uname = buf.machine; - } else { /* assume mode == 'a' */ - snprintf(tmp_uname, sizeof(tmp_uname), "%s %s %d.%d.%d libc-%d.%d.%d #%d %s", - buf.sysname, buf.servername, - buf.netware_major, buf.netware_minor, buf.netware_revision, - buf.libmajor, buf.libminor, buf.librevision, buf.libthreshold, - buf.machine); - php_uname = tmp_uname; - } -#else if (mode == 's') { php_uname = buf.sysname; } else if (mode == 'r') { @@ -773,7 +749,6 @@ PHPAPI zend_string *php_get_uname(char mode) buf.machine); php_uname = tmp_uname; } -#endif /* NETWARE */ } #else php_uname = PHP_UNAME; diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 8d70e5a47b..ad0110281e 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -52,11 +52,6 @@ #include "win32/sendmail.h" #endif -#ifdef NETWARE -#define EX_OK 0 /* successful termination */ -#define EX_TEMPFAIL 75 /* temp failure; user is invited to retry */ -#endif - #define SKIP_LONG_HEADER_SEP(str, pos) \ if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || str[pos + 2] == '\t')) { \ pos += 2; \ @@ -468,7 +463,7 @@ static int php_mail_detect_multiple_crlf(char *hdr) { */ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char *extra_cmd) { -#if (defined PHP_WIN32 || defined NETWARE) +#ifdef PHP_WIN32 int tsm_err; char *tsm_errmsg = NULL; #endif @@ -539,7 +534,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char } if (!sendmail_path) { -#if (defined PHP_WIN32 || defined NETWARE) +#ifdef PHP_WIN32 /* handle old style win smtp sending */ if (TSendMail(INI_STR("SMTP"), &tsm_err, &tsm_errmsg, hdr, subject, to, message, NULL, NULL, NULL) == FAILURE) { if (tsm_errmsg) { diff --git a/ext/standard/math.c b/ext/standard/math.c index 15eedaf7bf..2314132f58 100644 --- a/ext/standard/math.c +++ b/ext/standard/math.c @@ -277,7 +277,7 @@ static double php_log1p(double x) */ static double php_expm1(double x) { -#if !defined(PHP_WIN32) && !defined(NETWARE) +#ifndef PHP_WIN32 return(expm1(x)); #else return(exp(x) - 1); diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c index 9793dcd701..9a75038fa8 100644 --- a/ext/standard/microtime.c +++ b/ext/standard/microtime.c @@ -26,9 +26,6 @@ #ifdef PHP_WIN32 #include "win32/time.h" #include "win32/getrusage.h" -#elif defined(NETWARE) -#include <sys/timeval.h> -#include <sys/time.h> #else #include <sys/time.h> #endif diff --git a/ext/standard/pack.c b/ext/standard/pack.c index 1252f4286f..1c13f0be96 100644 --- a/ext/standard/pack.c +++ b/ext/standard/pack.c @@ -28,13 +28,6 @@ #ifdef PHP_WIN32 #define O_RDONLY _O_RDONLY #include "win32/param.h" -#elif defined(NETWARE) -#ifdef USE_WINSOCK -#include <novsock2.h> -#else -#include <sys/socket.h> -#endif -#include <sys/param.h> #else #include <sys/param.h> #endif diff --git a/ext/standard/php_dns.h b/ext/standard/php_dns.h index dfd43a40dc..6e3728e861 100644 --- a/ext/standard/php_dns.h +++ b/ext/standard/php_dns.h @@ -59,7 +59,7 @@ PHP_FUNCTION(gethostbynamel); PHP_FUNCTION(gethostname); #endif -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) +#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) PHP_FUNCTION(dns_check_record); # if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS @@ -68,7 +68,7 @@ PHP_FUNCTION(dns_get_record); PHP_MINIT_FUNCTION(dns); # endif -#endif /* defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) */ +#endif /* defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) */ #ifndef INT16SZ #define INT16SZ 2 diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index 95803c9bbd..2f178d9d99 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -36,11 +36,6 @@ #include "SAPI.h" #include "main/php_network.h" -#ifdef NETWARE -#include <proc.h> -#include <library.h> -#endif - #if HAVE_SYS_WAIT_H #include <sys/wait.h> #endif @@ -346,11 +341,8 @@ PHP_FUNCTION(proc_get_status) if (WIFSIGNALED(wstatus)) { running = 0; signaled = 1; -#ifdef NETWARE - termsig = WIFTERMSIG(wstatus); -#else + termsig = WTERMSIG(wstatus); -#endif } if (WIFSTOPPED(wstatus)) { stopped = 1; @@ -438,13 +430,6 @@ PHP_FUNCTION(proc_open) wchar_t *cmdw = NULL, *cwdw = NULL, *envpw = NULL; size_t tmp_len; #endif -#ifdef NETWARE - char** child_argv = NULL; - char* command_dup = NULL; - char* orig_cwd = NULL; - int command_num_args = 0; - wiring_t channel; -#endif php_process_id_t child; struct php_process_handle *proc; int is_persistent = 0; /* TODO: ensure that persistent procs will work */ @@ -797,51 +782,6 @@ PHP_FUNCTION(proc_open) childHandle = pi.hProcess; child = pi.dwProcessId; CloseHandle(pi.hThread); - -#elif defined(NETWARE) - if (cwd) { - orig_cwd = getcwd(NULL, PATH_MAX); - chdir2(cwd); - } - channel.infd = descriptors[0].childend; - channel.outfd = descriptors[1].childend; - channel.errfd = -1; - /* Duplicate the command as processing downwards will modify it*/ - command_dup = strdup(command); - if (!command_dup) { - goto exit_fail; - } - /* get a number of args */ - construct_argc_argv(command_dup, NULL, &command_num_args, NULL); - child_argv = (char**) malloc((command_num_args + 1) * sizeof(char*)); - if(!child_argv) { - free(command_dup); - if (cwd && orig_cwd) { - chdir2(orig_cwd); - free(orig_cwd); - } - } - /* fill the child arg vector */ - construct_argc_argv(command_dup, NULL, &command_num_args, child_argv); - child_argv[command_num_args] = NULL; - child = procve(child_argv[0], PROC_DETACHED|PROC_INHERIT_CWD, NULL, &channel, NULL, NULL, 0, NULL, (const char**)child_argv); - free(child_argv); - free(command_dup); - if (cwd && orig_cwd) { - chdir2(orig_cwd); - free(orig_cwd); - } - if (child < 0) { - /* failed to fork() */ - /* clean up all the descriptors */ - for (i = 0; i < ndesc; i++) { - close(descriptors[i].childend); - if (descriptors[i].parentend) - close(descriptors[i].parentend); - } - php_error_docref(NULL, E_WARNING, "procve failed - %s", strerror(errno)); - goto exit_fail; - } #elif HAVE_FORK /* the unix way */ child = fork(); diff --git a/ext/standard/string.c b/ext/standard/string.c index 4389e10702..ec4b021ca2 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1537,7 +1537,7 @@ PHPAPI zend_string *php_basename(const char *s, size_t len, char *suffix, size_t case 0: goto quit_loop; case 1: -#if defined(PHP_WIN32) || defined(NETWARE) +#if defined(PHP_WIN32) if (*c == '/' || *c == '\\') { #else if (*c == '/') { @@ -1546,7 +1546,7 @@ PHPAPI zend_string *php_basename(const char *s, size_t len, char *suffix, size_t state = 0; cend = c; } -#if defined(PHP_WIN32) || defined(NETWARE) +#if defined(PHP_WIN32) /* Catch relative paths in c:file.txt style. They're not to confuse with the NTFS streams. This part ensures also, that no drive letter traversing happens. */ |