===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -c -r1.141 -r1.142
*** src/usr.bin/tmux/cmd.c	2018/10/18 08:38:01	1.141
--- src/usr.bin/tmux/cmd.c	2019/03/18 11:58:40	1.142
***************
*** 1,4 ****
! /* $OpenBSD: cmd.c,v 1.141 2018/10/18 08:38:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd.c,v 1.142 2019/03/18 11:58:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 319,349 ****
  static int
  cmd_try_alias(int *argc, char ***argv)
  {
! 	struct options_entry	 *o;
! 	int			  old_argc = *argc, new_argc;
! 	char			**old_argv = *argv, **new_argv;
! 	u_int			  size, idx;
! 	int			  i;
! 	size_t			  wanted;
! 	const char		 *s, *cp = NULL;
  
  	o = options_get_only(global_options, "command-alias");
! 	if (o == NULL || options_array_size(o, &size) == -1 || size == 0)
  		return (-1);
- 
  	wanted = strlen(old_argv[0]);
- 	for (idx = 0; idx < size; idx++) {
- 		s = options_array_get(o, idx);
- 		if (s == NULL)
- 			continue;
  
! 		cp = strchr(s, '=');
! 		if (cp == NULL || (size_t)(cp - s) != wanted)
! 			continue;
! 		if (strncmp(old_argv[0], s, wanted) == 0)
! 			break;
  	}
! 	if (idx == size)
  		return (-1);
  
  	if (cmd_string_split(cp + 1, &new_argc, &new_argv) != 0)
--- 319,349 ----
  static int
  cmd_try_alias(int *argc, char ***argv)
  {
! 	struct options_entry		 *o;
! 	struct options_array_item	 *a;
! 	int				  old_argc = *argc, new_argc, i;
! 	char				**old_argv = *argv, **new_argv;
! 	size_t				  wanted;
! 	const char			 *s, *cp = NULL;
  
  	o = options_get_only(global_options, "command-alias");
! 	if (o == NULL)
  		return (-1);
  	wanted = strlen(old_argv[0]);
  
! 	a = options_array_first(o);
! 	while (a != NULL) {
! 		s = options_array_item_value(a);
! 		if (s != NULL) {
! 			cp = strchr(s, '=');
! 			if (cp != NULL &&
! 			    (size_t)(cp - s) == wanted &&
! 			    strncmp(old_argv[0], s, wanted) == 0)
! 				break;
! 		}
! 		a = options_array_next(a);
  	}
! 	if (a == NULL)
  		return (-1);
  
  	if (cmd_string_split(cp + 1, &new_argc, &new_argv) != 0)