===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/var.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/make/var.c	2000/01/08 09:45:16	1.29
--- src/usr.bin/make/var.c	2000/03/26 16:21:33	1.30
***************
*** 1,4 ****
! /*	$OpenBSD: var.c,v 1.29 2000/01/08 09:45:16 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: var.c,v 1.30 2000/03/26 16:21:33 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
***************
*** 70,76 ****
  #if 0
  static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: var.c,v 1.29 2000/01/08 09:45:16 espie Exp $";
  #endif
  #endif /* not lint */
  
--- 70,76 ----
  #if 0
  static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
  #else
! static char rcsid[] = "$OpenBSD: var.c,v 1.30 2000/03/26 16:21:33 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 320,335 ****
       * look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,
       * depending on the FIND_* flags in 'flags'
       */
!     var = Lst_Find(ctxt->context, VarCmp, (ClientData)name);
  
      if ((var == NULL) && (flags & FIND_CMD) && (ctxt != VAR_CMD))
! 	var = Lst_Find(VAR_CMD->context, VarCmp, (ClientData)name);
      if (!checkEnvFirst && (var == NULL) && (flags & FIND_GLOBAL) &&
  	(ctxt != VAR_GLOBAL)) {
! 	var = Lst_Find(VAR_GLOBAL->context, VarCmp, (ClientData)name);
      }
      if ((var == NULL) && (flags & FIND_ENV)) {
!     	var = Lst_Find(VAR_ENV->context, VarCmp, (ClientData)name);
  	if (var == NULL) {
  	    char *env;
  
--- 320,335 ----
       * look for it in VAR_CMD, VAR_GLOBAL and the environment, in that order,
       * depending on the FIND_* flags in 'flags'
       */
!     var = Lst_Find(ctxt->context, VarCmp, name);
  
      if ((var == NULL) && (flags & FIND_CMD) && (ctxt != VAR_CMD))
! 	var = Lst_Find(VAR_CMD->context, VarCmp, name);
      if (!checkEnvFirst && (var == NULL) && (flags & FIND_GLOBAL) &&
  	(ctxt != VAR_GLOBAL)) {
! 	var = Lst_Find(VAR_GLOBAL->context, VarCmp, name);
      }
      if ((var == NULL) && (flags & FIND_ENV)) {
!     	var = Lst_Find(VAR_ENV->context, VarCmp, name);
  	if (var == NULL) {
  	    char *env;
  
***************
*** 339,345 ****
      }
      if (var == NULL && checkEnvFirst && (flags & FIND_GLOBAL) &&
  		   (ctxt != VAR_GLOBAL)) 
! 	    var = Lst_Find(VAR_GLOBAL->context, VarCmp, (ClientData)name);
      if (var == NULL)
  	return NULL;
      else 
--- 339,345 ----
      }
      if (var == NULL && checkEnvFirst && (flags & FIND_GLOBAL) &&
  		   (ctxt != VAR_GLOBAL)) 
! 	    var = Lst_Find(VAR_GLOBAL->context, VarCmp, name);
      if (var == NULL)
  	return NULL;
      else 
***************
*** 379,386 ****
  
      v->flags = 0;
  
!     Lst_AtFront(ctxt->context, (ClientData)v);
!     Lst_AtEnd(allVars, (ClientData)v);
      if (DEBUG(VAR)) {
  	printf("%s:%s = %s\n", ctxt->name, name, val);
      }
--- 379,386 ----
  
      v->flags = 0;
  
!     Lst_AtFront(ctxt->context, v);
!     Lst_AtEnd(allVars, v);
      if (DEBUG(VAR)) {
  	printf("%s:%s = %s\n", ctxt->name, name, val);
      }
***************
*** 435,441 ****
      if (DEBUG(VAR)) {
  	printf("%s:delete %s\n", ctxt->name, name);
      }
!     ln = Lst_Find(ctxt->context, VarCmp, (ClientData)name);
      if (ln != NULL) {
  	register Var 	  *v;
  
--- 435,441 ----
      if (DEBUG(VAR)) {
  	printf("%s:delete %s\n", ctxt->name, name);
      }
!     ln = Lst_Find(ctxt->context, VarCmp, name);
      if (ln != NULL) {
  	register Var 	  *v;
  
***************
*** 443,449 ****
  	Lst_Remove(ctxt->context, ln);
  	ln = Lst_Member(allVars, v);
  	Lst_Remove(allVars, ln);
! 	VarDelete((ClientData) v);
      }
  }
  
--- 443,449 ----
  	Lst_Remove(ctxt->context, ln);
  	ln = Lst_Member(allVars, v);
  	Lst_Remove(allVars, ln);
! 	VarDelete(v);
      }
  }
  
***************
*** 1569,1577 ****
  			val = VarValue(v);
  
  			if (str[3] == 'D') {
! 			    val = VarModify(val, VarHead, (ClientData)0);
  			} else {
! 			    val = VarModify(val, VarTail, (ClientData)0);
  			}
  			/*
  			 * Resulting string is dynamically allocated, so
--- 1569,1577 ----
  			val = VarValue(v);
  
  			if (str[3] == 'D') {
! 			    val = VarModify(val, VarHead, NULL);
  			} else {
! 			    val = VarModify(val, VarTail, NULL);
  			}
  			/*
  			 * Resulting string is dynamically allocated, so
***************
*** 1753,1762 ****
  			pattern = &tstr[1];
  		    }
  		    if (*tstr == 'M' || *tstr == 'm') {
! 			newStr = VarModify(str, VarMatch, (ClientData)pattern);
  		    } else {
! 			newStr = VarModify(str, VarNoMatch,
! 					   (ClientData)pattern);
  		    }
  		    if (copy) {
  			free(pattern);
--- 1753,1761 ----
  			pattern = &tstr[1];
  		    }
  		    if (*tstr == 'M' || *tstr == 'm') {
! 			newStr = VarModify(str, VarMatch, pattern);
  		    } else {
! 			newStr = VarModify(str, VarNoMatch, pattern);
  		    }
  		    if (copy) {
  			free(pattern);
***************
*** 1807,1814 ****
  		    }
  
  		    termc = *cp;
! 		    newStr = VarModify(str, VarSubstitute,
! 				       (ClientData)&pattern);
  
  		    /*
  		     * Free the two strings.
--- 1806,1812 ----
  		    }
  
  		    termc = *cp;
! 		    newStr = VarModify(str, VarSubstitute, &pattern);
  
  		    /*
  		     * Free the two strings.
***************
*** 1870,1877 ****
  			pattern.nsub = 10;
  		    pattern.matches = emalloc(pattern.nsub *
  					      sizeof(regmatch_t));
! 		    newStr = VarModify(str, VarRESubstitute,
! 				       (ClientData) &pattern);
  		    regfree(&pattern.re);
  		    free(pattern.replace);
  		    free(pattern.matches);
--- 1868,1874 ----
  			pattern.nsub = 10;
  		    pattern.matches = emalloc(pattern.nsub *
  					      sizeof(regmatch_t));
! 		    newStr = VarModify(str, VarRESubstitute, &pattern);
  		    regfree(&pattern.re);
  		    free(pattern.replace);
  		    free(pattern.matches);
***************
*** 1888,1894 ****
  		    /*FALLTHRU*/
  		case 'T':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify (str, VarTail, (ClientData)0);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
--- 1885,1891 ----
  		    /*FALLTHRU*/
  		case 'T':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify(str, VarTail, NULL);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
***************
*** 1896,1902 ****
  		    /*FALLTHRU*/
  		case 'H':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify (str, VarHead, (ClientData)0);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
--- 1893,1899 ----
  		    /*FALLTHRU*/
  		case 'H':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify(str, VarHead, NULL);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
***************
*** 1904,1910 ****
  		    /*FALLTHRU*/
  		case 'E':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify (str, VarSuffix, (ClientData)0);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
--- 1901,1907 ----
  		    /*FALLTHRU*/
  		case 'E':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify(str, VarSuffix, NULL);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
***************
*** 1912,1918 ****
  		    /*FALLTHRU*/
  		case 'R':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify (str, VarRoot, (ClientData)0);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
--- 1909,1915 ----
  		    /*FALLTHRU*/
  		case 'R':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify(str, VarRoot, NULL);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
***************
*** 1920,1926 ****
  		    /*FALLTHRU*/
  		case 'U':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify (str, VarUppercase, (ClientData)0);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
--- 1917,1923 ----
  		    /*FALLTHRU*/
  		case 'U':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify(str, VarUppercase, NULL);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
***************
*** 1928,1934 ****
  		    /*FALLTHRU*/
  		case 'L':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify (str, VarLowercase, (ClientData)0);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
--- 1925,1931 ----
  		    /*FALLTHRU*/
  		case 'L':
  		    if (tstr[1] == endc || tstr[1] == ':') {
! 			newStr = VarModify(str, VarLowercase, NULL);
  			cp = tstr + 1;
  			termc = *cp;
  			break;
***************
*** 2007,2014 ****
  			 * SYSV modifications happen through the whole
  			 * string. Note the pattern is anchored at the end.
  			 */
! 			newStr = VarModify(str, VarSYSVMatch,
! 					   (ClientData)&pattern);
  
  			/*
  			 * Restore the nulled characters
--- 2004,2010 ----
  			 * SYSV modifications happen through the whole
  			 * string. Note the pattern is anchored at the end.
  			 */
! 			newStr = VarModify(str, VarSYSVMatch, &pattern);
  
  			/*
  			 * Restore the nulled characters
***************
*** 2278,2284 ****
  Var_GetTail(file)
      char    	*file;	    /* Filename to modify */
  {
!     return(VarModify(file, VarTail, (ClientData)0));
  }
  
  /*-
--- 2274,2280 ----
  Var_GetTail(file)
      char    	*file;	    /* Filename to modify */
  {
!     return VarModify(file, VarTail, NULL);
  }
  
  /*-
***************
*** 2300,2306 ****
  Var_GetHead(file)
      char    	*file;	    /* Filename to manipulate */
  {
!     return(VarModify(file, VarHead, (ClientData)0));
  }
  
  /*-
--- 2296,2302 ----
  Var_GetHead(file)
      char    	*file;	    /* Filename to manipulate */
  {
!     return VarModify(file, VarHead, NULL);
  }
  
  /*-
***************
*** 2354,2358 ****
  Var_Dump (ctxt)
      GNode          *ctxt;
  {
!     Lst_ForEach (ctxt->context, VarPrintVar, (ClientData) 0);
  }
--- 2350,2354 ----
  Var_Dump (ctxt)
      GNode          *ctxt;
  {
!     Lst_ForEach(ctxt->context, VarPrintVar, NULL);
  }