===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-string.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/Attic/cmd-string.c	2009/08/08 21:52:43	1.6
--- src/usr.bin/tmux/Attic/cmd-string.c	2009/10/26 21:42:04	1.7
***************
*** 1,4 ****
! /* $OpenBSD: cmd-string.c,v 1.6 2009/08/08 21:52:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-string.c,v 1.7 2009/10/26 21:42:04 deraadt Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 204,236 ****
  	char   *buf, *t;
  	size_t	len;
  
!         buf = NULL;
  	len = 0;
  
!         while ((ch = cmd_string_getc(s, p)) != endch) {
!                 switch (ch) {
  		case EOF:
  			goto error;
!                 case '\\':
  			if (!esc)
  				break;
!                         switch (ch = cmd_string_getc(s, p)) {
  			case EOF:
  				goto error;
  			case 'e':
  				ch = '\033';
  				break;
!                         case 'r':
!                                 ch = '\r';
!                                 break;
!                         case 'n':
!                                 ch = '\n';
!                                 break;
!                         case 't':
!                                 ch = '\t';
!                                 break;
!                         }
!                         break;
  		case '$':
  			if (!esc)
  				break;
--- 204,236 ----
  	char   *buf, *t;
  	size_t	len;
  
! 	buf = NULL;
  	len = 0;
  
! 	while ((ch = cmd_string_getc(s, p)) != endch) {
! 		switch (ch) {
  		case EOF:
  			goto error;
! 		case '\\':
  			if (!esc)
  				break;
! 			switch (ch = cmd_string_getc(s, p)) {
  			case EOF:
  				goto error;
  			case 'e':
  				ch = '\033';
  				break;
! 			case 'r':
! 				ch = '\r';
! 				break;
! 			case 'n':
! 				ch = '\n';
! 				break;
! 			case 't':
! 				ch = '\t';
! 				break;
! 			}
! 			break;
  		case '$':
  			if (!esc)
  				break;
***************
*** 241,253 ****
  			len += strlen(t);
  			xfree(t);
  			continue;
!                 }
  
  		if (len >= SIZE_MAX - 2)
  			goto error;
  		buf = xrealloc(buf, 1, len + 1);
!                 buf[len++] = ch;
!         }
  
  	buf = xrealloc(buf, 1, len + 1);
  	buf[len] = '\0';
--- 241,253 ----
  			len += strlen(t);
  			xfree(t);
  			continue;
! 		}
  
  		if (len >= SIZE_MAX - 2)
  			goto error;
  		buf = xrealloc(buf, 1, len + 1);
! 		buf[len++] = ch;
! 	}
  
  	buf = xrealloc(buf, 1, len + 1);
  	buf[len] = '\0';
***************
*** 272,278 ****
  	((ch) >= 'a' && (ch) <= 'z') || ((ch) >= 'A' && (ch) <= 'Z') || \
  	((ch) >= '0' && (ch) <= '9'))
  
!         buf = NULL;
  	len = 0;
  
  	fch = EOF;
--- 272,278 ----
  	((ch) >= 'a' && (ch) <= 'z') || ((ch) >= 'A' && (ch) <= 'Z') || \
  	((ch) >= '0' && (ch) <= '9'))
  
! 	buf = NULL;
  	len = 0;
  
  	fch = EOF;