mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The macros NULL_DEV and DEVNULL were both used to work around

Browse Source 
platform-specific spellings of /dev/null.  But one should be enough, so
settle on DEVNULL.
This commit is contained in:
Peter Eisentraut 2008-12-11 10:25:17 +00:00
parent 21a743e886
commit d9346f2186
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.566 2008/10/28 12:10:43 mha Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.567 2008/12/11 10:25:17 petere Exp $
* *
* NOTES * NOTES
* *
@ -1181,7 +1181,7 @@ pmdaemonize(void)
ExitPostmaster(1); ExitPostmaster(1);
} }
#endif #endif
i = open(NULL_DEV, O_RDWR, 0); i = open(DEVNULL, O_RDWR, 0);
dup2(i, 0); dup2(i, 0);
dup2(i, 1); dup2(i, 1);
dup2(i, 2); dup2(i, 2);

4
src/backend/postmaster/syslogger.c
View File

@ -18,7 +18,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.45 2008/02/17 02:09:27 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.46 2008/12/11 10:25:17 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -184,7 +184,7 @@ SysLoggerMain(int argc, char *argv[])
*/ */
if (redirection_done) if (redirection_done)
{ {
int fd = open(NULL_DEV, O_WRONLY, 0); int fd = open(DEVNULL, O_WRONLY, 0);
/* /*
* The closes might look redundant, but they are not: we want to be * The closes might look redundant, but they are not: we want to be

5
src/include/c.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/c.h,v 1.232 2008/12/11 09:17:07 petere Exp $ * $PostgreSQL: pgsql/src/include/c.h,v 1.233 2008/12/11 10:25:17 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -769,9 +769,6 @@ typedef NameData *Name;
#define PG_BINARY_W "w" #define PG_BINARY_W "w"
#endif #endif
/* These are for things that are one way on Unix and another on NT */
#define NULL_DEV "/dev/null"
/* /*
* Provide prototypes for routines not present in a particular machine's * Provide prototypes for routines not present in a particular machine's
* standard C library. * standard C library.