The macros NULL_DEV and DEVNULL were both used to work around

petere · petere · commit d9346f2186c5 · 2008-12-11T10:25:17.000Z
platform-specific spellings of /dev/null.  But one should be enough, so
settle on DEVNULL.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * 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
  *
@@ -1181,7 +1181,7 @@ pmdaemonize(void)
 		ExitPostmaster(1);
 	}
 #endif
-	i = open(NULL_DEV, O_RDWR, 0);
+	i = open(DEVNULL, O_RDWR, 0);
 	dup2(i, 0);
 	dup2(i, 1);
 	dup2(i, 2);
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
@@ -18,7 +18,7 @@
  *
  *
  * 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)
 	{
-		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
diff --git a/src/include/c.h b/src/include/c.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * 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"
 #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
  * standard C library.

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/11 10: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);`
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`		`- int fd = open(NULL_DEV, O_WRONLY, 0);`
	`187`	`+ int fd = open(DEVNULL, O_WRONLY, 0);`
`188`	`188`
`189`	`189`	`/*`
`190`	`190`	`* The closes might look redundant, but they are not: we want to be`