summaryrefslogtreecommitdiff
path: root/app/cwm/kbfunc.c
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-04-15 21:20:57 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-04-15 21:20:57 +0000
commit5f0ab4b203f3de08a07920c748ac924236e54fea (patch)
tree5fadab6ddef035294d8bab511ff35944994b6cda /app/cwm/kbfunc.c
parent137365b51ad032cfef837eb721176afc9ecbb08e (diff)
make the argument parser for commands accept quoted strings, while i'm
there make u_spawn use exec_wm (renamed to u_exec) for it's execution to remove duplicated code. This means constructs like this work in .cwmrc: bind CM-t "ssh -Y 192.168.1.2 \"xterm -e top\"" or alternatively: bind CM-t "ssh -Y 192.168.1.2 'xterm -e top'" "in it goes" okan@.
Diffstat (limited to 'app/cwm/kbfunc.c')
-rw-r--r--app/cwm/kbfunc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/cwm/kbfunc.c b/app/cwm/kbfunc.c
index 6bd4841e5..44d1ac6bf 100644
--- a/app/cwm/kbfunc.c
+++ b/app/cwm/kbfunc.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: kbfunc.c,v 1.20 2008/04/15 20:24:41 oga Exp $
+ * $Id: kbfunc.c,v 1.21 2008/04/15 21:20:56 oga Exp $
*/
#include <paths.h>
@@ -359,7 +359,8 @@ kbfunc_exec(struct client_ctx *scratch, void *arg)
u_spawn(mi->text);
break;
case CWM_EXEC_WM:
- exec_wm(mi->text);
+ u_exec(mi->text);
+ warn("%s", mi->text);
break;
default:
err(1, "kb_func: egad, cmd changed value!");