From da29c6560be0b8d2dda0c6bd53b8d6966e448069 Mon Sep 17 00:00:00 2001
From: Maxim Konovalov <maxim@FreeBSD.org>
Date: Wed, 18 Oct 2006 13:16:06 +0000
Subject: [PATCH] o Backout rev. 1.55.  Don't waste cpu cycles for bzero(), do
 not call chflags() for whiteouted files.

Prodded by:	ru
---
 bin/rm/rm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 7d02fa051c4..614479d8932 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -317,7 +317,6 @@ rm_file(char **argv)
 	int rval;
 	char *f;
 
-	bzero(&sb, sizeof(sb));
 	/*
 	 * Remove a file.  POSIX 1003.2 states that, by default, attempting
 	 * to remove a directory is an error, so must always stat the file.
@@ -348,7 +347,7 @@ rm_file(char **argv)
 		if (!fflag && !S_ISWHT(sb.st_mode) && !check(f, f, &sb))
 			continue;
 		rval = 0;
-		if (!uid &&
+		if (!uid && !S_ISWHT(sb.st_mode) &&
 		    (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) &&
 		    !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE)))
 			rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE));