Changeset 5286

Timestamp:

06/19/08 10:38:44 (5 years ago)

Author:

khali

Message:

The configuration file is currently parsed in the locale set by the main
program using the library. This means that if the decimal separator
(defined in LC_NUMERIC) is not '.' the values in the compute lines are
truncated. This happens for example with sensors-applet and a French
locale.

 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469333

Parsing the configuration file in C locale fixes the problem.
Original patch from Aurelien Jarno. Also closes ticket #2312.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/init.c (modified) (3 diffs)

lm-sensors/trunk/CHANGES

@@ -4 +4 @@
 SVN-HEAD
   Library: Don't choke on unrecognized devices, part 2
+           Parse the configuration file in C locale (#2312)
   Module asb100: Remove some dead code (2.6 backport)
   Module i2c-amd756: Fix functionality flags (2.6 backport)

lm-sensors/trunk/lib/init.c

@@ -18 +18 @@
 */
 
+#include <locale.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "sensors.h"
 #include "data.h"
@@ -39 +41 @@
 static void free_ignore(sensors_ignore ignore);
 
+/* Wrapper around sensors_yyparse(), which clears the locale so that
+   the decimal numbers are always parsed properly. */
+static int sensors_parse(void)
+{
+  int res;
+  char *locale;
+
+  /* Remember the current locale and clear it */
+  locale = setlocale(LC_ALL, NULL);
+  if (locale) {
+    locale = strdup(locale);
+    setlocale(LC_ALL, "C");
+  }
+
+  res = sensors_yyparse();
+
+  /* Restore the old locale */
+  if (locale) {
+    setlocale(LC_ALL, locale);
+    free(locale);
+  }
+
+  return res;
+}
+
 int sensors_init(FILE *input)
 {
@@ -52 +79 @@
   if ((res = sensors_scanner_init(input)))
     return -SENSORS_ERR_PARSE;
-  if ((res = sensors_yyparse()))
+  if ((res = sensors_parse()))
     return -SENSORS_ERR_PARSE;
   if ((res = sensors_substitute_busses()))