Changeset 211 for trunk/src/sh_readconf.c

Timestamp:

Feb 3, 2009, 8:45:50 PM (16 years ago)

Author:

katerina

Message:

Allow shell expansion for cofiguration file values (ticket #137).

File:

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

trunk/src/sh_readconf.c

@@ -135 +135 @@
   { NULL,                     SH_SECTION_NONE}
 };
+
+static char * sh_readconf_expand_value (const char * str)
+{
+  char * tmp = (char*)str;
+  char * out;
+
+  while (tmp && isspace((int)*tmp)) ++tmp;
+  
+  if (tmp[0] == '$' && tmp[1] == '(')
+    {
+      size_t len = strlen(tmp);
+      while (isspace((int) tmp[len-1])) { tmp[len-1] = '\0'; --len; }
+      if (tmp[len-1] == ')')
+        {
+          tmp[len-1] = '\0';
+          out = sh_ext_popen_str(&tmp[2]);
+          return out;
+        }
+    }
+  return sh_util_strdup(str);
+}
 
 enum {
@@ -1297 +1318 @@
     }
 
+  /* Expand shell expressions. This return allocated memory which we must free.
+   */
+  value = sh_readconf_expand_value(value);
+
+  if (!value || (*value) == '\0')
+    {
+      TPT(( 0, FIL__, __LINE__, _("msg=<ConfigFile: empty after shell expansion: %s>\n"),
+            line));
+      SL_RETURN(good_opt, _("sh_readconf_line"));
+    }
 
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
@@ -1362 +1393 @@
     }
 
+  SH_FREE((char*)value);
+
   SL_RETURN(good_opt, _("sh_readconf_line"));
 }