* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
#ifndef lint
static const char rcsid[] =
- "$Id: restore.c,v 1.28 2002/02/04 11:21:20 stelian Exp $";
+ "$Id: restore.c,v 1.40 2010/12/06 14:26:50 stelian Exp $";
#endif /* not lint */
#include <config.h>
#endif
#include <bsdcompat.h>
#else /* __linux__ */
+#ifdef sunos
+#include <sys/fcntl.h>
+#include <bsdcompat.h>
+#else
#include <ufs/ufs/dinode.h>
+#endif
#endif /* __linux__ */
+
#include <protocols/dumprestore.h>
#include <compaterr.h>
*/
/* ARGSUSED */
long
-deletefile(char *name, dump_ino_t ino, int type)
+deletefile(char *name, dump_ino_t ino, UNUSED(int type))
{
long descend = hflag ? GOOD : FAIL;
struct entry *ep;
continue;
#ifdef __linux__
(void)fprintf(stderr, "BUG! Should call delwhiteout\n");
+#else
+#ifdef sunos
#else
delwhiteout(ep);
+#endif
#endif
freeentry(ep);
}
/*
* Find unreferenced link names.
+ *
+ * This also takes care of directories which were missed by removeoldleaves(),
+ * because their inode has been reused, but excluded from the dump.
*/
void
findunreflinks(void)
{
struct entry *ep, *np;
dump_ino_t i;
+ int j;
Vprintf(stdout, "Find unreferenced names.\n");
for (i = ROOTINO; i < maxino; i++) {
ep = lookupino(i);
if (ep == NULL || ep->e_type == LEAF || TSTINO(i, dumpmap) == 0)
continue;
- for (np = ep->e_entries; np != NULL; np = np->e_sibling) {
- if (np->e_flags == 0) {
- Dprintf(stdout,
- "%s: remove unreferenced name\n",
- myname(np));
- removeleaf(np);
- freeentry(np);
+ if (ep->e_entries == NULL)
+ continue;
+ for (j = 0; j < dirhash_size; j++) {
+ for (np = ep->e_entries[j]; np != NULL; np = np->e_sibling) {
+ if ((np->e_flags & ~TMPNAME) == 0) {
+ Dprintf(stdout,
+ "%s: remove unreferenced name\n",
+ myname(np));
+ if (np->e_type == LEAF) {
+ removeleaf(np);
+ freeentry(np);
+ } else {
+ np->e_flags |= TMPNAME;
+ deleteino(np->e_ino);
+ np->e_next = removelist;
+ removelist = np;
+ }
+ }
}
}
}
* Any leaves remaining in removed directories is unreferenced.
*/
for (ep = removelist; ep != NULL; ep = ep->e_next) {
- for (np = ep->e_entries; np != NULL; np = np->e_sibling) {
- if (np->e_type == LEAF) {
- if (np->e_flags != 0)
- badentry(np, "unreferenced with flags");
- Dprintf(stdout,
- "%s: remove unreferenced name\n",
- myname(np));
- removeleaf(np);
- freeentry(np);
+ if (ep->e_entries == NULL)
+ continue;
+ for (j = 0; j < dirhash_size; j++) {
+ for (np = ep->e_entries[j]; np != NULL; np = np->e_sibling) {
+ if (np->e_type == LEAF) {
+ if (np->e_flags != 0)
+ badentry(np, "unreferenced with flags");
+ Dprintf(stdout,
+ "%s: remove unreferenced name\n",
+ myname(np));
+ removeleaf(np);
+ freeentry(np);
+ } else {
+ if ((np->e_flags & ~TMPNAME) != 0)
+ badentry(np, "unreferenced with flags");
+
+ if (np->e_flags == 0) {
+ Dprintf(stdout,
+ "%s: remove unreferenced name\n",
+ myname(np));
+ np->e_next = ep->e_next;
+ ep->e_next = np;
+ }
+ }
}
}
}
change = 0;
prev = &removelist;
for (ep = removelist; ep != NULL; ep = *prev) {
+ int docont = 0;
if (ep->e_entries != NULL) {
- prev = &ep->e_next;
- continue;
+ int i;
+ for (i = 0; i < dirhash_size; i++) {
+ if (ep->e_entries[i] != NULL) {
+ prev = &ep->e_next;
+ docont = 1;
+ break;
+ }
+ }
}
+ if (docont)
+ continue;
*prev = ep->e_next;
removenode(ep);
freeentry(ep);
badentry(ep, "unexpected file on tape");
do_compare_error;
}
- if (do_compare) (void) comparefile(myname(ep));
+ if (do_compare) {
+ (void) comparefile(myname(ep));
+ skipxattr();
+ }
ep->e_flags &= ~(NEW|EXTRACT);
}
if (first != curfile.ino) {
fprintf(stderr, "expected next file %ld, got %lu\n",
(long)first, (unsigned long)curfile.ino);
- do_compare_error;
skipfile();
goto next;
}
struct entry *ep;
dump_ino_t first;
long curvol;
+ int doremove;
if (command == 'R') {
Vprintf(stdout, "Continue extraction of new leaves\n");
* be removed since its type may change from one leaf type
* to another (e.g. "file" to "character special").
*/
- if ((ep->e_flags & EXTRACT) != 0) {
- removeleaf(ep);
- ep->e_flags &= ~REMOVED;
- }
- (void) extractfile(myname(ep));
+ if ((ep->e_flags & EXTRACT) != 0)
+ doremove = 1;
+ else
+ doremove = 0;
+ (void) extractfile(ep, doremove);
+ skipxattr();
ep->e_flags &= ~(NEW|EXTRACT);
+
/*
* We checkpoint the restore after every tape reel, so
* as to simplify the amount of work required by the
* 'R' command.
*/
- next:
+next:
if (curvol != volno) {
dumpsymtable(symtabfile, volno);
skipmaps();
long curvol;
#ifdef USE_QFA
long tnum, tmpcnt;
- long long tpos, curtpos;
+ long long tpos, curtpos = 0;
time_t tistart, tiend, titaken;
+ int volChg;
#endif
Vprintf(stdout, "Extract requested files\n");
curfile.action = SKIP;
#ifdef USE_QFA
- if (tapeposflag)
- curfile.ino = 0;
- else
+ if (!tapeposflag) {
#endif
if (volinfo[1] == ROOTINO)
curfile.ino = 0;
else
getvol((long)1);
+#ifdef USE_QFA
+ }
+#endif
skipmaps();
skipdirs();
first = lowerbnd(ROOTINO);
#ifdef USE_QFA
tistart = time(NULL);
if (tapeposflag) {
- /* get tape position for inode (position directly) */
- (void)Inode2Tapepos(next, &tnum, &tpos, 1);
- if (tpos == 0)
- /* get tape position for last available inode
- * (position before) */
- (void)Inode2Tapepos(next, &tnum, &tpos, 0);
+ /* get tape position for inode */
+ (void)Inode2Tapepos(next, &tnum, &tpos, 0);
if (tpos != 0) {
- if (tnum != volno)
+ if (tnum != volno) {
(void)RequestVol(tnum);
+ volChg = 1;
+ } else {
+ volChg = 0;
+ }
if (GetTapePos(&curtpos) == 0) {
/* curtpos +1000 ???, some drives
* might be too slow */
- if (tpos != curtpos) {
+ if (((tpos > (curtpos + 1000)) && (volChg == 0)) || ((tpos != curtpos) && (volChg == 1))) {
+ volChg = 0;
#ifdef DEBUG_QFA
- msg("positioning tape %ld from %lld to %lld for inode %10lu ...\n", volno, curtpos, tpos, (unsigned long)next);
+ msg("positioning tape %ld from %lld to %lld for inode %lu ...\n", volno, curtpos, tpos, (unsigned long)next);
#endif
if (GotoTapePos(tpos) == 0) {
#ifdef DEBUG_QFA
- if (GetTapePos(&curtpos) == 0)
- msg("before resync at tape position %lld (%ld, %ld, %s)\n", curtpos, next, curfile.ino, curfile.name);
+ if (GetTapePos(&curtpos) == 0) {
+ msg("before resnyc at tape position %lld (%ld, %ld, %s)\n", curtpos, next, curfile.ino, curfile.name);
+ }
#endif
ReReadInodeFromTape(next);
#ifdef DEBUG_QFA
- if (GetTapePos(&curtpos) == 0)
- msg("after resync at tape position %lld (%ld, %ld, %s)\n", curtpos, next, curfile.ino, curfile.name);
+ if (GetTapePos(&curtpos) == 0) {
+ msg("after resnyc at tape position %lld (%ld, %ld, %s)\n", curtpos, next, curfile.ino, curfile.name);
+ }
#endif
}
- }
+ } else {
#ifdef DEBUG_QFA
- else
- msg("already at tape %ld position %ld for inode %10lu ...\n", volno, tpos, (unsigned long)next);
+ msg("already at tape %ld position %ld for inode %lu ...\n", volno, tpos, (unsigned long)next);
#endif
+ }
}
}
}
if (volinfo[1] == ROOTINO) {
int i, goodvol = 1;
- for (i = 1; i < TP_NINOS && volinfo[i] != 0; ++i)
+ for (i = 1; i < (int)TP_NINOS && volinfo[i] != 0; ++i)
if (volinfo[i] < next)
goodvol = i;
panic("corrupted symbol table\n");
#ifdef USE_QFA
if (!createtapeposflag)
+#endif
fprintf(stderr, "%s: (inode %lu) not found on tape\n",
myname(ep), (unsigned long)next);
-#endif
ep->e_flags &= ~NEW;
next = lowerbnd(next);
}
msg("inode %ld at tapepos %ld\n", curfile.ino, curtapepos);
#endif
sprintf(gTps, "%ld\t%ld\t%lld\n", (unsigned long)curfile.ino, volno, curtapepos);
- if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
- warn("error writing tapepos file.\n");
+ if (write(gTapeposfd, gTps, strlen(gTps)) != (ssize_t)strlen(gTps))
+ warn("error writing tapepos file.\n");
skipfile();
- }
- else {
- msg("restoring %s\n", myname(ep));
+ } else {
#endif /* USE_QFA */
- (void) extractfile(myname(ep));
+ (void) extractfile(ep, 0);
+ skipxattr();
+
#ifdef USE_QFA
}
#endif /* USE_QFA */
continue;
#ifdef __linux__
(void)fprintf(stderr, "BUG! Should call addwhiteout\n");
+#else
+#ifdef sunos
#else
(void) addwhiteout(myname(ep));
+#endif
#endif
ep->e_flags &= ~NEW;
}