Changeset 2387

Timestamp:

03/21/04 19:57:09 (9 years ago)

Author:

khali

Message:

Print the degree symbol in the terminal's current locale. Original

patch by Aurelien Jarno.

Files:

• lm-sensors/trunk/prog/sensors/main.c (modified) (3 diffs)

lm-sensors/trunk/prog/sensors/main.c

@@ -25 +25 @@
 #include <locale.h>
 #include <langinfo.h>
+#include <iconv.h>
 
 #include "lib/sensors.h" 
@@ -155 +156 @@
 }
 
+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]), &deg_latin1_size,
+                  &degstr_ptr, &degstr_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[])
 {
@@ -254 +280 @@
 
   /* 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)) {