use RST_DIR in place of DIR (to avoid conflicts with dirirectory

access routine library

SCCS-vsn: sbin/restore/restore.h 5.9
SCCS-vsn: sbin/restore/interactive.c 5.10
SCCS-vsn: sbin/restore/dirs.c 5.16

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

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

 #endif /* not lint */
 
 #include "restore.h"
 #endif /* not lint */
 
 #include "restore.h"

diff --git a/usr/src/sbin/restore/interactive.c b/usr/src/sbin/restore/interactive.c
index 211abb8..ae3c5c2 100644 (file)
--- a/usr/src/sbin/restore/interactive.c
+++ b/usr/src/sbin/restore/interactive.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include "restore.h"
 #endif /* not lint */
 
 #include "restore.h"


@@ -462,7 +462,7 @@ expand(as, rflg, ap)
        int             count, size;
        char            dir = 0;
        char            *rescan = 0;
        int             count, size;
        char            dir = 0;
        char            *rescan = 0;

-       DIR             *dirp;
+       RST_DIR         *dirp;

        register char   *s, *cs;
        int             sindex, rindex, lindex;
        struct direct   *dp;
        register char   *s, *cs;
        int             sindex, rindex, lindex;
        struct direct   *dp;


@@ -651,7 +651,7 @@ printlist(name, ino, basename)
        register struct direct *dp;
        static struct arglist alist = { 0, 0, 0, 0, "ls" };
        struct afile single;
        register struct direct *dp;
        static struct arglist alist = { 0, 0, 0, 0, "ls" };
        struct afile single;

-       DIR *dirp;
+       RST_DIR *dirp;

 
        if ((dirp = rst_opendir(name)) == NULL) {
                single.fnum = ino;
 
        if ((dirp = rst_opendir(name)) == NULL) {
                single.fnum = ino;

diff --git a/usr/src/sbin/restore/restore.h b/usr/src/sbin/restore/restore.h
index 8e4175e..e0cb389 100644 (file)
--- a/usr/src/sbin/restore/restore.h
+++ b/usr/src/sbin/restore/restore.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)restore.h   5.8 (Berkeley) %G%
+ *     @(#)restore.h   5.9 (Berkeley) %G%

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>