diff options
| author | hoek <hoek@FreeBSD.org> | 1999-08-17 00:39:26 +0000 |
|---|---|---|
| committer | hoek <hoek@FreeBSD.org> | 1999-08-17 00:39:26 +0000 |
| commit | 5d62bbe5a50f3c7ebe77803935bb73d1b6470757 (patch) | |
| tree | c22ea5a1bb41e5c36b9b7c6a2f05399b0e89a84b /usr.bin/make/job.c | |
| parent | 33f15d9b593b0367efcf31b8b6b795c36746c989 (diff) | |
| download | FreeBSD-src-5d62bbe5a50f3c7ebe77803935bb73d1b6470757.zip FreeBSD-src-5d62bbe5a50f3c7ebe77803935bb73d1b6470757.tar.gz | |
Merge style- and trivial- only changes from OpenBSD (dated 1999/07/29-19:55+1).
Obtained from: OpenBSD, sometimes indirected from NetBSD; myself
Diffstat (limited to 'usr.bin/make/job.c')
| -rw-r--r-- | usr.bin/make/job.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 1525b7c..d102c53 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -35,11 +35,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: job.c,v 1.11 1998/11/14 16:15:04 dg Exp $ + * $Id: job.c,v 1.12 1999/02/14 22:22:42 dt Exp $ */ #ifndef lint +#if 0 static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94"; +#else +static const char rcsid[] = + "$Id"; +#endif #endif /* not lint */ #ifndef OLD_JOKE @@ -1054,7 +1059,7 @@ Job_Touch(gn, silent) * modification time, then close the file. */ if (read(streamID, &c, 1) == 1) { - (void) lseek(streamID, 0L, L_SET); + (void) lseek(streamID, 0L, SEEK_SET); (void) write(streamID, &c, 1); } @@ -1107,8 +1112,7 @@ Job_CheckCommands(gn, abortProc) */ Make_HandleUse(DEFAULT, gn); Var_Set(IMPSRC, Var_Value(TARGET, gn, &p1), gn); - if (p1) - free(p1); + efree(p1); } else if (Dir_MTime(gn) == 0) { /* * The node wasn't the target of an operator we have no .DEFAULT @@ -1228,7 +1232,7 @@ JobExec(job, argv) if (dup2(FILENO(job->cmdFILE), 0) == -1) Punt("Cannot dup2: %s", strerror(errno)); (void) fcntl(0, F_SETFD, 0); - (void) lseek(0, 0, L_SET); + (void) lseek(0, 0, SEEK_SET); if (usePipes) { /* |
