===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-list.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/tmux/Attic/cmd-list.c	2013/03/24 09:54:10	1.12
--- src/usr.bin/tmux/Attic/cmd-list.c	2014/04/11 19:35:54	1.13
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list.c,v 1.12 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-list.c,v 1.13 2014/04/11 19:35:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 103,109 ****
  cmd_list_print(struct cmd_list *cmdlist, char *buf, size_t len)
  {
  	struct cmd	*cmd;
! 	size_t		 off;
  
  	off = 0;
  	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
--- 103,109 ----
  cmd_list_print(struct cmd_list *cmdlist, char *buf, size_t len)
  {
  	struct cmd	*cmd;
! 	size_t		 off, used;
  
  	off = 0;
  	TAILQ_FOREACH(cmd, &cmdlist->list, qentry) {
***************
*** 112,119 ****
  		off += cmd_print(cmd, buf + off, len - off);
  		if (off >= len)
  			break;
! 		if (TAILQ_NEXT(cmd, qentry) != NULL)
! 			off += xsnprintf(buf + off, len - off, " ; ");
  	}
  	return (off);
  }
--- 112,123 ----
  		off += cmd_print(cmd, buf + off, len - off);
  		if (off >= len)
  			break;
! 		if (TAILQ_NEXT(cmd, qentry) != NULL) {
! 			used = xsnprintf(buf + off, len - off, " ; ");
! 			if (used > len - off)
! 				used = len - off;
! 			off += used;
! 		}
  	}
  	return (off);
  }