root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xzdec: Use tuklib_mbstr_nonprint

This commit is contained in:
Lasse Collin 2024-12-18 14:00:09 +02:00
parent d22f96921f
commit 03111595ee
No known key found for this signature in database
GPG Key ID: 38EE757D69184620
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1861,6 +1861,8 @@ if(HAVE_DECODERS)
src/common/sysdefs.h src/common/sysdefs.h
src/common/tuklib_common.h src/common/tuklib_common.h
src/common/tuklib_config.h src/common/tuklib_config.h
src/common/tuklib_mbstr_nonprint.c
src/common/tuklib_mbstr_nonprint.h
src/common/tuklib_exit.c src/common/tuklib_exit.c
src/common/tuklib_exit.h src/common/tuklib_exit.h
src/common/tuklib_gettext.h src/common/tuklib_gettext.h
@ -1891,6 +1893,7 @@ if(HAVE_DECODERS)
endif() endif()
tuklib_progname("${XZDEC}") tuklib_progname("${XZDEC}")
tuklib_mbstr("${XZDEC}")
install(TARGETS "${XZDEC}" install(TARGETS "${XZDEC}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"

2
src/xzdec/Makefile.am
View File

@ -11,6 +11,7 @@
xzdec_SOURCES = \ xzdec_SOURCES = \
xzdec.c \ xzdec.c \
../common/tuklib_progname.c \ ../common/tuklib_progname.c \
../common/tuklib_mbstr_nonprint.c \
../common/tuklib_exit.c ../common/tuklib_exit.c
if COND_W32 if COND_W32
@ -34,6 +35,7 @@ xzdec_LDADD += $(LTLIBINTL)
lzmadec_SOURCES = \ lzmadec_SOURCES = \
xzdec.c \ xzdec.c \
../common/tuklib_progname.c \ ../common/tuklib_progname.c \
../common/tuklib_mbstr_nonprint.c \
../common/tuklib_exit.c ../common/tuklib_exit.c
if COND_W32 if COND_W32

13
src/xzdec/xzdec.c
View File

@ -43,6 +43,7 @@
#include "getopt.h" #include "getopt.h"
#include "tuklib_gettext.h" #include "tuklib_gettext.h"
#include "tuklib_progname.h" #include "tuklib_progname.h"
#include "tuklib_mbstr_nonprint.h"
#include "tuklib_exit.h" #include "tuklib_exit.h"
#ifdef TUKLIB_DOSLIKE #ifdef TUKLIB_DOSLIKE
@ -210,7 +211,8 @@ uncompress(lzma_stream *strm, FILE *file, const char *filename)
// an error occurred. ferror() doesn't // an error occurred. ferror() doesn't
// touch errno. // touch errno.
my_errorf("%s: Error reading input file: %s", my_errorf("%s: Error reading input file: %s",
filename, strerror(errno)); tuklib_mask_nonprint(filename),
strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -293,7 +295,8 @@ uncompress(lzma_stream *strm, FILE *file, const char *filename)
break; break;
} }
my_errorf("%s: %s", filename, msg); my_errorf("%s: %s", tuklib_mask_nonprint(filename),
msg);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
@ -423,6 +426,8 @@ main(int argc, char **argv)
// We need to set the locale even though we don't have any // We need to set the locale even though we don't have any
// translated messages: // translated messages:
// //
// - tuklib_mask_nonprint() has locale-specific behavior (LC_CTYPE).
//
// - This is needed on Windows to make non-ASCII filenames display // - This is needed on Windows to make non-ASCII filenames display
// properly when the active code page has been set to UTF-8 // properly when the active code page has been set to UTF-8
// in the application manifest. Use the helper macro from // in the application manifest. Use the helper macro from
@ -465,7 +470,9 @@ main(int argc, char **argv)
src_name = argv[optind]; src_name = argv[optind];
src_file = fopen(src_name, "rb"); src_file = fopen(src_name, "rb");
if (src_file == NULL) { if (src_file == NULL) {
my_errorf("%s: %s", src_name, my_errorf("%s: %s",
tuklib_mask_nonprint(
src_name),
strerror(errno)); strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }