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

hlinnaka · hlinnaka · commit 2b53d583de96 · 2014-12-05T14:31:45.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
@@ -1347,8 +1347,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
`@@ -1347,8 +1347,12 @@ get_set_pwd(void)`
`1347`	`1347`	`}`
`1348`	`1348`	`if (!fgets(pwdbuf, sizeof(pwdbuf), pwf))`
`1349`	`1349`	`{`
`1350`		`- fprintf(stderr, _("%s: could not read password from file \"%s\": %s\n"),`
`1351`		`- progname, pwfilename, strerror(errno));`
	`1350`	`+ if (ferror(pwf))`
	`1351`	`+ fprintf(stderr, _("%s: could not read password from file \"%s\": %s\n"),`
	`1352`	`+ progname, pwfilename, strerror(errno));`
	`1353`	`+ else`
	`1354`	`+ fprintf(stderr, _("%s: password file \"%s\" is empty\n"),`
	`1355`	`+ progname, pwfilename);`
`1352`	`1356`	`exit_nicely();`
`1353`	`1357`	`}`
`1354`	`1358`	`fclose(pwf);`