From 89a0ffa1ba96e412d35009aca6e1fd336272f9ff Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Mon, 19 Apr 2021 04:01:39 +0000 Subject: Force UTF-8 locale and add to chroot, link to cursesw --- Makefile | 4 +++- play.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f8c597c..372ee3d 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ CHROOT_GROUP = ${CHROOT_USER} CFLAGS += -std=c11 -Wall -Wextra LDFLAGS = -static -LDLIBS = -lcurses +LDLIBS = -lcursesw -include config.mk @@ -25,8 +25,10 @@ chroot.tar: play root \ root/bin \ root/home \ + root/usr/share/locale \ root/usr/share/misc install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} root/home/${CHROOT_USER} + cp -LRfp /usr/share/locale/en_US.UTF-8 root/usr/share/locale cp -fp /usr/share/misc/termcap.db root/usr/share/misc cp -fp /rescue/sh root/bin install play root/bin diff --git a/play.c b/play.c index b895e9e..345dcd1 100644 --- a/play.c +++ b/play.c @@ -266,7 +266,7 @@ static void info(void) { } int main(int argc, char *argv[]) { - setlocale(LC_CTYPE, ""); + setlocale(LC_CTYPE, "en_US.UTF-8"); atexit(info); const char *path = NULL; -- cgit 1.4.1