===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/var.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -c -r1.79 -r1.80
*** src/usr.bin/make/var.c	2007/09/17 09:45:37	1.79
--- src/usr.bin/make/var.c	2007/09/17 10:39:33	1.80
***************
*** 1,5 ****
  /*	$OpenPackages$ */
! /*	$OpenBSD: var.c,v 1.79 2007/09/17 09:45:37 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
--- 1,5 ----
  /*	$OpenPackages$ */
! /*	$OpenBSD: var.c,v 1.80 2007/09/17 10:39:33 espie Exp $	*/
  /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
  
  /*
***************
*** 437,443 ****
  void
  SymTable_Init(SymTable *ctxt)
  {
! 	static SymTable sym_template;	
  	memcpy(ctxt, &sym_template, sizeof(*ctxt));
  }
  
--- 437,443 ----
  void
  SymTable_Init(SymTable *ctxt)
  {
! 	static SymTable sym_template;
  	memcpy(ctxt, &sym_template, sizeof(*ctxt));
  }
  
***************
*** 639,645 ****
  	}
  	slot = ohash_lookup_interval(&global_variables, name, ename, k);
  	v = ohash_find(&global_variables, slot);
! 	
  	if (v == NULL)
  		return;
  
--- 639,645 ----
  	}
  	slot = ohash_lookup_interval(&global_variables, name, ename, k);
  	v = ohash_find(&global_variables, slot);
! 
  	if (v == NULL)
  		return;
  
***************
*** 861,867 ****
  	bool result;
  	bool has_modifier;
  	const char *tstr = str;
! 	
  	has_modifier = parse_base_variable_name(&tstr, &name, ctxt);
  	VarName_Free(&name);
  	result = true;
--- 861,867 ----
  	bool result;
  	bool has_modifier;
  	const char *tstr = str;
! 
  	has_modifier = parse_base_variable_name(&tstr, &name, ctxt);
  	VarName_Free(&name);
  	result = true;
***************
*** 1148,1154 ****
  	k = ohash_interval(name, &ename);
  
  	l->me = find_global_var_without_env(name, ename, k);
! 	l->old = *(l->me);			
  	l->me->flags = VAR_SEEN_ENV | VAR_DUMMY;
  	return l;
  }
--- 1148,1154 ----
  	k = ohash_interval(name, &ename);
  
  	l->me = find_global_var_without_env(name, ename, k);
! 	l->old = *(l->me);
  	l->me->flags = VAR_SEEN_ENV | VAR_DUMMY;
  	return l;
  }
***************
*** 1219,1225 ****
  			}
  			if (*p == ':') {
  				bool doFree;	/* should val be freed ? */
! 				char *newval;	
  				struct Name name;
  
  				doFree = false;
--- 1219,1225 ----
  			}
  			if (*p == ':') {
  				bool doFree;	/* should val be freed ? */
! 				char *newval;
  				struct Name name;
  
  				doFree = false;