rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly clear the verbose output of pg_basebackup 

Don't leave partial filename information on the last status or
dangling characters if the previous filename was longer than
the current one.
This commit is contained in:
Magnus Hagander 2011-03-19 16:38:50 +01:00
parent 56bb7f2a02
commit 4a0014806d
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/pg_basebackup/pg_basebackup.c
View File

@ -207,11 +207,24 @@ progress_report(int tablespacenum, char *fn)
percent = 100;
if (verbose)
fprintf(stderr,
INT64_FORMAT "/" INT64_FORMAT " kB (%i%%) %i/%i tablespaces (%-30s)\r",
totaldone / 1024, totalsize,
percent,
tablespacenum, tablespacecount, fn);
{
if (!fn)
/*
* No filename given, so clear the status line (used for last
* call)
*/
fprintf(stderr,
INT64_FORMAT "/" INT64_FORMAT " kB (100%%) %i/%i tablespaces %35s\r",
totaldone / 1024, totalsize,
tablespacenum, tablespacecount, "");
else
fprintf(stderr,
INT64_FORMAT "/" INT64_FORMAT " kB (%i%%) %i/%i tablespaces (%-30.30s)\r",
totaldone / 1024, totalsize,
percent,
tablespacenum, tablespacecount, fn);
}
else
fprintf(stderr, INT64_FORMAT "/" INT64_FORMAT " kB (%i%%) %i/%i tablespaces\r",
totaldone / 1024, totalsize,
@ -871,7 +884,7 @@ BaseBackup()
if (showprogress)
{
progress_report(PQntuples(res), "");
progress_report(PQntuples(res), NULL);
fprintf(stderr, "\n"); /* Need to move to next line */
}
PQclear(res);