Changeset 4235

Timestamp:

11/12/06 19:24:55 (7 years ago)

Author:

mmh

Message:

The scanner regression test cases for error conditions in quoted strings
uncovered three different bugs. This changeset fixes them all. It also
updates the sensors.conf(5) man page to be unambiguous regarding the
requirement for whitespace between elements.

Location:

lm-sensors/trunk/lib

Files:

• conf-lex.l (modified) (2 diffs)
• sensors.conf.5 (modified) (1 diff)

lm-sensors/trunk/lib/conf-lex.l

@@ -263 +263 @@
 <STRING>{
 
- /* Oops, newline while in a string is not good */
+ /* Oops, newline or EOF while in a string is not good */
 
 \n              |
 \\\n            {
                   buffer_add_char("\0");
-                  strcpy(sensors_lex_error,"No matching double quote");
+                  strcpy(sensors_lex_error,
+                        "No matching double quote.");
                   buffer_free();
-                  BEGIN(INITIAL);
+                  yyless(0);
+                  BEGIN(ERR);
+                  return ERROR;
+                }
+
+<<EOF>>         {
+                  strcpy(sensors_lex_error,
+                        "Reached end-of-file without a matching double quote.");
+                  BEGIN(MIDDLE);
                   return ERROR;
                 }
@@ -276 +285 @@
  /* At the end */
 
+\"\"            {
+                  buffer_add_char("\0");
+                  strcpy(sensors_lex_error,
+                        "Quoted strings must be separated by whitespace.");
+                  buffer_free();
+                  BEGIN(ERR);
+                  return ERROR;
+                }
+                
 \"              {
                   buffer_add_char("\0");

lm-sensors/trunk/lib/sensors.conf.5

@@ -35 +35 @@
 Comments are introduces by hash marks. A comment continues to the end of the
 line. Empty lines, and lines containing only whitespace or comments are 
-ignored.  Other lines have one of the below forms. There should be whitespace
+ignored.  Other lines have one of the below forms. There must be whitespace
 between each element, but the amount of whitespace is unimportant. A line
 may be continued on the next line by ending it with a backslash; this does