diff options
author | Ron Yorston <rmy@pobox.com> | 2018-10-08 08:31:11 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-10-08 08:31:11 +0100 |
commit | eee3722fd32c8c0929cfbacdbe0b6524e1fd645c (patch) | |
tree | c9026160e56f204c42029c705d1d16cecd515244 /coreutils/ls.c | |
parent | 25a1bcec7637e0f0c75d3ae6c09eb78fdb6f0a75 (diff) | |
parent | 349d72c19ced4fae64e8fdd5792b37e78ac2f616 (diff) | |
download | busybox-w32-eee3722fd32c8c0929cfbacdbe0b6524e1fd645c.tar.gz busybox-w32-eee3722fd32c8c0929cfbacdbe0b6524e1fd645c.tar.bz2 busybox-w32-eee3722fd32c8c0929cfbacdbe0b6524e1fd645c.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r-- | coreutils/ls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 9daa15470..fb4f998be 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -421,7 +421,7 @@ static unsigned calc_name_len(const char *name) | |||
421 | uni_stat_t uni_stat; | 421 | uni_stat_t uni_stat; |
422 | 422 | ||
423 | // TODO: quote tab as \t, etc, if -Q | 423 | // TODO: quote tab as \t, etc, if -Q |
424 | name = printable_string(&uni_stat, name); | 424 | name = printable_string2(&uni_stat, name); |
425 | 425 | ||
426 | if (!(option_mask32 & OPT_Q)) { | 426 | if (!(option_mask32 & OPT_Q)) { |
427 | return uni_stat.unicode_width; | 427 | return uni_stat.unicode_width; |
@@ -450,7 +450,7 @@ static unsigned print_name(const char *name) | |||
450 | uni_stat_t uni_stat; | 450 | uni_stat_t uni_stat; |
451 | 451 | ||
452 | // TODO: quote tab as \t, etc, if -Q | 452 | // TODO: quote tab as \t, etc, if -Q |
453 | name = printable_string(&uni_stat, name); | 453 | name = printable_string2(&uni_stat, name); |
454 | 454 | ||
455 | if (!(option_mask32 & OPT_Q)) { | 455 | if (!(option_mask32 & OPT_Q)) { |
456 | fputs(name, stdout); | 456 | fputs(name, stdout); |