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

unzip: use printable_string() for printing filenames

Browse Source 
function                                             old     new   delta
unzip_main                                          2726    2792     +66
printable_string2                                      -      57     +57
identify                                            4329    4336      +7
expmeta                                              659     663      +4
add_interface                                         99     103      +4
beep_main                                            286     289      +3
changepath                                           192     194      +2
builtin_type                                         115     117      +2
devmem_main                                          469     470      +1
input_tab                                           1076    1074      -2
create_J                                            1821    1819      -2
poplocalvars                                         314     311      -3
doCommands                                          2222    2214      -8
do_load                                              918     902     -16
printable_string                                      57       9     -48
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 8/6 up/down: 146/-79)            Total: 67 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2018-09-30 16:56:56 +02:00
parent 14454b3071
commit 349d72c19c
7 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libbb/lineedit.c
View File

@ -1086,7 +1086,7 @@ static void showfiles(void)
);
}
if (ENABLE_UNICODE_SUPPORT)
puts(printable_string(NULL, matches[n]));
puts(printable_string(matches[n]));
else
puts(matches[n]);
}

7
libbb/printable_string.c
View File

@ -9,7 +9,7 @@
#include "libbb.h"
#include "unicode.h"
const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
const char* FAST_FUNC printable_string2(uni_stat_t *stats, const char *str)
{
char *dst;
const char *s;
@ -55,3 +55,8 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
#endif
return auto_string(dst);
}
const char* FAST_FUNC printable_string(const char *str)
{
return printable_string2(NULL, str);
}

2
libbb/unicode.c
View File

@ -996,7 +996,7 @@ size_t FAST_FUNC unicode_strlen(const char *string)
size_t FAST_FUNC unicode_strwidth(const char *string)
{
uni_stat_t uni_stat;
printable_string(&uni_stat, string);
printable_string2(&uni_stat, string);
return uni_stat.unicode_width;
}