Commitd9346f2

committed

The macros NULL_DEV and DEVNULL were both used to work around

platform-specific spellings of /dev/null. But one should be enough, sosettle on DEVNULL.

1 parent21a743e commitd9346f2Copy full SHA for d9346f2

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.566 2008/10/28 12:10:43 mha Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.567 2008/12/1110:25:17 petere Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -1181,7 +1181,7 @@ pmdaemonize(void)`
`1181`	`1181`	`ExitPostmaster(1);`
`1182`	`1182`	`}`
`1183`	`1183`	`#endif`
`1184`		`-i=open(NULL_DEV,O_RDWR,0);`
	`1184`	`+i=open(DEVNULL,O_RDWR,0);`
`1185`	`1185`	`dup2(i,0);`
`1186`	`1186`	`dup2(i,1);`
`1187`	`1187`	`dup2(i,2);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`*`
`20`	`20`	`* IDENTIFICATION`
`21`		`- * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.45 2008/02/17 02:09:27 tgl Exp $`
	`21`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.46 2008/12/11 10:25:17 petere Exp $`
`22`	`22`	`*`
`23`	`23`	`*-------------------------------------------------------------------------`
`24`	`24`	`*/`
`@@ -184,7 +184,7 @@ SysLoggerMain(int argc, char *argv[])`
`184`	`184`	`*/`
`185`	`185`	`if (redirection_done)`
`186`	`186`	`{`
`187`		`-intfd=open(NULL_DEV,O_WRONLY,0);`
	`187`	`+intfd=open(DEVNULL,O_WRONLY,0);`
`188`	`188`
`189`	`189`	`/*`
`190`	`190`	`* The closes might look redundant, but they are not: we want to be`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`		`- * $PostgreSQL: pgsql/src/include/c.h,v 1.232 2008/12/1109:17:07 petere Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/include/c.h,v 1.233 2008/12/1110:25:17 petere Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -769,9 +769,6 @@ typedef NameData *Name;`
`769`	`769`	`#definePG_BINARY_W "w"`
`770`	`770`	`#endif`
`771`	`771`
`772`		`-/* These are for things that are one way on Unix and another on NT */`
`773`		`-#defineNULL_DEV"/dev/null"`
`774`		`-`
`775`	`772`	`/*`
`776`	`773`	`* Provide prototypes for routines not present in a particular machine's`
`777`	`774`	`* standard C library.`

Comments

(0)