===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-term.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/tmux/tty-term.c	2010/09/11 16:19:22	1.18
--- src/usr.bin/tmux/tty-term.c	2011/01/01 03:32:28	1.19
***************
*** 1,4 ****
! /* $OpenBSD: tty-term.c,v 1.18 2010/09/11 16:19:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty-term.c,v 1.19 2011/01/01 03:32:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 32,38 ****
  
  struct tty_terms tty_terms = SLIST_HEAD_INITIALIZER(tty_terms);
  
! struct tty_term_code_entry tty_term_codes[NTTYCODE] = {
  	{ TTYC_ACSC, TTYCODE_STRING, "acsc" },
  	{ TTYC_AX, TTYCODE_FLAG, "AX" },
  	{ TTYC_BEL, TTYCODE_STRING, "bel" },
--- 32,38 ----
  
  struct tty_terms tty_terms = SLIST_HEAD_INITIALIZER(tty_terms);
  
! const struct tty_term_code_entry tty_term_codes[NTTYCODE] = {
  	{ TTYC_ACSC, TTYCODE_STRING, "acsc" },
  	{ TTYC_AX, TTYCODE_FLAG, "AX" },
  	{ TTYC_BEL, TTYCODE_STRING, "bel" },
***************
*** 214,226 ****
  void
  tty_term_override(struct tty_term *term, const char *overrides)
  {
! 	struct tty_term_code_entry	*ent;
! 	struct tty_code			*code;
! 	char				*termnext, *termstr, *entnext, *entstr;
! 	char				*s, *ptr, *val;
! 	const char			*errstr;
! 	u_int				 i;
! 	int				 n, removeflag;
  
  	s = xstrdup(overrides);
  
--- 214,227 ----
  void
  tty_term_override(struct tty_term *term, const char *overrides)
  {
! 	const struct tty_term_code_entry	*ent;
! 	struct tty_code				*code;
! 	char					*termnext, *termstr;
! 	char					*entnext, *entstr;
! 	char					*s, *ptr, *val;
! 	const char				*errstr;
! 	u_int					 i;
! 	int					 n, removeflag;
  
  	s = xstrdup(overrides);
  
***************
*** 296,308 ****
  struct tty_term *
  tty_term_find(char *name, int fd, const char *overrides, char **cause)
  {
! 	struct tty_term			*term;
! 	struct tty_term_code_entry	*ent;
! 	struct tty_code			*code;
! 	u_int				 i;
! 	int		 		 n, error;
! 	char				*s;
! 	const char                      *acs;
  
  	SLIST_FOREACH(term, &tty_terms, entry) {
  		if (strcmp(term->name, name) == 0) {
--- 297,309 ----
  struct tty_term *
  tty_term_find(char *name, int fd, const char *overrides, char **cause)
  {
! 	struct tty_term				*term;
! 	const struct tty_term_code_entry	*ent;
! 	struct tty_code				*code;
! 	u_int					 i;
! 	int		 			 n, error;
! 	char					*s;
! 	const char				*acs;
  
  	SLIST_FOREACH(term, &tty_terms, entry) {
  		if (strcmp(term->name, name) == 0) {