===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/trigger.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/cvs/trigger.c	2008/08/29 09:51:21	1.16
--- src/usr.bin/cvs/trigger.c	2009/03/19 09:55:19	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: trigger.c,v 1.16 2008/08/29 09:51:21 tobias Exp $	*/
  /*
   * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org>
   * Copyright (c) 2008 Jonathan Armani <dbd@asystant.net>
--- 1,4 ----
! /*	$OpenBSD: trigger.c,v 1.17 2009/03/19 09:55:19 joris Exp $	*/
  /*
   * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org>
   * Copyright (c) 2008 Jonathan Armani <dbd@asystant.net>
***************
*** 280,298 ****
  				if (p[pos] == '\0')
  					goto bad;
  			} else {
! 				if (!isalpha(*p)) {
  					cvs_log(LP_ERR,
  					    "unrecognized variable syntax");
  					goto bad;
  				}
- 				pos = strcspn(p, " \t");
  			}
  			q = xmalloc(pos + 1);
  			memcpy(q, p, pos);
  			q[pos] = '\0';
  			if (expand_var(buf, q))
  				goto bad;
! 			p += pos;
  		} else {
  			switch (*p) {
  			case '\0':
--- 280,299 ----
  				if (p[pos] == '\0')
  					goto bad;
  			} else {
! 				for (pos = 0; isalpha(p[pos]); pos++)
! 					;
! 				if (pos == 0) {
  					cvs_log(LP_ERR,
  					    "unrecognized variable syntax");
  					goto bad;
  				}
  			}
  			q = xmalloc(pos + 1);
  			memcpy(q, p, pos);
  			q[pos] = '\0';
  			if (expand_var(buf, q))
  				goto bad;
! 			p += pos - (*(p - 1) == '{' ? 0 : 1);
  		} else {
  			switch (*p) {
  			case '\0':