From 037cbacb8c5081313ea65024d4305d29a47165e0 Mon Sep 17 00:00:00 2001 From: dudemanguy Date: Fri, 3 May 2019 11:54:31 -0500 Subject: libarchive: add fallback for systems without C.UTF-8 --- stream/stream_libarchive.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'stream') diff --git a/stream/stream_libarchive.c b/stream/stream_libarchive.c index e5acad016b..ae06efb890 100644 --- a/stream/stream_libarchive.c +++ b/stream/stream_libarchive.c @@ -244,8 +244,11 @@ struct mp_archive *mp_archive_new(struct mp_log *log, struct stream *src, struct mp_archive *mpa = talloc_zero(NULL, struct mp_archive); mpa->log = log; mpa->locale = newlocale(LC_ALL_MASK, "C.UTF-8", (locale_t)0); - if (!mpa->locale) - goto err; + if (!mpa->locale) { + mpa->locale = newlocale(LC_CTYPE_MASK, "", (locale_t)0); + if (!mpa->locale) + goto err; + } mpa->arch = archive_read_new(); mpa->primary_src = src; if (!mpa->arch) -- cgit v1.2.3