===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/names.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/tmux/names.c	2013/10/10 11:56:50	1.22
--- src/usr.bin/tmux/names.c	2014/05/13 08:08:32	1.23
***************
*** 1,4 ****
! /* $OpenBSD: names.c,v 1.22 2013/10/10 11:56:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: names.c,v 1.23 2014/05/13 08:08:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 68,76 ****
  char *
  default_window_name(struct window *w)
  {
! 	if (w->active->cmd != NULL && *w->active->cmd != '\0')
! 		return (parse_window_name(w->active->cmd));
! 	return (parse_window_name(w->active->shell));
  }
  
  char *
--- 68,82 ----
  char *
  default_window_name(struct window *w)
  {
! 	char    *cmd, *s;
! 
! 	cmd = cmd_stringify_argv(w->active->argc, w->active->argv);
! 	if (cmd != NULL && *cmd != '\0')
! 		s = parse_window_name(cmd);
! 	else
! 		s = parse_window_name(w->active->shell);
! 	free(cmd);
! 	return (s);
  }
  
  char *