Changeset 432

Timestamp:

Apr 29, 2013, 7:18:17 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #337 (negated conditionals in config file don't work).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_readconf.c (modified) (4 diffs)

trunk/docs/Changelog

@@ +1 @@
+3.0.12:
+        * Fix for bug in negated conditionals for config file
+          (reported by M. Ward)
+
 3.0.11:
         * Fix for compile error on HP-UX (reported by P. Alves)

trunk/src/sh_readconf.c

@@ -199 +199 @@
           p += 4; while (isspace((int)*p)) ++p;
           negate = 0;
+          match  = 1;
         }
       else if (0 == strncmp(p, _("!"), 1))
@@ -204 +205 @@
           ++p; while (isspace((int)*p)) ++p;
           negate = 0;
+          match  = 1;
         }
   
@@ -284 +286 @@
 #endif
     default:
-      match = 0;
+      /* do nothing */;
     }
   return match;
@@ -608 +610 @@
       }
 
+    /* fprintf(stderr, "%d %s\n", cond_excl, line); */
+
     /****************************************************
      *