===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-bind-key.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/cmd-bind-key.c	2012/07/11 07:10:15	1.14
--- src/usr.bin/tmux/cmd-bind-key.c	2013/03/22 15:52:40	1.15
***************
*** 1,4 ****
! /* $OpenBSD: cmd-bind-key.c,v 1.14 2012/07/11 07:10:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-bind-key.c,v 1.15 2013/03/22 15:52:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 46,52 ****
  cmd_bind_key_check(struct args *args)
  {
  	if (args_has(args, 't')) {
! 		if (args->argc != 2)
  			return (CMD_RETURN_ERROR);
  	} else {
  		if (args->argc < 2)
--- 46,52 ----
  cmd_bind_key_check(struct args *args)
  {
  	if (args_has(args, 't')) {
! 		if (args->argc != 2 && args->argc != 3)
  			return (CMD_RETURN_ERROR);
  	} else {
  		if (args->argc < 2)
***************
*** 93,98 ****
--- 93,99 ----
  	const struct mode_key_table	*mtab;
  	struct mode_key_binding		*mbind, mtmp;
  	enum mode_key_cmd		 cmd;
+ 	const char			*arg;
  
  	tablename = args_get(args, 't');
  	if ((mtab = mode_key_findtable(tablename)) == NULL) {
***************
*** 106,121 ****
  		return (CMD_RETURN_ERROR);
  	}
  
  	mtmp.key = key;
  	mtmp.mode = !!args_has(args, 'c');
! 	if ((mbind = RB_FIND(mode_key_tree, mtab->tree, &mtmp)) != NULL) {
! 		mbind->cmd = cmd;
! 		return (CMD_RETURN_NORMAL);
  	}
- 	mbind = xmalloc(sizeof *mbind);
- 	mbind->key = mtmp.key;
- 	mbind->mode = mtmp.mode;
  	mbind->cmd = cmd;
! 	RB_INSERT(mode_key_tree, mtab->tree, mbind);
  	return (CMD_RETURN_NORMAL);
  }
--- 107,135 ----
  		return (CMD_RETURN_ERROR);
  	}
  
+ 	if (cmd != MODEKEYCOPY_COPYPIPE) {
+ 		if (args->argc != 2) {
+ 			ctx->error(ctx, "no argument allowed");
+ 			return (CMD_RETURN_ERROR);
+ 		}
+ 		arg = NULL;
+ 	} else {
+ 		if (args->argc != 3) {
+ 			ctx->error(ctx, "no argument given");
+ 			return (CMD_RETURN_ERROR);
+ 		}
+ 		arg = args->argv[2];
+ 	}
+ 
  	mtmp.key = key;
  	mtmp.mode = !!args_has(args, 'c');
! 	if ((mbind = RB_FIND(mode_key_tree, mtab->tree, &mtmp)) == NULL) {
! 		mbind = xmalloc(sizeof *mbind);
! 		mbind->key = mtmp.key;
! 		mbind->mode = mtmp.mode;
! 		RB_INSERT(mode_key_tree, mtab->tree, mbind);
  	}
  	mbind->cmd = cmd;
! 	mbind->arg = arg != NULL ? xstrdup(arg) : NULL;
  	return (CMD_RETURN_NORMAL);
  }