Split apart pg_upgrade user lookup and root check so '--help' shows

bmomjian · bmomjian · commit 00be75415c3c · 2010-05-24T16:34:35.000Z
proper default username.
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
@@ -48,7 +48,8 @@ parseCommandLine(migratorContext *ctx, int argc, char *argv[])
 	};
 	char		option;			/* Command line option */
 	int			optindex = 0;	/* used by getopt_long */
-
+	int			user_id;
+	
 	if (getenv("PGUSER"))
 	{
 		pg_free(ctx->user);
@@ -62,6 +63,9 @@ parseCommandLine(migratorContext *ctx, int argc, char *argv[])
 
 	ctx->transfer_mode = TRANSFER_MODE_COPY;
 
+	/* user lookup and 'root' test must be split because of usage() */
+	user_id = get_user_info(ctx, &ctx->user);
+	
 	if (argc > 1)
 	{
 		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 ||
@@ -77,7 +81,7 @@ parseCommandLine(migratorContext *ctx, int argc, char *argv[])
 		}
 	}
 
-	if ((get_user_info(ctx, &ctx->user)) == 0)
+	if (user_id == 0)
 		pg_log(ctx, PG_FATAL, "%s: cannot be run as root\n", ctx->progname);
 
 #ifndef WIN32

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ parseCommandLine(migratorContext ctx, int argc, char argv[])`
`48`	`48`	`};`
`49`	`49`	`char option; /* Command line option */`
`50`	`50`	`int optindex = 0; /* used by getopt_long */`
`51`		`-`
	`51`	`+ int user_id;`
	`52`	`+`
`52`	`53`	`if (getenv("PGUSER"))`
`53`	`54`	`{`
`54`	`55`	`pg_free(ctx->user);`
`@@ -62,6 +63,9 @@ parseCommandLine(migratorContext ctx, int argc, char argv[])`
`62`	`63`
`63`	`64`	`ctx->transfer_mode = TRANSFER_MODE_COPY;`
`64`	`65`
	`66`	`+ /* user lookup and 'root' test must be split because of usage() */`
	`67`	`+ user_id = get_user_info(ctx, &ctx->user);`
	`68`	`+`
`65`	`69`	`if (argc > 1)`
`66`	`70`	`{`
`67`	`71`	`if (strcmp(argv[1], "--help") == 0 \|\| strcmp(argv[1], "-h") == 0 \|\|`
`@@ -77,7 +81,7 @@ parseCommandLine(migratorContext ctx, int argc, char argv[])`
`77`	`81`	`}`
`78`	`82`	`}`
`79`	`83`
`80`		`- if ((get_user_info(ctx, &ctx->user)) == 0)`
	`84`	`+ if (user_id == 0)`
`81`	`85`	`pg_log(ctx, PG_FATAL, "%s: cannot be run as root\n", ctx->progname);`
`82`	`86`
`83`	`87`	`#ifndef WIN32`