emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: progress indicator: use unicode support funcs instead of open-coding it

Browse Source 
function                                             old     new   delta
bb_progress_update                                   729     641     -88

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko 2011-01-10 16:10:29 +01:00
parent 84dba9c5bb
commit 0f44c08560
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libbb/progress.c
View File

@ -93,22 +93,9 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
#if ENABLE_UNICODE_SUPPORT #if ENABLE_UNICODE_SUPPORT
init_unicode(); init_unicode();
/* libbb candidate? */
{ {
wchar_t wbuf21[21]; char *buf = unicode_conv_to_printable_fixedwidth(NULL, curfile, 20);
char *buf = xstrdup(curfile); fprintf(stderr, "\r%s%4u%% ", buf, ratio);
unsigned len;
/* trim to 20 wide chars max (sets wbuf21[20] to 0)
* also, in case mbstowcs fails, we at least
* dont get garbage */
memset(wbuf21, 0, sizeof(wbuf21));
/* convert to wide chars, no more than 20 */
len = mbstowcs(wbuf21, curfile, 20); /* NB: may return -1 */
/* back to multibyte; cant overflow */
wcstombs(buf, wbuf21, INT_MAX);
len = (len > 20) ? 0 : 20 - len;
fprintf(stderr, "\r%s%*s%4u%% ", buf, len, "", ratio);
free(buf); free(buf);
} }
#else #else
@ -158,7 +145,8 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p,
/* (long long helps to have working ETA even if !LFS) */ /* (long long helps to have working ETA even if !LFS) */
unsigned eta = (unsigned long long)to_download*elapsed/(uoff_t)transferred - elapsed; unsigned eta = (unsigned long long)to_download*elapsed/(uoff_t)transferred - elapsed;
unsigned secs = eta % 3600; unsigned secs = eta % 3600;
fprintf(stderr, "%02u:%02u:%02u ETA", eta / 3600, secs / 60, secs % 60); unsigned hours = eta / 3600;
fprintf(stderr, "%02u:%02u:%02u ETA", hours, secs / 60, secs % 60);
} }
} }
} }