Attachment 14067 Details for Bug 26507 – file.diff

[patch] file.diff

file.diff (text/plain), 1.49 KB, created by dd on 2001-04-12 09:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dd

Created: 2001-04-12 09:10:01 UTC

Size: 1.49 KB

patch

obsolete

>Index: traverse.c
>===================================================================
>RCS file: /st/src/FreeBSD/src/sbin/dump/traverse.c,v
>retrieving revision 1.12
>diff -u -r1.12 traverse.c
>--- traverse.c	2001/03/03 11:35:50	1.12
>+++ traverse.c	2001/04/07 22:50:35
>@@ -155,13 +155,15 @@
> 		if ((mode = (dp->di_mode & IFMT)) == 0)
> 			continue;
> 		/*
>-		 * All dirs go in dumpdirmap; only inodes that are to
>-		 * be dumped go in usedinomap and dumpinomap, however.
>+		 * Everything must go in usedinomap so that a check
>+		 * for "in dumpdirmap but not in usedinomap" to detect
>+		 * dirs with nodump set has a chance of succeeding
>+		 * (this is used in mapdirs()).
> 		 */
>+		SETINO(ino, usedinomap);
> 		if (mode == IFDIR)
> 			SETINO(ino, dumpdirmap);
> 		if (WANTTODUMP(dp)) {
>-			SETINO(ino, usedinomap);
> 			SETINO(ino, dumpinomap);
> 			if (mode != IFREG && mode != IFDIR && mode != IFLNK)
> 				*tapesize += 1;
>@@ -169,8 +171,11 @@
> 				*tapesize += blockest(dp);
> 			continue;
> 		}
>-		if (mode == IFDIR)
>+		if (mode == IFDIR) {
>+			if (!nonodump && (dp->di_flags & UF_NODUMP))
>+				CLRINO(ino, usedinomap);
> 			anydirskipped = 1;
>+		}
> 	}
> 	/*
> 	 * Restore gets very upset if the root is not dumped,
>@@ -218,7 +223,7 @@
> 		 * it isn't in usedinomap, we have to go through it to
> 		 * propagate the nodump flag.
> 		 */
>-		nodump = (TSTINO(ino, usedinomap) == 0);
>+		nodump = !nonodump && (TSTINO(ino, usedinomap) == 0);
> 		if ((isdir & 1) == 0 || (TSTINO(ino, dumpinomap) && !nodump))
> 			continue;
> 		dp = getino(ino);

Actions: View | Diff

Attachments on bug 26507: 14067