add check for interrupt in prompt for password

alubennikova · alubennikova · commit 25762c283076 · 2017-09-01T11:51:49.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -447,8 +447,7 @@ do_backup(void)
 			elog(ERROR, "Options for connection to master must be provided to perform backup from replica");
 
 		/* Create connection to master server */
-		master_conn = pgut_connect_extended(master_host, master_port,
-											master_db, master_user, password);
+		master_conn = pgut_connect_extended(master_host, master_port, master_db, master_user);
 	}
 
 	/* Get exclusive lock of backup catalog */
diff --git a/src/utils/pgut.c b/src/utils/pgut.c
@@ -1015,12 +1015,12 @@ prompt_for_password(const char *username)
 PGconn *
 pgut_connect(const char *dbname)
 {
-	return pgut_connect_extended(host, port, dbname, username, password);
+	return pgut_connect_extended(host, port, dbname, username);
 }
 
 PGconn *
 pgut_connect_extended(const char *pghost, const char *pgport,
-					  const char *dbname, const char *login, const char *pwd)
+					  const char *dbname, const char *login)
 {
 	PGconn	   *conn;
 
@@ -1031,7 +1031,7 @@ pgut_connect_extended(const char *pghost, const char *pgport,
 	for (;;)
 	{
 		conn = PQsetdbLogin(pghost, pgport, NULL, NULL,
-							dbname, login, pwd);
+							dbname, login, password);
 
 		if (PQstatus(conn) == CONNECTION_OK)
 			return conn;
@@ -1040,6 +1040,10 @@ pgut_connect_extended(const char *pghost, const char *pgport,
 		{
 			PQfinish(conn);
 			prompt_for_password(username);
+
+			if (interrupted)
+				elog(ERROR, "interrupted");
+
 			continue;
 		}
 		elog(ERROR, "could not connect to database %s: %s",
diff --git a/src/utils/pgut.h b/src/utils/pgut.h
@@ -117,8 +117,7 @@ extern void pgut_atexit_pop(pgut_atexit_callback callback, void *userdata);
  */
 extern PGconn *pgut_connect(const char *dbname);
 extern PGconn *pgut_connect_extended(const char *pghost, const char *pgport,
-									 const char *dbname, const char *login,
-									 const char *pwd);
+									 const char *dbname, const char *login);
 extern void pgut_disconnect(PGconn *conn);
 extern PGresult *pgut_execute(PGconn* conn, const char *query, int nParams, const char **params);
 extern bool pgut_send(PGconn* conn, const char *query, int nParams, const char **params, int elevel);

Original file line number	Diff line number	Diff line change
`@@ -447,8 +447,7 @@ do_backup(void)`
`447`	`447`	`elog(ERROR, "Options for connection to master must be provided to perform backup from replica");`
`448`	`448`
`449`	`449`	`/* Create connection to master server */`
`450`		`- master_conn = pgut_connect_extended(master_host, master_port,`
`451`		`- master_db, master_user, password);`
	`450`	`+ master_conn = pgut_connect_extended(master_host, master_port, master_db, master_user);`
`452`	`451`	`}`
`453`	`452`
`454`	`453`	`/* Get exclusive lock of backup catalog */`
Original file line number	Diff line number	Diff line change
`@@ -1015,12 +1015,12 @@ prompt_for_password(const char *username)`
`1015`	`1015`	`PGconn *`
`1016`	`1016`	`pgut_connect(const char *dbname)`
`1017`	`1017`	`{`
`1018`		`- return pgut_connect_extended(host, port, dbname, username, password);`
	`1018`	`+ return pgut_connect_extended(host, port, dbname, username);`
`1019`	`1019`	`}`
`1020`	`1020`
`1021`	`1021`	`PGconn *`
`1022`	`1022`	`pgut_connect_extended(const char pghost, const char pgport,`
`1023`		`- const char dbname, const char login, const char *pwd)`
	`1023`	`+ const char dbname, const char login)`
`1024`	`1024`	`{`
`1025`	`1025`	`PGconn *conn;`
`1026`	`1026`
`@@ -1031,7 +1031,7 @@ pgut_connect_extended(const char pghost, const char pgport,`
`1031`	`1031`	`for (;;)`
`1032`	`1032`	`{`
`1033`	`1033`	`conn = PQsetdbLogin(pghost, pgport, NULL, NULL,`
`1034`		`- dbname, login, pwd);`
	`1034`	`+ dbname, login, password);`
`1035`	`1035`
`1036`	`1036`	`if (PQstatus(conn) == CONNECTION_OK)`
`1037`	`1037`	`return conn;`
`@@ -1040,6 +1040,10 @@ pgut_connect_extended(const char pghost, const char pgport,`
`1040`	`1040`	`{`
`1041`	`1041`	`PQfinish(conn);`
`1042`	`1042`	`prompt_for_password(username);`
	`1043`	`+`
	`1044`	`+ if (interrupted)`
	`1045`	`+ elog(ERROR, "interrupted");`
	`1046`	`+`
`1043`	`1047`	`continue;`
`1044`	`1048`	`}`
`1045`	`1049`	`elog(ERROR, "could not connect to database %s: %s",`