diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2000-10-13 08:30:52 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2000-10-13 08:30:52 +0000 |
| commit | cf87996b56dadea3dad3ad8c8ad568c6af538b5a (patch) | |
| tree | 1066f209a08d051905f7adb318ce578e00a6e48d /usr.bin | |
| parent | 92afcb19752dd8474546aa80ecd980e9a4d78af5 (diff) | |
Fix Arch_MemMTime (previous change I did was bogus)
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/make/arch.c | 16 | ||||
| -rw-r--r-- | usr.bin/make/extern.h | 4 |
2 files changed, 7 insertions, 13 deletions
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c index 7f1a2aefdcc..3f9fdd35ae8 100644 --- a/usr.bin/make/arch.c +++ b/usr.bin/make/arch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arch.c,v 1.35 2000/09/14 13:56:14 espie Exp $ */ +/* $OpenBSD: arch.c,v 1.36 2000/10/13 08:30:49 espie Exp $ */ /* $NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $ */ /* @@ -69,7 +69,7 @@ * exists. The time is placed in the member's * GNode. Returns the modification time. * - * Arch_MemTime Find the modification time of a member of + * Arch_MemMTime Find the modification time of a member of * an archive. Called when the member doesn't * already exist. Looks in the archive for the * modification time. Returns the modification @@ -108,7 +108,7 @@ static char sccsid[] = "@(#)arch.c 8.2 (Berkeley) 1/2/94"; #else UNUSED -static char rcsid[] = "$OpenBSD: arch.c,v 1.35 2000/09/14 13:56:14 espie Exp $"; +static char rcsid[] = "$OpenBSD: arch.c,v 1.36 2000/10/13 08:30:49 espie Exp $"; #endif #endif /* not lint */ @@ -1065,15 +1065,9 @@ Arch_MTime(gn) * Given a non-existent archive member's node, get its modification * time from its archived form, if it exists. * - * Results: - * TRUE if found. - * - * Side Effects: - * The mtime field is filled in. - * *----------------------------------------------------------------------- */ -Boolean +TIMESTAMP Arch_MemMTime (gn) GNode *gn; { @@ -1120,7 +1114,7 @@ Arch_MemMTime (gn) Lst_Close(&gn->parents); - return gn->mtime == OUT_OF_DATE; + return gn->mtime; } /*- diff --git a/usr.bin/make/extern.h b/usr.bin/make/extern.h index 52aa630b61a..83305e4239f 100644 --- a/usr.bin/make/extern.h +++ b/usr.bin/make/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.33 2000/09/14 13:52:42 espie Exp $ */ +/* $OpenBSD: extern.h,v 1.34 2000/10/13 08:30:51 espie Exp $ */ /* $NetBSD: nonints.h,v 1.12 1996/11/06 17:59:19 christos Exp $ */ /*- @@ -46,7 +46,7 @@ extern ReturnStatus Arch_ParseArchive __P((char **, Lst, SymTable *)); extern void Arch_Touch __P((GNode *)); extern void Arch_TouchLib __P((GNode *)); extern TIMESTAMP Arch_MTime __P((GNode *)); -extern Boolean Arch_MemMTime __P((GNode *)); +extern TIMESTAMP Arch_MemMTime __P((GNode *)); extern void Arch_FindLib __P((GNode *, Lst)); extern Boolean Arch_LibOODate __P((GNode *)); extern void Arch_Init __P((void)); |