d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Backout rev. 1.55. Don't waste cpu cycles for bzero(), do not

Browse Source 
call chflags() for whiteouted files.

Prodded by:	ru
This commit is contained in:
Maxim Konovalov 2006-10-18 13:16:06 +00:00
parent 000723a6f8
commit da29c6560b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=163485
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/rm/rm.c
View File

@ -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));