summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2011-02-11 18:56:13 +0100
committerDenys Vlasenko2011-02-11 18:56:13 +0100
commitd55e13964916af6a083be881bffdb493af287c1d (patch)
tree399af6f19989d3efedb0a66f0e7b99184b245bb9 /libbb
parente52e67cb512e775fd83ca399cc807c363ba59dcc (diff)
downloadbusybox-d55e13964916af6a083be881bffdb493af287c1d.zip
busybox-d55e13964916af6a083be881bffdb493af287c1d.tar.gz
progress meter: move file name to bb_progress_t. +20 bytes
We were doing expensive unicode conversion on every update Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/progress.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/libbb/progress.c b/libbb/progress.c
index 1062e9a..1d260dd 100644
--- a/libbb/progress.c
+++ b/libbb/progress.c
@@ -52,12 +52,17 @@ static unsigned int get_tty2_width(void)
return width;
}
-void FAST_FUNC bb_progress_init(bb_progress_t *p)
+void FAST_FUNC bb_progress_init(bb_progress_t *p, const char *curfile)
{
+#if ENABLE_UNICODE_SUPPORT
+ init_unicode();
+ p->curfile = unicode_conv_to_printable_fixedwidth(/*NULL,*/ curfile, 20);
+#else
+ p->curfile = curfile;
+#endif
p->start_sec = monotonic_sec();
p->lastupdate_sec = p->start_sec;
p->lastsize = 0;
- p->inited = 1;
}
/* File already had beg_size bytes.
@@ -68,7 +73,6 @@ void FAST_FUNC bb_progress_init(bb_progress_t *p)
* If totalsize == 0, then it is unknown.
*/
void FAST_FUNC bb_progress_update(bb_progress_t *p,
- const char *curfile,
uoff_t beg_size,
uoff_t transferred,
uoff_t totalsize)
@@ -130,16 +134,10 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
beg_and_transferred = beg_size + transferred;
ratio = 100 * beg_and_transferred / totalsize;
-#if ENABLE_UNICODE_SUPPORT
- init_unicode();
- {
- char *buf = unicode_conv_to_printable_fixedwidth(/*NULL,*/ curfile, 20);
- fprintf(stderr, "\r%s%4u%% ", buf, ratio);
- free(buf);
- }
-#else
- fprintf(stderr, "\r%-20.20s%4u%% ", curfile, ratio);
-#endif
+ if (ENABLE_UNICODE_SUPPORT)
+ fprintf(stderr, "\r%s%4u%% ", p->curfile, ratio);
+ else
+ fprintf(stderr, "\r%-20.20s%4u%% ", p->curfile, ratio);
barlength = get_tty2_width() - 49;
if (barlength > 0) {