===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/make.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/make/make.c	1997/04/28 01:52:38	1.6
--- src/usr.bin/make/make.c	1998/12/05 00:06:28	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: make.c,v 1.6 1997/04/28 01:52:38 millert Exp $	*/
  /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: make.c,v 1.7 1998/12/05 00:06:28 espie Exp $	*/
  /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
  
  /*
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: make.c,v 1.6 1997/04/28 01:52:38 millert Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: make.c,v 1.7 1998/12/05 00:06:28 espie Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 129,135 ****
      ClientData pgn;	/* the current parent */
      ClientData cgn;	/* the child we've just examined */
  {
!     return (Make_TimeStamp((GNode *) pgn, (GNode *) cgn));
  }
  
  /*-
--- 129,135 ----
      ClientData pgn;	/* the current parent */
      ClientData cgn;	/* the child we've just examined */
  {
!     return Make_TimeStamp((GNode *) pgn, (GNode *) cgn);
  }
  
  /*-
***************
*** 376,382 ****
      ClientData pgn;	/* the current parent */
      ClientData cgn;	/* the child we've just examined */
  {
!     return (Make_HandleUse((GNode *) pgn, (GNode *) cgn));
  }
  
  /*-
--- 376,382 ----
      ClientData pgn;	/* the current parent */
      ClientData cgn;	/* the child we've just examined */
  {
!     return Make_HandleUse((GNode *) pgn, (GNode *) cgn);
  }
  
  /*-
***************
*** 414,421 ****
      char *p1;
  
      cname = Var_Value (TARGET, cgn, &p1);
!     if (p1)
! 	free(p1);
  
      /*
       * If the child was actually made, see what its modification time is
--- 414,420 ----
      char *p1;
  
      cname = Var_Value (TARGET, cgn, &p1);
!     efree(p1);
  
      /*
       * If the child was actually made, see what its modification time is
***************
*** 544,551 ****
  		Var_Set (PREFIX, cpref, pgn);
  	    }
  	}
! 	if (p1)
! 	    free(p1);
  	Lst_Close (cgn->iParents);
      }
  }
--- 543,549 ----
  		Var_Set (PREFIX, cpref, pgn);
  	    }
  	}
! 	efree(p1);
  	Lst_Close (cgn->iParents);
      }
  }
***************
*** 616,623 ****
  	     */
  	    Var_Append(OODATE, child, pgn);
  	}
! 	if (p1)
! 	    free(p1);
      }
      return (0);
  }
--- 614,620 ----
  	     */
  	    Var_Append(OODATE, child, pgn);
  	}
! 	efree(p1);
      }
      return (0);
  }
***************
*** 660,667 ****
      if (gn->type & OP_JOIN) {
  	char *p1;
  	Var_Set (TARGET, Var_Value (ALLSRC, gn, &p1), gn);
! 	if (p1)
! 	    free(p1);
      }
  }
  
--- 657,663 ----
      if (gn->type & OP_JOIN) {
  	char *p1;
  	Var_Set (TARGET, Var_Value (ALLSRC, gn, &p1), gn);
! 	efree(p1);
      }
  }
  
***************
*** 906,912 ****
  	(void)MakeStartJobs();
      }
  
!     errors = Job_End();
  
      /*
       * Print the final status of each target. E.g. if it wasn't made
--- 902,908 ----
  	(void)MakeStartJobs();
      }
  
!     errors = Job_Finish();
  
      /*
       * Print the final status of each target. E.g. if it wasn't made