===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/arguments.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/tmux/arguments.c	2019/04/28 20:05:50	1.21
--- src/usr.bin/tmux/arguments.c	2019/05/23 14:03:44	1.22
***************
*** 1,4 ****
! /* $OpenBSD: arguments.c,v 1.21 2019/04/28 20:05:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: arguments.c,v 1.22 2019/05/23 14:03:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 141,163 ****
  args_print_add_value(char **buf, size_t *len, struct args_entry *entry,
      struct args_value *value)
  {
! 	static const char	 quoted[] = " #\"';$";
! 	char			*escaped;
! 	int			 flags;
  
  	if (**buf != '\0')
  		args_print_add(buf, len, " -%c ", entry->flag);
  	else
  		args_print_add(buf, len, "-%c ", entry->flag);
  
! 	flags = VIS_OCTAL|VIS_TAB|VIS_NL;
! 	if (value->value[strcspn(value->value, quoted)] != '\0')
! 		flags |= VIS_DQ;
! 	utf8_stravis(&escaped, value->value, flags);
! 	if (flags & VIS_DQ)
! 		args_print_add(buf, len, "\"%s\"", escaped);
! 	else
! 		args_print_add(buf, len, "%s", escaped);
  	free(escaped);
  }
  
--- 141,155 ----
  args_print_add_value(char **buf, size_t *len, struct args_entry *entry,
      struct args_value *value)
  {
! 	char	*escaped;
  
  	if (**buf != '\0')
  		args_print_add(buf, len, " -%c ", entry->flag);
  	else
  		args_print_add(buf, len, "-%c ", entry->flag);
  
! 	escaped = args_escape(value->value);
! 	args_print_add(buf, len, "%s", escaped);
  	free(escaped);
  }
  
***************
*** 165,185 ****
  static void
  args_print_add_argument(char **buf, size_t *len, const char *argument)
  {
! 	static const char	 quoted[] = " #\"';$";
! 	char			*escaped;
! 	int			 flags;
  
  	if (**buf != '\0')
  		args_print_add(buf, len, " ");
  
! 	flags = VIS_OCTAL|VIS_TAB|VIS_NL;
! 	if (argument[strcspn(argument, quoted)] != '\0')
! 		flags |= VIS_DQ;
! 	utf8_stravis(&escaped, argument, flags);
! 	if (flags & VIS_DQ)
! 		args_print_add(buf, len, "\"%s\"", escaped);
! 	else
! 		args_print_add(buf, len, "%s", escaped);
  	free(escaped);
  }
  
--- 157,169 ----
  static void
  args_print_add_argument(char **buf, size_t *len, const char *argument)
  {
! 	char	*escaped;
  
  	if (**buf != '\0')
  		args_print_add(buf, len, " ");
  
! 	escaped = args_escape(argument);
! 	args_print_add(buf, len, "%s", escaped);
  	free(escaped);
  }
  
***************
*** 217,222 ****
--- 201,239 ----
  		args_print_add_argument(&buf, &len, args->argv[i]);
  
  	return (buf);
+ }
+ 
+ /* Escape an argument. */
+ char *
+ args_escape(const char *s)
+ {
+ 	static const char	 quoted[] = " #\"';$";
+ 	char			*escaped, *result;
+ 	int			 flags;
+ 
+ 	if ((strchr(quoted, s[0]) != NULL || s[0] == '~') && s[1] == '\0') {
+ 		xasprintf(&escaped, "\\%c", s[0]);
+ 		return (escaped);
+ 	}
+ 
+ 	flags = VIS_OCTAL|VIS_TAB|VIS_NL;
+ 	if (s[strcspn(s, quoted)] != '\0')
+ 		flags |= VIS_DQ;
+ 	utf8_stravis(&escaped, s, flags);
+ 
+ 	if (flags & VIS_DQ) {
+ 		if (*escaped == '~')
+ 			xasprintf(&result, "\"\\%s\"", escaped);
+ 		else
+ 			xasprintf(&result, "\"%s\"", escaped);
+ 	} else {
+ 		if (*escaped == '~')
+ 			xasprintf(&result, "\\%s", escaped);
+ 		else
+ 			result = xstrdup(escaped);
+ 	}
+ 	free(escaped);
+ 	return (result);
  }
  
  /* Return if an argument is present. */