Include kernel error message in failed-to-open file reports.

tglsfdc · tglsfdc · commit 883d1cc1cce9 · 2000-08-29T16:40:19.000Z
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.162 2000/08/29 09:36:41 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.163 2000/08/29 16:40:19 tgl Exp $
  *
  * NOTES
  *
@@ -278,7 +278,7 @@ checkDataDir(const char *DataDir)
 		fprintf(stderr, "%s does not know where to find the database system "
 				"data.  You must specify the directory that contains the "
 				"database system either by specifying the -D invocation "
-			 "option or by setting the PGDATA environment variable.\n\n",
+				"option or by setting the PGDATA environment variable.\n\n",
 				progname);
 		exit(2);
 	}
@@ -289,11 +289,10 @@ checkDataDir(const char *DataDir)
 	fp = AllocateFile(path, PG_BINARY_R);
 	if (fp == NULL)
 	{
-		fprintf(stderr, "%s does not find the database system.  "
-				"Expected to find it "
-				"in the PGDATA directory \"%s\", but unable to open file "
-				"with pathname \"%s\".\n\n",
-				progname, DataDir, path);
+		fprintf(stderr, "%s does not find the database system."
+				"\n\tExpected to find it in the PGDATA directory \"%s\","
+				"\n\tbut unable to open file \"%s\": %s\n\n",
+				progname, DataDir, path, strerror(errno));
 		exit(2);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.162 2000/08/29 09:36:41 petere Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.163 2000/08/29 16:40:19 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`*`
`@@ -278,7 +278,7 @@ checkDataDir(const char *DataDir)`
`278`	`278`	`fprintf(stderr, "%s does not know where to find the database system "`
`279`	`279`	`"data. You must specify the directory that contains the "`
`280`	`280`	`"database system either by specifying the -D invocation "`
`281`		`- "option or by setting the PGDATA environment variable.\n\n",`
	`281`	`+ "option or by setting the PGDATA environment variable.\n\n",`
`282`	`282`	`progname);`
`283`	`283`	`exit(2);`
`284`	`284`	`}`
`@@ -289,11 +289,10 @@ checkDataDir(const char *DataDir)`
`289`	`289`	`fp = AllocateFile(path, PG_BINARY_R);`
`290`	`290`	`if (fp == NULL)`
`291`	`291`	`{`
`292`		`- fprintf(stderr, "%s does not find the database system. "`
`293`		`- "Expected to find it "`
`294`		`- "in the PGDATA directory \"%s\", but unable to open file "`
`295`		`- "with pathname \"%s\".\n\n",`
`296`		`- progname, DataDir, path);`
	`292`	`+ fprintf(stderr, "%s does not find the database system."`
	`293`	`+ "\n\tExpected to find it in the PGDATA directory \"%s\","`
	`294`	`+ "\n\tbut unable to open file \"%s\": %s\n\n",`
	`295`	`+ progname, DataDir, path, strerror(errno));`
`297`	`296`	`exit(2);`
`298`	`297`	`}`
`299`	`298`