#ifndef lint
static const char rcsid[] =
- "$Id: tape.c,v 1.91 2007/02/22 20:12:50 stelian Exp $";
+ "$Id: tape.c,v 1.96 2010/03/22 15:40:55 stelian Exp $";
#endif /* not lint */
#include <config.h>
if (nextvol == 1) {
tapesread = 0;
gettingfile = 0;
- tpblksread = 0;
blksread = 0;
}
if (pipein) {
}
case IFIFO:
+ {
+ uid_t luid = curfile.dip->di_uid;
+ gid_t lgid = curfile.dip->di_gid;
+
Vprintf(stdout, "extract fifo %s\n", name);
- if (Nflag) {
- skipfile();
+ skipfile();
+ if (Nflag)
return (GOOD);
- }
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) chown(name, luid, lgid);
(void) chmod(name, mode);
+ extractattr(name);
+ utimes(name, timep);
if (flags)
#ifdef __linux__
(void) lsetflags(name, flags);
(void) chflags(name, flags);
#endif
#endif
- skipfile();
- extractattr(name);
- utimes(name, timep);
return (GOOD);
-
+ }
case IFCHR:
case IFBLK:
+ {
+ uid_t luid = curfile.dip->di_uid;
+ gid_t lgid = curfile.dip->di_gid;
+ int lrdev = (int)curfile.dip->di_rdev;
+
Vprintf(stdout, "extract special file %s\n", name);
- if (Nflag) {
- skipfile();
+ skipfile();
+ if (Nflag)
return (GOOD);
- }
if (! (spcl.c_flags & DR_METAONLY)) {
if (uflag)
(void)unlink(name);
- if (mknod(name, mode, (int)curfile.dip->di_rdev) < 0) {
+ if (mknod(name, mode, lrdev) < 0) {
warn("%s: cannot create special file", name);
- skipfile();
return (FAIL);
}
}
- (void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
+ (void) chown(name, luid, lgid);
(void) chmod(name, mode);
+ extractattr(name);
+ utimes(name, timep);
if (flags)
#ifdef __linux__
{
}
#endif
#endif
- skipfile();
- extractattr(name);
- utimes(name, timep);
return (GOOD);
-
+ }
case IFREG:
{
uid_t luid = curfile.dip->di_uid;
skipfile();
(void) chown(name, luid, lgid);
(void) chmod(name, mode);
+ extractattr(name);
+ utimes(name, timep);
if (flags)
#ifdef __linux__
(void) lsetflags(name, flags);
(void) chflags(name, flags);
#endif
#endif
- extractattr(name);
- utimes(name, timep);
return (GOOD);
}
}
(void) fchown(ofile, uid, gid);
(void) fchmod(ofile, mode);
(void) close(ofile);
- (void) lsetflags(oFileRsrc, flags);
utimes(oFileRsrc, timep);
+ (void) lsetflags(oFileRsrc, flags);
return (GOOD);
}
/* NOTREACHED */
skipfile();
return (FAIL);
}
-
+
memset(xattrbuf, 0, XATTR_MAXSIZE);
xattrlen = 0;
+ /*
+ * ugly hack: cope with invalid spcl.c_addr[] records written by
+ * old versions of dump.
+ */
+ readmapflag = 1;
+
getfile(xtrxattr, xtrnull);
+ readmapflag = 0;
+
memcpy(buffer, xattrbuf, XATTR_MAXSIZE);
return (GOOD);
break;
}
}
- if (gethead(&spcl) == GOOD && size > 0) {
+ while (gethead(&spcl) != GOOD) {
+ fprintf(stderr, "Incorrect block for %s at %ld blocks\n",
+ curfile.name, (long)blksread);
+ }
+ if (size > 0) {
if (spcl.c_type == TS_ADDR)
goto loop;
Dprintf(stdout,