From 9601cb7bcc8f838b14e5286073b016044604790b Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 15 May 2014 15:58:01 -0400 Subject: Fix unportable setvbuf() usage in initdb. In yesterday's commit 2dc4f011fd61501cce507be78c39a2677690d44b, I tried to force buffering of stdout/stderr in initdb to be what it is by default when the program is run interactively on Unix (since that's how most manual testing is done). This tripped over the fact that Windows doesn't support _IOLBF mode. We dealt with that a long time ago in syslogger.c by falling back to unbuffered mode on Windows. Export that solution in port.h and use it in initdb. Back-patch to 8.4, like the previous commit. --- src/backend/postmaster/syslogger.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/backend/postmaster/syslogger.c') diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index 8b3e50237d7..a5fb5958ea2 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -46,17 +46,6 @@ #include "utils/ps_status.h" #include "utils/timestamp.h" -/* - * We really want line-buffered mode for logfile output, but Windows does - * not have it, and interprets _IOLBF as _IOFBF (bozos). So use _IONBF - * instead on Windows. - */ -#ifdef WIN32 -#define LBF_MODE _IONBF -#else -#define LBF_MODE _IOLBF -#endif - /* * We read() into a temp buffer twice as big as a chunk, so that any fragment * left after processing can be moved down to the front and we'll still have @@ -744,7 +733,7 @@ syslogger_parseArgs(int argc, char *argv[]) if (fd != -1) { syslogFile = fdopen(fd, "a"); - setvbuf(syslogFile, NULL, LBF_MODE, 0); + setvbuf(syslogFile, NULL, PG_IOLBF, 0); } #else /* WIN32 */ fd = atoi(*argv++); @@ -754,7 +743,7 @@ syslogger_parseArgs(int argc, char *argv[]) if (fd > 0) { syslogFile = fdopen(fd, "a"); - setvbuf(syslogFile, NULL, LBF_MODE, 0); + setvbuf(syslogFile, NULL, PG_IOLBF, 0); } } #endif /* WIN32 */ @@ -1133,7 +1122,7 @@ logfile_open(const char *filename, const char *mode, bool allow_errors) if (fh) { - setvbuf(fh, NULL, LBF_MODE, 0); + setvbuf(fh, NULL, PG_IOLBF, 0); #ifdef WIN32 /* use CRLF line endings on Windows */ -- cgit v1.2.3