Skip to content

Enable system locale - change from the standard (C) to system locale. #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable system locale - change from the standard (C) to system locale. #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions genext2fs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@
#ifdef HAVE_LIBARCHIVE
#include <archive.h>
#include <archive_entry.h>
#include <locale.h>
#endif

#include "cache.h"
Expand Down Expand Up @@ -2475,6 +2476,22 @@ add2fs_from_tarball(filesystem *fs, uint32 this_nod, FILE * fh, int squash_uids,
char *path2, *path3, *dir, *name, *lnk;
size_t filesize;
uint32 uid, gid, mode, ctime, mtime;
locale_t archive_locale;
locale_t old_locale;
/*
* Enable system locale - change from the standard (C) to system locale.
* This allows libarchive (in case it is activated) to handle filenames.
* We only change LC_CTYPE since libarchive only needs the charset set.
* We don't use LC_ALL because it causes problems on some systems.
* We restore the original LC_CTYPE after extraction to avoid side effects.
* We use uselocale instead of setlocale to avoid setting LC_CTYPE globally.
* See on libarchive Website for a more complete description of the issue:
* https://github.com/libarchive/libarchive/issues/587
* https://github.com/libarchive/libarchive/wiki/Filenames
* https://github.com/sbabic/swupdate/blob/master/handlers/archive_handler.c#L94
*/
archive_locale = newlocale(LC_CTYPE_MASK, "", (locale_t)0);
old_locale = uselocale(archive_locale);
a = archive_read_new();
if (a == NULL)
error_msg_and_die("Couldn't create archive reader.");
Expand Down Expand Up @@ -2596,6 +2613,8 @@ add2fs_from_tarball(filesystem *fs, uint32 this_nod, FILE * fh, int squash_uids,
}
archive_read_close(a);
archive_read_free(a);
uselocale(old_locale);
freelocale(archive_locale);
#endif
}

Expand Down