From b690daa95f8cd452413c68a35fee8e6b84b612f3 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 4 Dec 2019 11:58:28 +0100 Subject: [PATCH] all: Call setlocale() at the start of main() This fixes some broken characters in the fprintd debug output. --- src/main.c | 2 ++ utils/delete.c | 3 +++ utils/enroll.c | 3 +++ utils/list.c | 3 +++ utils/verify.c | 3 +++ 5 files changed, 14 insertions(+) diff --git a/src/main.c b/src/main.c index 119d229..8f7e19c 100644 --- a/src/main.c +++ b/src/main.c @@ -136,6 +136,8 @@ int main(int argc, char **argv) DBusGProxy *driver_proxy; guint32 request_name_ret; + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); diff --git a/utils/delete.c b/utils/delete.c index 62d4370..9ecc7cb 100644 --- a/utils/delete.c +++ b/utils/delete.c @@ -19,6 +19,7 @@ #include #include +#include #include #include "manager-dbus-glue.h" #include "device-dbus-glue.h" @@ -125,6 +126,8 @@ static void process_devices(char **argv) int main(int argc, char **argv) { + setlocale (LC_ALL, ""); + create_manager(); if (argc < 2) { diff --git a/utils/enroll.c b/utils/enroll.c index a368587..366f04a 100644 --- a/utils/enroll.c +++ b/utils/enroll.c @@ -19,6 +19,7 @@ #include #include +#include #include #include "manager-dbus-glue.h" #include "device-dbus-glue.h" @@ -159,6 +160,8 @@ int main(int argc, char **argv) GError *err = NULL; DBusGProxy *dev; + setlocale (LC_ALL, ""); + dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID); diff --git a/utils/list.c b/utils/list.c index 2bbbe33..2284c4c 100644 --- a/utils/list.c +++ b/utils/list.c @@ -19,6 +19,7 @@ #include #include +#include #include #include "manager-dbus-glue.h" #include "device-dbus-glue.h" @@ -130,6 +131,8 @@ static void process_devices(char **argv) int main(int argc, char **argv) { + setlocale (LC_ALL, ""); + create_manager(); if (argc < 2) { diff --git a/utils/verify.c b/utils/verify.c index 19fd40b..73637c7 100644 --- a/utils/verify.c +++ b/utils/verify.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "manager-dbus-glue.h" #include "device-dbus-glue.h" @@ -172,6 +173,8 @@ int main(int argc, char **argv) DBusGProxy *dev; char *username; + setlocale (LC_ALL, ""); + dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);