Changeset 199 for trunk/src/sh_readconf.c

Timestamp:

Nov 26, 2008, 11:46:43 PM (16 years ago)

Author:

katerina

Message:

While we're at it, implement 'else' cor the config file conditionals. Also fix some compile warnings and improve docs.

File:

• trunk/src/sh_readconf.c (modified) (2 diffs)

trunk/src/sh_readconf.c

@@ -270 +270 @@
       char * p = str;
       ++p; while (isspace((int)*p)) ++p;
-      if (0 == strcmp (p, _("end")     ) ||
-          0 == strncmp(p, _("end "),  4) || /* Comment to follow */
-          0 == strcmp (p, _("endif")   ) ||
-          0 == strncmp(p, _("endif "),6) ||
-          0 == strcmp (p, _("fi")      ) ||
-          0 == strncmp(p, _("fi "),   3)
-          )
+      if ( 
+          (0 == strncmp (p, _("end"), 3) && (p[3] == '\0' || isspace((int)p[3]))) ||
+          (0 == strncmp (p, _("fi"),  2) && (p[2] == '\0' || isspace((int)p[2])))
+           )
+        {
+          return 1;
+        }
+    }
+  return retval;
+}
+   
+static int sh_readconf_is_else (char * str)
+{
+  int retval = 0;
+
+  if (str[0] == '@')
+    {
+      char * p = str;
+      ++p; while (isspace((int)*p)) ++p;
+      if ( 0 == strncmp (p, _("else"), 4) && (p[4] == '\0' || isspace((int)p[4])) )
         {
           return 1;
@@ -509 +522 @@
             }
           }
+        else if (sh_readconf_is_else(line))
+          {
+            if (0 == cond_depth) {
+              sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_EINVALD,
+                               _("config file"), 
+                               (long) conf_line);
+            }
+            else if (cond_excl == cond_depth) {
+              cond_excl = 0;
+            }
+            else if (cond_excl == 0) {
+              cond_excl = cond_depth;
+            }
+          }
         else
           {