security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

gpg: Extend the PROGRESS line to give the used unit.

Browse source 
* g10/progress.c (write_status_progress): Print the units parameter.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-08-09 16:22:24 +02:00
parent 49829c29e5
commit 16feb1e0ea
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
g10/progress.c
View file

@ -75,7 +75,9 @@ static void
write_status_progress (const char *what,
unsigned long current, unsigned long total)
{
char buffer[50];
char buffer[60];
char units[] = "BKMGTPEZY?";
int unitidx = 0;
/* Although we use an unsigned long for the values, 32 bit
* applications using GPGME will use an "int" and thus are limited
@ -98,6 +100,7 @@ write_status_progress (const char *what,
{
total /= 1024;
current /= 1024;
unitidx++;
}
}
else
@ -105,11 +108,17 @@ write_status_progress (const char *what,
while (current > 1024*1024)
{
current /= 1024;
unitidx++;
}
}
snprintf (buffer, sizeof buffer, "%.20s ? %lu %lu",
what? what : "?", current, total);
if (unitidx > 9)
unitidx = 9;
snprintf (buffer, sizeof buffer, "%.20s ? %lu %lu %c%s",
what? what : "?", current, total,
units[unitidx],
unitidx? "iB" : "");
write_status_text (STATUS_PROGRESS, buffer);
}