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