48c7b48f9
Denys Vlasenko
2026-04-30
Subject
tar: unicode fix
Binary
No binary (build failed)
Architecture & Compiler Flags
gcc -Wp,-MD,applets/.usage.d -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -Iinclude -Iinclude -o applets/usage applets/usage.c
Build Log
(log yok)
Commit Diff GitHub →
archival/tar.c+4 -0
| @@ -119,6 +119,7 @@ | |
| #include "libbb.h" | |
| #include "common_bufsiz.h" | |
| #include "bb_archive.h" | |
| + | #include "unicode.h" |
| /* FIXME: Stop using this non-standard feature */ | |
| #ifndef FNM_LEADING_DIR | |
| # define FNM_LEADING_DIR 0 | |
| @@ -1133,6 +1134,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv) | |
| if (tar_handle->accept || tar_handle->reject) | |
| tar_handle->filter = filter_accept_reject_list; | |
| + | /* For "tar xvf/tvf" output and Unicode in names */ |
| + | init_unicode(); |
| + | |
| /* Open the tar file */ | |
| { | |
| int tar_fd = STDIN_FILENO; | |
testsuite/tar.tests+1 -1
| @@ -318,8 +318,8 @@ if test x"$CONFIG_UNICODE_USING_LOCALE" != x"y"; then | |
| mkdir tar.tempdir && cd tar.tempdir || exit 1 | |
| optional UNICODE_SUPPORT FEATURE_TAR_GNU_EXTENSIONS FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT | |
| testing "tar Pax-encoded UTF8 names and symlinks" '\ | |
| - | tar xvf ../tar.utf8.tar.bz2 2>&1; echo $? |
| export LANG=en_US.UTF-8 | |
| + | tar xvf ../tar.utf8.tar.bz2 2>&1; echo $? |
| ls -l etc/ssl/certs/* | sed "s:.*etc/:etc/:" | sort | |
| unset LANG | |
| rm -rf etc usr | |