aboutsummaryrefslogtreecommitdiff
path: root/coreutils/ls.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r--coreutils/ls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index b8da1adbb..e7544474b 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -550,7 +550,7 @@ static void showfiles(struct dnode **dn, unsigned nfiles)
550 } else { 550 } else {
551 /* find the longest file name, use that as the column width */ 551 /* find the longest file name, use that as the column width */
552 for (i = 0; dn[i]; i++) { 552 for (i = 0; dn[i]; i++) {
553 int len = bb_mbstrlen(dn[i]->name); 553 int len = unicode_strlen(dn[i]->name);
554 if (column_width < len) 554 if (column_width < len)
555 column_width = len; 555 column_width = len;
556 } 556 }
@@ -742,7 +742,7 @@ static int print_name(const char *name)
742{ 742{
743 if (option_mask32 & OPT_Q) { 743 if (option_mask32 & OPT_Q) {
744#if ENABLE_FEATURE_ASSUME_UNICODE 744#if ENABLE_FEATURE_ASSUME_UNICODE
745 unsigned len = 2 + bb_mbstrlen(name); 745 unsigned len = 2 + unicode_strlen(name);
746#else 746#else
747 unsigned len = 2; 747 unsigned len = 2;
748#endif 748#endif
@@ -762,7 +762,7 @@ static int print_name(const char *name)
762 /* No -Q: */ 762 /* No -Q: */
763#if ENABLE_FEATURE_ASSUME_UNICODE 763#if ENABLE_FEATURE_ASSUME_UNICODE
764 fputs(name, stdout); 764 fputs(name, stdout);
765 return bb_mbstrlen(name); 765 return unicode_strlen(name);
766#else 766#else
767 return printf("%s", name); 767 return printf("%s", name);
768#endif 768#endif