Hello there,
I would like to improve error recovery of initdb when the
password file is empty. The present code declares "Error 0"
as the cause of failure. It suffices to use ferrer() since
fgets() returns NULL also at a premature EOF.
In addition, a minor case is the need of a line feed in
order to print the error message on a line of its own
seems desirable.
Best regards,
Mats Erik Andersson
>From 5ffe171fb63497a5e2d9d9233282504da0044b8e Mon Sep 17 00:00:00 2001
From: Mats Erik Andersson <b...@gisladisker.se>
Date: Thu, 27 Nov 2014 12:08:31 +0100
Subject: [PATCH] initdb: Improve error recovery.
In case "--pwfile" encounters an empty file, this should be
pointed out, not reporting the cause as "Error 0" which is
the claim by strerror(). The return value of fgets() is NULL
at EOF, so ferror() must be used to tell the conditions apart.
Insert a line break to interrupt finalize the message "mmmmm ..."
whenever the bki_file is missing.
---
src/bin/initdb/initdb.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 3b52867..b76fb3b 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1509,6 +1509,7 @@ bootstrap_template1(void)
if (strcmp(headerline, *bki_lines) != 0)
{
+ fprintf(stderr, "\n");
fprintf(stderr,
_("%s: input file \"%s\" does not belong to
PostgreSQL %s\n"
"Check your installation or specify the
correct path "
@@ -1663,7 +1664,8 @@ 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));
+ progname, pwfilename,
+ ferror(pwf) ? strerror(errno) :
_("empty file"));
exit_nicely();
}
fclose(pwf);
--
1.7.3.2
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
