From 8028a99ac03c32c7373cf54ea9adf7624143e758 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 21 Mar 2004 18:57:09 +0000 Subject: [PATCH] Print the degree symbol in the terminal's current locale. Original patch by Aurelien Jarno. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2387 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/sensors/main.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/prog/sensors/main.c b/prog/sensors/main.c index 9f9605e4..a22d534a 100644 --- a/prog/sensors/main.c +++ b/prog/sensors/main.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "lib/sensors.h" #include "lib/error.h" @@ -154,6 +155,31 @@ void close_config_file(void) free(config_file_name); } +static void set_degstr(void) +{ + /* Size hardcoded for better performance. + Don't forget to count the trailing \0! */ + size_t deg_latin1_size = 3; + char *deg_latin1_text[2] = {"\260C", "\260F"}; + const char *deg_default_text[2] = {" C", " F"}; + size_t nconv; + size_t degstr_size = sizeof(degstr); + char *degstr_ptr = degstr; + + iconv_t cd = iconv_open(nl_langinfo(CODESET), "ISO-8859-1"); + if (cd != (iconv_t) -1) { + nconv = iconv(cd, &(deg_latin1_text[fahrenheit]), °_latin1_size, + °str_ptr, °str_size); + iconv_close(cd); + + if (nconv != (size_t) -1) + return; + } + + /* There was an error during the conversion, use the default text */ + strcpy(degstr, deg_default_text[fahrenheit]); +} + int main (int argc, char *argv[]) { int c,res,i,error; @@ -253,15 +279,7 @@ int main (int argc, char *argv[]) close_config_file(); /* build the degrees string */ - if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) - sprintf(degstr, "%c%c", 0xc2, 0xb0); - else - sprintf(degstr, "%c", 176); - if (fahrenheit) { - strcat(degstr, "F"); - } else { - strcat(degstr, "C"); - } + set_degstr(); if(do_the_real_work(&error)) { sensors_cleanup();