===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/arguments.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/tmux/arguments.c	2021/08/21 08:44:59	1.40
--- src/usr.bin/tmux/arguments.c	2021/08/21 10:28:05	1.41
***************
*** 1,4 ****
! /* $OpenBSD: arguments.c,v 1.40 2021/08/21 08:44:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: arguments.c,v 1.41 2021/08/21 10:28:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 128,134 ****
  		RB_REMOVE(args_tree, &args->tree, entry);
  		TAILQ_FOREACH_SAFE(value, &entry->values, entry, value1) {
  			TAILQ_REMOVE(&entry->values, value, entry);
! 			free(value->value);
  			free(value);
  		}
  		free(entry);
--- 128,134 ----
  		RB_REMOVE(args_tree, &args->tree, entry);
  		TAILQ_FOREACH_SAFE(value, &entry->values, entry, value1) {
  			TAILQ_REMOVE(&entry->values, value, entry);
! 			free(value->string);
  			free(value);
  		}
  		free(entry);
***************
*** 210,216 ****
  				args_print_add(&buf, &len, " -%c", entry->flag);
  			else
  				args_print_add(&buf, &len, "-%c", entry->flag);
! 			args_print_add_argument(&buf, &len, value->value);
  		}
  	}
  
--- 210,216 ----
  				args_print_add(&buf, &len, " -%c", entry->flag);
  			else
  				args_print_add(&buf, &len, "-%c", entry->flag);
! 			args_print_add_argument(&buf, &len, value->string);
  		}
  	}
  
***************
*** 299,305 ****
  
  	if (s != NULL) {
  		value = xcalloc(1, sizeof *value);
! 		value->value = xstrdup(s);
  		TAILQ_INSERT_TAIL(&entry->values, value, entry);
  	}
  }
--- 299,305 ----
  
  	if (s != NULL) {
  		value = xcalloc(1, sizeof *value);
! 		value->string = xstrdup(s);
  		TAILQ_INSERT_TAIL(&entry->values, value, entry);
  	}
  }
***************
*** 314,320 ****
  		return (NULL);
  	if (TAILQ_EMPTY(&entry->values))
  		return (NULL);
! 	return (TAILQ_LAST(&entry->values, args_values)->value);
  }
  
  /* Get first argument. */
--- 314,320 ----
  		return (NULL);
  	if (TAILQ_EMPTY(&entry->values))
  		return (NULL);
! 	return (TAILQ_LAST(&entry->values, args_values)->string);
  }
  
  /* Get first argument. */
***************
*** 387,393 ****
  	}
  	value = TAILQ_LAST(&entry->values, args_values);
  
! 	ll = strtonum(value->value, minval, maxval, &errstr);
  	if (errstr != NULL) {
  		*cause = xstrdup(errstr);
  		return (0);
--- 387,393 ----
  	}
  	value = TAILQ_LAST(&entry->values, args_values);
  
! 	ll = strtonum(value->string, minval, maxval, &errstr);
  	if (errstr != NULL) {
  		*cause = xstrdup(errstr);
  		return (0);
***************
*** 409,415 ****
  		*cause = xstrdup("missing");
  		return (0);
  	}
! 	value = TAILQ_LAST(&entry->values, args_values)->value;
  	return (args_string_percentage(value, minval, maxval, curval, cause));
  }
  
--- 409,415 ----
  		*cause = xstrdup("missing");
  		return (0);
  	}
! 	value = TAILQ_LAST(&entry->values, args_values)->string;
  	return (args_string_percentage(value, minval, maxval, curval, cause));
  }