From 27ba026f959acc515d032a0e6ee411ce5328416f Mon Sep 17 00:00:00 2001 From: Ashwin Agrawal Date: Wed, 11 Sep 2019 12:06:16 -0700 Subject: [PATCH] Improve error handling in pg_regress for commit c8907e8 --- src/test/regress/pg_regress.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 8ea0505558..726588eccb 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -782,6 +782,12 @@ convert_sourcefiles_in(char *source_subdir, char *dest_dir, char *dest_subdir, c repls.content_zero_hostname = content_zero_hostname; repls.username = get_user_name(&errstr); + if (repls.username == NULL) + { + fprintf(stderr, "%s: %s\n", progname, errstr); + exit_nicely(2); + } + /* finally loop on each file and do the replacement */ for (name = names; *name; name++) { @@ -3235,7 +3241,7 @@ get_host_name(int16 contentid, char role) hostname = psprintf("%s", trim_white_space(line)); - if (hostname == NULL) + if (strcmp("", hostname) == 0) { fprintf(stderr, _("%s: failed to determine hostname for content 0 primary\n"), progname); -- GitLab