file reorg, pathnames.h, paths.h

[unix-history] / usr / src / sbin / restore / dirs.c

diff --git a/usr/src/sbin/restore/dirs.c b/usr/src/sbin/restore/dirs.c
index 8fa74e3..437b91e 100644 (file)
--- a/usr/src/sbin/restore/dirs.c
+++ b/usr/src/sbin/restore/dirs.c
@@ -16,12 +16,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #include "restore.h"
 #include <protocols/dumprestore.h>
 #include <sys/file.h>
 #endif /* not lint */
 
 #include "restore.h"
 #include <protocols/dumprestore.h>
 #include <sys/file.h>

+#include "pathnames.h"

 
 /*
  * Symbol table of directories read from tape.
 
 /*
  * Symbol table of directories read from tape.


@@ -86,7 +87,7 @@ extractdirs(genmode)
        int putdir(), null();
 
        vprintf(stdout, "Extract directories from tape\n");
        int putdir(), null();
 
        vprintf(stdout, "Extract directories from tape\n");

-       (void) sprintf(dirfile, "/tmp/rstdir%d", dumpdate);
+       (void) sprintf(dirfile, "%s/rstdir%d", _PATH_TMP, dumpdate);

        df = fopen(dirfile, "w");
        if (df == 0) {
                fprintf(stderr,
        df = fopen(dirfile, "w");
        if (df == 0) {
                fprintf(stderr,


@@ -96,7 +97,7 @@ extractdirs(genmode)
                done(1);
        }
        if (genmode != 0) {
                done(1);
        }
        if (genmode != 0) {

-               (void) sprintf(modefile, "/tmp/rstmode%d", dumpdate);
+               (void) sprintf(modefile, "%s/rstmode%d", _PATH_TMP, dumpdate);

                mf = fopen(modefile, "w");
                if (mf == 0) {
                        fprintf(stderr,
                mf = fopen(modefile, "w");
                if (mf == 0) {
                        fprintf(stderr,


@@ -457,7 +458,7 @@ setdirmodes()
        char *cp;
        
        vprintf(stdout, "Set directory mode, owner, and times.\n");
        char *cp;
        
        vprintf(stdout, "Set directory mode, owner, and times.\n");

-       (void) sprintf(modefile, "/tmp/rstmode%d", dumpdate);
+       (void) sprintf(modefile, "%s/rstmode%d", _PATH_TMP, dumpdate);

        mf = fopen(modefile, "r");
        if (mf == NULL) {
                perror("fopen");
        mf = fopen(modefile, "r");
        if (mf == NULL) {
                perror("fopen");