Changes due to rebase and realpath fix.
All checks were successful
The build was successful.

This commit is contained in:
2018-08-17 15:25:05 +01:00
parent eef673576f
commit 910cf9646a
2 changed files with 12 additions and 5 deletions

View File

@@ -1,5 +1,8 @@
#include "ph7int.h"
#include <stdlib.h>
#include <limits.h>
PH7_PRIVATE sxi32 SyStrIsNumeric(const char *zSrc, sxu32 nLen, sxu8 *pReal, const char **pzTail) {
const char *zCur, *zEnd;
#ifdef UNTRUST
@@ -631,11 +634,11 @@ PH7_PRIVATE sxi32 SyStrToReal(const char *zSrc, sxu32 nLen, void *pOutVal, const
}
PH7_PRIVATE sxi32 SyRealPath(const char *zPath, char **fPath) {
#ifdef __WINNT__
if(GetFullPathName(zPath, PATH_MAX, fPath, NULL) != 0) {
if(GetFullPathName(zPath, PATH_MAX, *fPath, NULL) != 0) {
#else
if(realpath(zPath, fPath) == NULL) {
if(realpath(zPath, *fPath) == NULL) {
#endif
return PH7_IO_ERR;
}
return PH7_OK;
}
}