From 6147ca54a454838e00dfa108db5b13ec10b9aa2f Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Thu, 25 Jul 2002 07:45:01 +0000
Subject: Do some minimalistic validation of command-lines (ie, make sure it
 isn't

2002-07-25  Jeffrey Stedfast  <fejj@ximian.com>

	* filter-file.c (validate): Do some minimalistic validation of
	command-lines (ie, make sure it isn't an empty string).

	* filtertypes.xml: s/shell-exec/shell/ (for the action) and pass
	"/bin/sh" "-c" as the first 2 arguments. For the shell-exec
	*rule*, change the name to "pipe-message" and add the "/bin/sh"
	"-c" arguments too.

svn path=/trunk/; revision=17584
---
 filter/filtertypes.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'filter/filtertypes.xml')

diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml
index 7c0690cfa0..67b7f9a6d3 100644
--- a/filter/filtertypes.xml
+++ b/filter/filtertypes.xml
@@ -581,32 +581,32 @@
   <input type="source" name="source"/>
  </part>
 
- <part name="command">
-  <title>Command</title>
+ <part name="pipe">
+  <title>Pipe Message to Shell Command</title>
   <input type="command" name="command"/>
   <input type="optionlist" name="retval-type">
    <option value="is">
-    <title>is</title>
+    <title>returns</title>
     <code>
-      (match-all (= (shell-exec ${command}) ${retval}))
+      (match-all (= (pipe-message "/bin/sh" "-c" ${command}) ${retval}))
     </code>
    </option>
    <option value="is-not">
-    <title>is not</title>
+    <title>does not return</title>
     <code>
-      (match-all (not (= (shell-exec ${command}) ${retval})))
+      (match-all (not (= (pipe-message "/bin/sh" "-c" ${command}) ${retval})))
     </code>
    </option>
    <option value="greater-than">
-    <title>is greater than</title>
+    <title>returns greater than</title>
     <code>
-      (match-all (&gt; (shell-exec ${command}) ${retval}))
+      (match-all (&gt; (pipe-message "/bin/sh" "-c" ${command}) ${retval}))
     </code>
    </option>
    <option value="less-than">
-    <title>is less than</title>
+    <title>returns less than</title>
     <code>
-      (match-all (&lt; (shell-exec ${command}) ${retval}))
+      (match-all (&lt; (pipe-message "/bin/sh" "-c" ${command}) ${retval}))
     </code>
    </option>
   </input>
@@ -682,9 +682,9 @@
   <code>(play-sound ${sound})</code>
   <input type="file" name="sound"/>
  </part>
- <part name="shell-exec">
-  <title>Execute Shell Command</title>
-  <code>(shell-exec ${command})</code>
+ <part name="shell">
+  <title>Shell Command</title>
+  <code>(shell "/bin/sh" "-c" ${command})</code>
   <input type="command" name="command"/>
  </part>
 </actionset>
-- 
cgit v1.2.3