summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/pg_upgrade/option.c6
-rw-r--r--src/bin/pg_upgrade/pg_upgrade.c7
2 files changed, 2 insertions, 11 deletions
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index 28ff4c48ed3..da9e1da78db 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -169,18 +169,12 @@ parseCommandLine(int argc, char *argv[])
*/
case 'p':
if ((old_cluster.port = atoi(optarg)) <= 0)
- {
pg_fatal("invalid old port number\n");
- exit(1);
- }
break;
case 'P':
if ((new_cluster.port = atoi(optarg)) <= 0)
- {
pg_fatal("invalid new port number\n");
- exit(1);
- }
break;
case 'r':
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 5e617e97c0f..5b82e0c79bd 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -105,11 +105,8 @@ main(int argc, char **argv)
/* Set mask based on PGDATA permissions */
if (!GetDataDirectoryCreatePerm(new_cluster.pgdata))
- {
- pg_log(PG_FATAL, "could not read permissions of directory \"%s\": %s\n",
- new_cluster.pgdata, strerror(errno));
- exit(1);
- }
+ pg_fatal("could not read permissions of directory \"%s\": %s\n",
+ new_cluster.pgdata, strerror(errno));
umask(pg_mode_mask);