mirror of
https://github.com/php/php-src.git
synced 2025-01-27 06:03:45 +08:00
Instead of checking whether realpath exists based on OS. Use the
HAVE_REALPATH define, which is set if realpath() is avaliable. This patch also resolves bug #18868.
This commit is contained in:
parent
3037b35b31
commit
78e2e69b23
@ -41,7 +41,7 @@
|
||||
#include "tsrm_nw.h"
|
||||
#endif
|
||||
|
||||
#ifdef __BEOS__
|
||||
#ifndef HAVE_REALPATH
|
||||
#define realpath(x,y) strcpy(y,x)
|
||||
#endif
|
||||
|
||||
|
@ -233,7 +233,7 @@ typedef struct _virtual_cwd_globals {
|
||||
#define VCWD_POPEN(command, type) popen(command, type)
|
||||
#define VCWD_ACCESS(pathname, mode) access(pathname, mode)
|
||||
|
||||
#if !defined(TSRM_WIN32) && !defined(NETWARE)
|
||||
#ifdef HAVE_REALPATH
|
||||
#define VCWD_REALPATH(path, real_path) realpath(path, real_path)
|
||||
#else
|
||||
#define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
|
||||
|
@ -115,10 +115,6 @@ php_file_globals file_globals;
|
||||
#include <fnmatch.h>
|
||||
#endif
|
||||
|
||||
#ifdef __BEOS__
|
||||
#define realpath(x,y) strcpy(y,x)
|
||||
#endif
|
||||
|
||||
/* }}} */
|
||||
/* {{{ ZTS-stuff / Globals / Prototypes */
|
||||
|
||||
|
@ -31,10 +31,6 @@
|
||||
#include "SAPI.h"
|
||||
#include "php_globals.h"
|
||||
|
||||
#ifdef __BEOS__
|
||||
#define realpath(x,y) strcpy(y,x)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* php_checkuid
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user