===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/oldrdist/Attic/expand.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/oldrdist/Attic/expand.c	1996/06/26 05:37:38	1.2
--- src/usr.bin/oldrdist/Attic/expand.c	1996/07/19 21:57:32	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: expand.c,v 1.2 1996/06/26 05:37:38 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1983, 1993
--- 1,4 ----
! /*	$OpenBSD: expand.c,v 1.3 1996/07/19 21:57:32 millert Exp $	*/
  
  /*
   * Copyright (c) 1983, 1993
***************
*** 35,41 ****
  
  #ifndef lint
  /* from: static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93"; */
! static char *rcsid = "$OpenBSD: expand.c,v 1.2 1996/06/26 05:37:38 deraadt Exp $";
  #endif /* not lint */
  
  #include "defs.h"
--- 35,41 ----
  
  #ifndef lint
  /* from: static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93"; */
! static char *rcsid = "$OpenBSD: expand.c,v 1.3 1996/07/19 21:57:32 millert Exp $";
  #endif /* not lint */
  
  #include "defs.h"
***************
*** 156,162 ****
  	if (s == NULL || *s == '\0')
  		return;
  
! 	if ((which & E_VARS) && (cp = index(s, '$')) != NULL) {
  		*cp++ = '\0';
  		if (*cp == '\0') {
  			yyerror("no variable name after '$'");
--- 156,162 ----
  	if (s == NULL || *s == '\0')
  		return;
  
! 	if ((which & E_VARS) && (cp = strchr(s, '$')) != NULL) {
  		*cp++ = '\0';
  		if (*cp == '\0') {
  			yyerror("no variable name after '$'");
***************
*** 164,170 ****
  		}
  		if (*cp == LC) {
  			cp++;
! 			if ((tail = index(cp, RC)) == NULL) {
  				yyerror("unmatched '{'");
  				return;
  			}
--- 164,170 ----
  		}
  		if (*cp == LC) {
  			cp++;
! 			if ((tail = strchr(cp, RC)) == NULL) {
  				yyerror("unmatched '{'");
  				return;
  			}