Changeset: a73da0c88f3e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a73da0c88f3e
Modified Files:
CMakeLists.txt
gdk/gdk_posix.h
monetdb_config.h.in
sql/server/rel_updates.c
testing/CMakeLists.txt
Branch: cmake-fun
Log Message:
Revert stat changes, plus fixed Mtest compile variables.
diffs (148 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2046,7 +2046,6 @@ check_symbol_exists("getuid" "unistd.h;s
check_symbol_exists("localtime_r" "time.h" HAVE_LOCALTIME_R)
check_symbol_exists("localtime_s" "time.h" HAVE_LOCALTIME_S)
check_symbol_exists("lockf" "unistd.h" HAVE_LOCKF)
-check_symbol_exists("lstat" "sys/types.h;sys/stat.h;unistd.h" HAVE_LSTAT)
check_symbol_exists("madvise" "sys/mman.h" HAVE_MADVISE)
check_symbol_exists("mremap" "sys/mman.h" HAVE_MREMAP)
check_symbol_exists("nanosleep" "time.h" HAVE_NANOSLEEP)
@@ -2082,7 +2081,6 @@ else()
check_symbol_exists("_mul128" "intrin.h" HAVE__MUL128)
endif()
check_symbol_exists("_wfopen_s" "wchar.h" HAVE__WFOPEN) # Check for _wfopen_s
to avoid warnings
-check_symbol_exists("_stat64" "sys/types.h;sys/stat.h" HAVE_STAT64)
if(HAVE_ASCTIME_R)
message(STATUS "Test if asctime_r takes 3 arguments")
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -168,11 +168,7 @@ gdk_export char *dlerror(void);
#ifndef HAVE_GETTIMEOFDAY
gdk_export int gettimeofday(struct timeval *tv, int *ignore_zone);
#endif
-#ifndef NATIVE_WIN32
gdk_export int win_stat(const char *, struct stat *);
-#else
-gdk_export int win_stat(const char *, struct _stat64 *);
-#endif
gdk_export int win_rmdir(const char *);
gdk_export int win_rename(const char *, const char *);
gdk_export int win_unlink(const char *);
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -58,6 +58,20 @@
#define strncasecmp _strnicmp
#endif
+#include <sys/stat.h>
+#ifdef lstat
+#undef lstat
+#endif
+#define lstat _stat64
+#ifdef stat
+#undef stat
+#endif
+#define stat _stat64
+#ifdef fstat
+#undef fstat
+#endif
+#define fstat _fstat64
+
#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
/* In this case, malloc and friends are redefined in crtdbg.h to debug
* versions. We need to include stdlib.h first or else we get
@@ -288,9 +302,6 @@
/* Define to 1 if you have the `lockf' function. */
#cmakedefine HAVE_LOCKF 1
-/* Define to 1 if you have the `lstat' function. */
-#cmakedefine HAVE_LSTAT 1
-
/* Define to 1 if you have the <mach/mach_init.h> header file. */
#cmakedefine HAVE_MACH_MACH_INIT_H 1
@@ -426,9 +437,6 @@
/* Define to 1 if you have the SQLGetPrivateProfileString function */
#cmakedefine HAVE_SQLGETPRIVATEPROFILESTRING 1
-/* Define to 1 if you have the `_stat64' function. */
-#cmakedefine HAVE_STAT64 1
-
/* Define to 1 if you have the <stdatomic.h> header file */
#cmakedefine HAVE_STDATOMIC_H 1
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -2062,11 +2062,7 @@ copyto(mvc *sql, symbol *sq, const char
fname_e = filename?exp_atom_clob(sql->sa, filename):NULL;
if (!onclient && filename) {
-#if defined(HAVE_LSTAT)
struct stat fs;
-#elif defined(HAVE_STAT64)
- struct __stat64 fs;
-#endif
if (!copy_allowed(sql, 0))
return sql_error(sql, 02, SQLSTATE(42000) "COPY INTO:
insufficient privileges: "
"COPY INTO file requires database
administrator rights, "
@@ -2074,13 +2070,7 @@ copyto(mvc *sql, symbol *sq, const char
if (filename && !MT_path_absolute(filename))
return sql_error(sql, 02, SQLSTATE(42000) "COPY INTO ON
SERVER: filename must "
"have absolute path: %s", filename);
-#if defined(HAVE_LSTAT)
if (lstat(filename, &fs) == 0)
-#elif defined(HAVE_STAT64)
- if (_stat64(filename, &fs) == 0)
-#else
-#error lstat function or equivalent not found
-#endif
return sql_error(sql, 02, SQLSTATE(42000) "COPY INTO ON
SERVER: file already "
"exists: %s", filename);
}
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -11,24 +11,26 @@ target_link_libraries(Mdiff PRIVATE ${MA
install(TARGETS Mdiff DESTINATION ${BINDIR})
string(REPLACE "\\" "\\\\" SOURCE "${CMAKE_SOURCE_DIR}")
-string(REPLACE "\\" "\\\\" QXSOURCE "${CMAKE_SOURCE_DIR}") # TODO the QX
variables are wrong!
-string(REPLACE "\\" "\\\\" QXSOURCE "${CMAKE_INSTALL_PREFIX}")
-string(REPLACE "\\" "\\\\" QXprefix "${CMAKE_INSTALL_PREFIX}")
-string(REPLACE "\\" "\\\\" QXexec_prefix "${CMAKE_INSTALL_PREFIX}")
-string(REPLACE "\\" "\\\\" QXlibexecdir "${LIBEXECDIR}")
+string(REPLACE "\\" "\\\\" QXBUILD "${CMAKE_BINARY_DIR}")
+string(REPLACE "\\" "\\\\" QXSOURCE "${CMAKE_SOURCE_DIR}")
+
+string(REPLACE "\\" "\\\\" QXbindir "${BINDIR}") # TODO confirm these changes
string(REPLACE "\\" "\\\\" QXdatadir "${DATADIR}")
string(REPLACE "\\" "\\\\" QXdatarootdir "${DATAROOTDIR}")
-string(REPLACE "\\" "\\\\" QXbindir "${BINDIR}")
-string(REPLACE "\\" "\\\\" QXsysconfdir "${SYSCONFDIR}")
-string(REPLACE "\\" "\\\\" QXlocalstatedir "${LOGDIR}")
-string(REPLACE "\\" "\\\\" QXmandir "${MANDIR}")
+string(REPLACE "\\" "\\\\" QXexec_prefix "${CMAKE_INSTALL_PREFIX}")
+string(REPLACE "\\" "\\\\" QXincludedir "${INCLUDEDIR}")
string(REPLACE "\\" "\\\\" QXinfodir "${INFODIR}")
string(REPLACE "\\" "\\\\" QXlibdir "${LIBDIR}")
-string(REPLACE "\\" "\\\\" QXincludedir "${INCLUDEDIR}")
+string(REPLACE "\\" "\\\\" QXlibexecdir "${LIBEXECDIR}")
+string(REPLACE "\\" "\\\\" QXlocalstatedir "${LOCALSTATEDIR}")
+string(REPLACE "\\" "\\\\" QXmandir "${MANDIR}")
+string(REPLACE "\\" "\\\\" QXprefix "${CMAKE_INSTALL_PREFIX}")
+string(REPLACE "\\" "\\\\" QXsysconfdir "${SYSCONFDIR}")
string(REPLACE "\\" "\\\\" QXPYTHON2 "${PYTHON2_INTERPRETER}")
+string(REPLACE "\\" "\\\\" QXPYTHON3 "${PYTHON3_INTERPRETER}")
+string(REPLACE "\\" "\\\\" QXPYTHON_LIBDIR "${PYTHON_LIBDIR}")
string(REPLACE "\\" "\\\\" QXPYTHON2_LIBDIR "${PYTHON2_LIBDIR}")
-string(REPLACE "\\" "\\\\" QXPYTHON3 "${PYTHON3_INTERPRETER}")
string(REPLACE "\\" "\\\\" QXPYTHON3_LIBDIR "${PYTHON3_LIBDIR}")
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
