From 5827156eb138eebb581ab6882874652825d862b2 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Sun, 11 Jun 1995 05:28:52 +0000
Subject: [PATCH] Back out previous change.

---
 sbin/restore/dirs.c | 12 ++++++------
 sbin/restore/tape.c | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index a5bad734049a..1ca82acc68ff 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dirs.c,v 1.14 1995/06/07 17:16:45 cgd Exp $	*/
+/*	$NetBSD: dirs.c,v 1.15 1995/06/11 05:28:52 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)dirs.c	8.5 (Berkeley) 8/31/94";
 #else
-static char rcsid[] = "$NetBSD: dirs.c,v 1.14 1995/06/07 17:16:45 cgd Exp $";
+static char rcsid[] = "$NetBSD: dirs.c,v 1.15 1995/06/11 05:28:52 mycroft Exp $";
 #endif
 #endif /* not lint */
 
@@ -715,10 +715,10 @@ allocinotab(ino, dip, seekpt)
 	if (mf == NULL)
 		return (itp);
 	node.ino = ino;
-	node.timep[0].tv_sec = dip->di_atime;
-	node.timep[0].tv_usec = dip->di_atimensec / 1000;
-	node.timep[1].tv_sec = dip->di_mtime;
-	node.timep[1].tv_usec = dip->di_mtimensec / 1000;
+	node.timep[0].tv_sec = dip->di_atime.ts_sec;
+	node.timep[0].tv_usec = dip->di_atime.ts_nsec / 1000;
+	node.timep[1].tv_sec = dip->di_mtime.ts_sec;
+	node.timep[1].tv_usec = dip->di_mtime.ts_nsec / 1000;
 	node.mode = dip->di_mode;
 	node.flags = dip->di_flags;
 	node.uid = dip->di_uid;
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index a6de2fdaa171..a64c9ff42b4f 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tape.c,v 1.17 1995/06/07 17:16:49 cgd Exp $	*/
+/*	$NetBSD: tape.c,v 1.18 1995/06/11 05:30:36 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c	8.6 (Berkeley) 9/13/94";
 #else
-static char rcsid[] = "$NetBSD: tape.c,v 1.17 1995/06/07 17:16:49 cgd Exp $";
+static char rcsid[] = "$NetBSD: tape.c,v 1.18 1995/06/11 05:30:36 mycroft Exp $";
 #endif
 #endif /* not lint */
 
@@ -520,10 +520,10 @@ extractfile(name)
 
 	curfile.name = name;
 	curfile.action = USING;
-	timep[0].tv_sec = curfile.dip->di_atime;
-	timep[0].tv_usec = curfile.dip->di_atimensec / 1000;
-	timep[1].tv_sec = curfile.dip->di_mtime;
-	timep[1].tv_usec = curfile.dip->di_mtimensec / 1000;
+	timep[0].tv_sec = curfile.dip->di_atime.ts_sec;
+	timep[0].tv_usec = curfile.dip->di_atime.ts_nsec / 1000;
+	timep[1].tv_sec = curfile.dip->di_mtime.ts_sec;
+	timep[1].tv_usec = curfile.dip->di_mtime.ts_nsec / 1000;
 	mode = curfile.dip->di_mode;
 	flags = curfile.dip->di_flags;
 	switch (mode & IFMT) {
@@ -1061,9 +1061,9 @@ gethead(buf)
 	buf->c_dinode.di_gid = u_ospcl.s_ospcl.c_dinode.odi_gid;
 	buf->c_dinode.di_size = u_ospcl.s_ospcl.c_dinode.odi_size;
 	buf->c_dinode.di_rdev = u_ospcl.s_ospcl.c_dinode.odi_rdev;
-	buf->c_dinode.di_atime = u_ospcl.s_ospcl.c_dinode.odi_atime;
-	buf->c_dinode.di_mtime = u_ospcl.s_ospcl.c_dinode.odi_mtime;
-	buf->c_dinode.di_ctime = u_ospcl.s_ospcl.c_dinode.odi_ctime;
+	buf->c_dinode.di_atime.ts_sec = u_ospcl.s_ospcl.c_dinode.odi_atime;
+	buf->c_dinode.di_mtime.ts_sec = u_ospcl.s_ospcl.c_dinode.odi_mtime;
+	buf->c_dinode.di_ctime.ts_sec = u_ospcl.s_ospcl.c_dinode.odi_ctime;
 	buf->c_count = u_ospcl.s_ospcl.c_count;
 	memcpy(buf->c_addr, u_ospcl.s_ospcl.c_addr, (long)256);
 	if (u_ospcl.s_ospcl.c_magic != OFS_MAGIC ||