diff --git a/src/include/port.h b/src/include/port.h index 54984fe437c17f4e91351b53f0547adb25f97e32..cd21976041a45f042153277b1e9dcb92b0583fe6 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.69 2005/01/06 00:59:25 tgl Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.70 2005/02/27 00:53:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -174,7 +174,8 @@ extern bool rmtree(char *path, bool rmtopdir); #if defined(WIN32) && !defined(__CYGWIN__) -/* open() replacement to allow delete of held files */ +/* open() replacement to allow delete of held files and passing + * of special options. */ #ifndef WIN32_CLIENT_ONLY extern int win32_open(const char *, int,...); diff --git a/src/include/port/win32.h b/src/include/port/win32.h index 9049fb4327f832d2c1478f8ce5f769bd33f0f47b..c3c7da737bca64d00f73b1ab3c5680837057a529 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.42 2004/12/26 19:20:33 tgl Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.43 2005/02/27 00:53:29 momjian Exp $ */ /* undefine and redefine after #include */ #undef mkdir @@ -183,6 +183,14 @@ typedef int pid_t; */ #define lstat(path, sb) stat((path), (sb)) +/* + * Supplement to . + * This is the same value as _O_NOINHERIT in the MS header file. This is + * to ensure that we don't collide with a future definition. It means + * we cannot use _O_NOINHERIT ourselves. + */ +#define O_SYNC 0x0080 + /* * Supplement to . */ diff --git a/src/port/open.c b/src/port/open.c index b61b66f493edde5a8125c9dc46735c25d84fcc1a..cd17f4164f470c436a094d39ff5652180ebd1747 100644 --- a/src/port/open.c +++ b/src/port/open.c @@ -6,13 +6,14 @@ * * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/port/open.c,v 1.7 2004/12/31 22:03:53 pgsql Exp $ + * $PostgreSQL: pgsql/src/port/open.c,v 1.8 2005/02/27 00:53:29 momjian Exp $ * *------------------------------------------------------------------------- */ #ifdef WIN32 +#include #include #include #include @@ -62,7 +63,7 @@ win32_open(const char *fileName, int fileFlags,...) /* Check that we can handle the request */ assert((fileFlags & ((O_RDONLY | O_WRONLY | O_RDWR) | O_APPEND | (O_RANDOM | O_SEQUENTIAL | O_TEMPORARY) | - _O_SHORT_LIVED | + _O_SHORT_LIVED | O_SYNC | (O_CREAT | O_TRUNC | O_EXCL) | (O_TEXT | O_BINARY))) == fileFlags); sa.nLength = sizeof(sa); @@ -81,7 +82,8 @@ win32_open(const char *fileName, int fileFlags,...) ((fileFlags & O_RANDOM) ? FILE_FLAG_RANDOM_ACCESS : 0) | ((fileFlags & O_SEQUENTIAL) ? FILE_FLAG_SEQUENTIAL_SCAN : 0) | ((fileFlags & _O_SHORT_LIVED) ? FILE_ATTRIBUTE_TEMPORARY : 0) | - ((fileFlags & O_TEMPORARY) ? FILE_FLAG_DELETE_ON_CLOSE : 0), + ((fileFlags & O_TEMPORARY) ? FILE_FLAG_DELETE_ON_CLOSE : 0)| + ((fileFlags & O_SYNC) ? FILE_FLAG_WRITE_THROUGH : 0), NULL)) == INVALID_HANDLE_VALUE) { switch (GetLastError())