new dinode organization and naming

SCCS-vsn: sbin/restore/interactive.c 8.5
SCCS-vsn: sbin/restore/dirs.c 8.7
SCCS-vsn: sbin/restore/tape.c 8.9

diff --git a/usr/src/sbin/restore/dirs.c b/usr/src/sbin/restore/dirs.c
index 6d859b0..f7605f2 100644 (file)
--- a/usr/src/sbin/restore/dirs.c
+++ b/usr/src/sbin/restore/dirs.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)dirs.c     8.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)dirs.c     8.7 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -19,9 +19,9 @@ static char sccsid[] = "@(#)dirs.c    8.6 (Berkeley) %G%";
 #include <sys/stat.h>
 #include <sys/time.h>
 
 #include <sys/stat.h>
 #include <sys/time.h>
 

-#include <ufs/ffs/fs.h>

 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>

+#include <ufs/ffs/fs.h>

 #include <protocols/dumprestore.h>
 
 #include <errno.h>
 #include <protocols/dumprestore.h>
 
 #include <errno.h>


@@ -683,10 +683,10 @@ allocinotab(ino, dip, seekpt)
        if (mf == NULL)
                return (itp);
        node.ino = ino;
        if (mf == NULL)
                return (itp);
        node.ino = ino;

-       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.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.mode = dip->di_mode;
        node.flags = dip->di_flags;
        node.uid = dip->di_uid;
        node.mode = dip->di_mode;
        node.flags = dip->di_flags;
        node.uid = dip->di_uid;

diff --git a/usr/src/sbin/restore/interactive.c b/usr/src/sbin/restore/interactive.c
index 6487f78..579289a 100644 (file)
--- a/usr/src/sbin/restore/interactive.c
+++ b/usr/src/sbin/restore/interactive.c
@@ -6,16 +6,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)interactive.c      8.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)interactive.c      8.5 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 

-#include <ufs/ffs/fs.h>

 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>

+#include <ufs/ffs/fs.h>

 #include <protocols/dumprestore.h>
 
 #include <setjmp.h>
 #include <protocols/dumprestore.h>
 
 #include <setjmp.h>

diff --git a/usr/src/sbin/restore/tape.c b/usr/src/sbin/restore/tape.c
index 24ea57f..6048e52 100644 (file)
--- a/usr/src/sbin/restore/tape.c
+++ b/usr/src/sbin/restore/tape.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)tape.c     8.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)tape.c     8.9 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -488,10 +488,10 @@ extractfile(name)
 
        curfile.name = name;
        curfile.action = USING;
 
        curfile.name = name;
        curfile.action = USING;

-       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;
+       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;

        mode = curfile.dip->di_mode;
        flags = curfile.dip->di_flags;
        switch (mode & IFMT) {
        mode = curfile.dip->di_mode;
        flags = curfile.dip->di_flags;
        switch (mode & IFMT) {


@@ -1028,9 +1028,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_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.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_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_count = u_ospcl.s_ospcl.c_count;
        memmove(buf->c_addr, u_ospcl.s_ospcl.c_addr, (long)256);
        if (u_ospcl.s_ospcl.c_magic != OFS_MAGIC ||
        buf->c_count = u_ospcl.s_ospcl.c_count;
        memmove(buf->c_addr, u_ospcl.s_ospcl.c_addr, (long)256);
        if (u_ospcl.s_ospcl.c_magic != OFS_MAGIC ||