#ifndef lint
static const char rcsid[] =
- "$Id: tape.c,v 1.59 2002/03/28 14:53:01 stelian Exp $";
+ "$Id: tape.c,v 1.62 2002/05/21 15:48:46 stelian Exp $";
#endif /* not lint */
#include <config.h>
#ifdef RRESTORE
if (host)
- mt = rmtopen(temptape, 0);
+ mt = rmtopen(temptape, "O_RDONLY");
else
#endif
if (pipein)
if (nextvol == 1) {
tapesread = 0;
gettingfile = 0;
+ tpblksread = 0;
+ blksread = 0;
}
if (pipein) {
if (nextvol != 1)
}
#ifdef RRESTORE
if (host)
- mt = rmtopen(magtape, 0);
+ mt = rmtopen(magtape, "O_RDONLY");
else
#endif
mt = OPEN(magtape, O_RDONLY, 0);
goto again;
}
tapesread |= 1 << volno;
- blksread = saved_blksread;
- tpblksread = saved_tpblksread;
/*
* If continuing from the previous volume, skip over any
* blocks read already at the end of the previous volume.
#endif /* !HAVE_ZLIB && !HAVE_BZLIB */
}
Dprintf(stdout, "read %ld recs, tape starts with %ld\n",
- tpblksread, (long)tmpbuf.c_firstrec);
+ tpblksread - 1, (long)tmpbuf.c_firstrec);
if (tmpbuf.c_type == TS_TAPE && (tmpbuf.c_flags & DR_NEWHEADER)) {
if (!wantnext) {
- tpblksread = tmpbuf.c_firstrec;
+ tpblksread = tmpbuf.c_firstrec + 1;
for (i = tmpbuf.c_count; i > 0; i--)
readtape(buf);
} else if (tmpbuf.c_firstrec > 0 &&
#endif
int
-extractfile(char *name)
+extractfile(struct entry *ep, int doremove)
{
unsigned int flags;
mode_t mode;
struct timeval timep[2];
- struct entry *ep;
+ char *name = myname(ep);
+
+ /* If removal is requested (-r mode) do remove it unless
+ * we are extracting a metadata only inode */
+ if (spcl.c_flags & DR_METAONLY) {
+ Vprintf(stdout, "file %s is metadata only\n", name);
+ }
+ else {
+ if (doremove) {
+ removeleaf(ep);
+ ep->e_flags &= ~REMOVED;
+ }
+ }
curfile.name = name;
curfile.action = USING;
case IFDIR:
if (mflag) {
- ep = lookupname(name);
if (ep == NULL || ep->e_flags & EXTRACT)
panic("unextracted directory %s\n", name);
skipfile();
uid_t luid = curfile.dip->di_uid;
gid_t lgid = curfile.dip->di_gid;
#endif
- lnkbuf[0] = '\0';
- pathlen = 0;
- getfile(xtrlnkfile, xtrlnkskip);
- if (pathlen == 0) {
- Vprintf(stdout,
- "%s: zero length symbolic link (ignored)\n", name);
- return (GOOD);
+ if (! (spcl.c_flags & DR_METAONLY)) {
+ lnkbuf[0] = '\0';
+ pathlen = 0;
+ getfile(xtrlnkfile, xtrlnkskip);
+ if (pathlen == 0) {
+ Vprintf(stdout,
+ "%s: zero length symbolic link (ignored)\n", name);
+ return (GOOD);
+ }
+ if (linkit(lnkbuf, name, SYMLINK) == FAIL)
+ return (FAIL);
}
- if (linkit(lnkbuf, name, SYMLINK) == FAIL)
- return (FAIL);
+ else
+ skipfile();
+
#ifdef HAVE_LCHOWN
(void) lchown(name, luid, lgid);
#endif
skipfile();
return (GOOD);
}
- if (uflag && !Nflag)
- (void)unlink(name);
- if (mkfifo(name, mode) < 0) {
- warn("%s: cannot create fifo", name);
- skipfile();
- return (FAIL);
+ if (! (spcl.c_flags & DR_METAONLY)) {
+ if (uflag && !Nflag)
+ (void)unlink(name);
+ if (mkfifo(name, mode) < 0) {
+ warn("%s: cannot create fifo", name);
+ skipfile();
+ return (FAIL);
+ }
}
(void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
(void) chmod(name, mode);
skipfile();
return (GOOD);
}
- if (uflag)
- (void)unlink(name);
- if (mknod(name, mode, (int)curfile.dip->di_rdev) < 0) {
- warn("%s: cannot create special file", name);
- skipfile();
- return (FAIL);
+ if (! (spcl.c_flags & DR_METAONLY)) {
+ if (uflag)
+ (void)unlink(name);
+ if (mknod(name, mode, (int)curfile.dip->di_rdev) < 0) {
+ warn("%s: cannot create special file", name);
+ skipfile();
+ return (FAIL);
+ }
}
(void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
(void) chmod(name, mode);
return (GOOD);
case IFREG:
+ {
+ uid_t luid = curfile.dip->di_uid;
+ gid_t lgid = curfile.dip->di_gid;
+
Vprintf(stdout, "extract file %s\n", name);
if (Nflag) {
skipfile();
return (GOOD);
}
- if (uflag)
- (void)unlink(name);
- if ((ofile = OPEN(name, O_WRONLY | O_CREAT | O_TRUNC,
- 0666)) < 0) {
- warn("%s: cannot create file", name);
- skipfile();
- return (FAIL);
+ if (! (spcl.c_flags & DR_METAONLY)) {
+ if (uflag)
+ (void)unlink(name);
+ if ((ofile = OPEN(name, O_WRONLY | O_CREAT | O_TRUNC,
+ 0666)) < 0) {
+ warn("%s: cannot create file", name);
+ skipfile();
+ return (FAIL);
+ }
+ getfile(xtrfile, xtrskip);
+ (void) close(ofile);
}
- (void) fchown(ofile, curfile.dip->di_uid, curfile.dip->di_gid);
- (void) fchmod(ofile, mode);
+ else
+ skipfile();
+ (void) chown(name, luid, lgid);
+ (void) chmod(name, mode);
if (flags)
#ifdef __linux__
- (void) setflags(ofile, flags);
+ (void) fsetflags(name, flags);
#else
- (void) fchflags(ofile, flags);
+ (void) chflags(name, flags);
#endif
- getfile(xtrfile, xtrskip);
- (void) close(ofile);
utimes(name, timep);
return (GOOD);
}
+ }
/* NOTREACHED */
}
name, mode & 07777, sb.st_mode & 07777);
do_compare_error;
}
+ if (spcl.c_flags & DR_METAONLY) {
+ skipfile();
+ return;
+ }
switch (mode & IFMT) {
default:
skipfile();