===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-if-shell.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/tmux/cmd-if-shell.c	2010/07/24 20:11:59	1.9
+++ src/usr.bin/tmux/cmd-if-shell.c	2011/01/04 00:42:46	1.10
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-if-shell.c,v 1.9 2010/07/24 20:11:59 nicm Exp $ */
+/* $OpenBSD: cmd-if-shell.c,v 1.10 2011/01/04 00:42:46 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -35,13 +35,12 @@
 
 const struct cmd_entry cmd_if_shell_entry = {
 	"if-shell", "if",
+	"", 2, 2,
 	"shell-command command",
-	CMD_ARG2, "",
-	cmd_target_init,
-	cmd_target_parse,
-	cmd_if_shell_exec,
-	cmd_target_free,
-	cmd_target_print
+	0,
+	NULL,
+	NULL,
+	cmd_if_shell_exec
 };
 
 struct cmd_if_shell_data {
@@ -52,12 +51,12 @@
 int
 cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
-	struct cmd_target_data		*data = self->data;
+	struct args			*args = self->args;
 	struct cmd_if_shell_data	*cdata;
 	struct job			*job;
 
 	cdata = xmalloc(sizeof *cdata);
-	cdata->cmd = xstrdup(data->arg2);
+	cdata->cmd = xstrdup(args->argv[1]);
 	memcpy(&cdata->ctx, ctx, sizeof cdata->ctx);
 
 	if (ctx->cmdclient != NULL)
@@ -66,7 +65,7 @@
 		ctx->curclient->references++;
 
 	job = job_add(NULL, 0, NULL,
-	    data->arg, cmd_if_shell_callback, cmd_if_shell_free, cdata);
+	    args->argv[0], cmd_if_shell_callback, cmd_if_shell_free, cdata);
 	job_run(job);
 
 	return (1);	/* don't let client exit */