Changeset 164 for trunk/src

Timestamp:

Feb 6, 2008, 10:31:00 PM (17 years ago)

Author:

katerina

Message:

Add 'closecommand' directive for external commands.

Location:

trunk/src

Files:

• sh_extern.c (modified) (1 diff)
• sh_readconf.c (modified) (8 diffs)

trunk/src/sh_extern.c

@@ -1060 +1060 @@
 
   SL_RETURN (0, _("sh_ext_cleanup"));
+}
+
+/*
+ * -- explicitely close a command
+ */
+int sh_ext_close_command (const char * str)
+{
+  (void) str;
+  if (ext_coms == NULL || ext_failed == (-1))
+    return (-1);
+  ext_failed = (-1);
+  return 0;
 }
 

trunk/src/sh_readconf.c

@@ -742 +742 @@
   { N_("opencommand"),     SH_SECTION_EXTERNAL, SH_SECTION_NONE,  
     sh_ext_setcommand },
+  { N_("closecommand"),    SH_SECTION_EXTERNAL, SH_SECTION_NONE,  
+    sh_ext_close_command },
   { N_("setcommandline"),  SH_SECTION_EXTERNAL, SH_SECTION_NONE,  
     sh_ext_add_argv },
@@ -1108 +1110 @@
 
 static int sh_readconfig_line (char * line)
-{    
-  char * c;
+{
+  char * key;
+  char * value;
   char * tmp;
   int    i;
@@ -1117 +1120 @@
   int    modnum, modkey;
 #endif
+
+  static char  *dummy = N_("dummy");
+
+  static char  *closing[] = {
+    N_("closecommand"),
+    NULL
+  };
 
   static char  *ident[] = {
@@ -1157 +1167 @@
   SL_ENTER(_("sh_readconf_line"));
 
+  /* convert to lowercase                              */
+
+  tmp = line;
+  while (*tmp != '=' && *tmp != '\0')
+    {
+      *tmp = tolower( (int) *tmp);
+      ++tmp;
+    }
+
+  key = line;
+
   /* interpret line                                    */
 
-  c = strchr(line, '=');
-  if (c == NULL || (*c) == '\0')
-    {
-      if (line != NULL)
+  value = strchr(line, '=');
+
+  if (value == NULL || (*value) == '\0')
+    {
+      if (key != NULL)
+        {
+          i = 0;
+          while (closing[i] != NULL) 
+            {
+              if (sl_strncmp(key,_(closing[i]),sl_strlen(closing[i])-1) == 0)
+                {
+                  value = dummy;
+                  goto ok_novalue;
+                }
+              ++i;
+            }
+
+          TPT(( 0, FIL__, __LINE__, _("msg=<ConfigFile: not key=value: %s>\n"),
+                line));
+        }
+      SL_RETURN(good_opt, _("sh_readconf_line"));
+    }
+  else
+    ++value;
+
+  /* skip leading whitespace
+   */
+  while ((*value) == ' ' || (*value) == '\t')
+    ++value;
+
+  if ((*value) == '\0')     /* no value                    */
+    {
+      if (key != NULL)
         {
           TPT(( 0, FIL__, __LINE__, _("msg=<ConfigFile: not key=value: %s>\n"),
@@ -1169 +1219 @@
       SL_RETURN(good_opt, _("sh_readconf_line"));
     }
-  else
-    ++c;
-
-  /* skip leading whitespace
-   */
-  while ((*c) == ' ' || (*c) == '\t')
-    ++c;
-
-  if ((*c) == '\0')     /* no value                    */
-    {
-      if (line != NULL)
-        {
-          TPT(( 0, FIL__, __LINE__, _("msg=<ConfigFile: not key=value: %s>\n"),
-                line));
-        }
-      SL_RETURN(good_opt, _("sh_readconf_line"));
-    }
-
-  /* convert to lowercase                              */
-
-  tmp = line;
-  while (*tmp != '=')
-    {
-      *tmp = tolower( (int) *tmp);
-      ++tmp;
-    }
+
+ ok_novalue:
 
   if (!sl_is_suid())
@@ -1210 +1236 @@
                ++modkey) 
             {
-              if (sl_strncmp (line,   
+              if (sl_strncmp (key,
                               _(modList[modnum].conf_table[modkey].the_opt),
                               sl_strlen(modList[modnum].conf_table[modkey].the_opt) ) == 0)
                 {
                   good_opt = 0;
-                  if (0 != modList[modnum].conf_table[modkey].func(c))
+                  if (0 != modList[modnum].conf_table[modkey].func(value))
                     sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_EINVALS,
-                                     _(modList[modnum].conf_table[modkey].the_opt), c);
+                                     _(modList[modnum].conf_table[modkey].the_opt), value);
                   if (!sl_is_suid())
                     {
@@ -1237 +1263 @@
       i = 0;
       while (ident[i] != NULL) {
-        if (sl_strncmp (line, _(ident[i]), sl_strlen(ident[i])-1) == 0)
+        if (sl_strncmp (key, _(ident[i]), sl_strlen(ident[i])-1) == 0)
           {
             good_opt = 0;
-            sh_error_set_iv (identnum[i], c);
+            sh_error_set_iv (identnum[i], value);
             break;
           }
@@ -1253 +1279 @@
           if ((ext_table[i].section == read_mode || 
                ext_table[i].alt_section == read_mode) &&
-              sl_strncmp (line, _(ext_table[i].optname), 
+              sl_strncmp (key, _(ext_table[i].optname), 
                           sl_strlen(ext_table[i].optname)) == 0)
             {
               good_opt = 0;
-              if (0 != ext_table[i].func (c))
+              if (0 != ext_table[i].func (value))
                 sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_EINVALS,
-                                 _(ext_table[i].optname), c);
+                                 _(ext_table[i].optname), value);
               break;
             }