Merge branch 'origin/master' (early part)

1 files changed, 6 insertions, 3 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index f7faf4639..ab418c0ab 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1000,7 +1000,7 @@ static void showfiles(void)
 
         /* find the longest file name - use that as the column width */
         for (row = 0; row < nrows; row++) {
-                l = unicode_strlen(matches[row]);
+                l = unicode_strwidth(matches[row]);
                 if (column_width < l)
                         column_width = l;
         }
@@ -1020,10 +1020,13 @@ static void showfiles(void)
 
                 for (nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) {
                         printf("%s%-*s", matches[n],
-                                (int)(column_width - unicode_strlen(matches[n])), ""
+                                (int)(column_width - unicode_strwidth(matches[n])), ""
                         );
                 }
-                puts(matches[n]);
+                if (ENABLE_UNICODE_SUPPORT)
+                        puts(printable_string(NULL, matches[n]));
+                else
+                        puts(matches[n]);
         }
 }