Give a proper error message if initdb password file is empty.

hlinnaka · hlinnaka · commit 2df66f01abe8 · 2014-12-05T14:31:51.000+02:00
Used to say just "could not read password from file "...": Success", which
isn't very informative.

Mats Erik Andersson. Backpatch to all supported versions.
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -1598,8 +1598,12 @@ get_set_pwd(void)
 		}
 		if (!fgets(pwdbuf, sizeof(pwdbuf), pwf))
 		{
-			fprintf(stderr, _("%s: could not read password from file \"%s\": %s\n"),
-					progname, pwfilename, strerror(errno));
+			if (ferror(pwf))
+				fprintf(stderr, _("%s: could not read password from file \"%s\": %s\n"),
+						progname, pwfilename, strerror(errno));
+			else
+				fprintf(stderr, _("%s: password file \"%s\" is empty\n"),
+						progname, pwfilename);
 			exit_nicely();
 		}
 		fclose(pwf);

Original file line number	Diff line number	Diff line change
`@@ -1598,8 +1598,12 @@ get_set_pwd(void)`
`1598`	`1598`	`}`
`1599`	`1599`	`if (!fgets(pwdbuf, sizeof(pwdbuf), pwf))`
`1600`	`1600`	`{`
`1601`		`- fprintf(stderr, _("%s: could not read password from file \"%s\": %s\n"),`
`1602`		`- progname, pwfilename, strerror(errno));`
	`1601`	`+ if (ferror(pwf))`
	`1602`	`+ fprintf(stderr, _("%s: could not read password from file \"%s\": %s\n"),`
	`1603`	`+ progname, pwfilename, strerror(errno));`
	`1604`	`+ else`
	`1605`	`+ fprintf(stderr, _("%s: password file \"%s\" is empty\n"),`
	`1606`	`+ progname, pwfilename);`
`1603`	`1607`	`exit_nicely();`
`1604`	`1608`	`}`
`1605`	`1609`	`fclose(pwf);`