diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2008-08-07 07:29:26 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2008-08-07 07:29:26 +0000 |
| commit | 2aafc4d48c094496bd4cbfe13b42f44eca1d7f23 (patch) | |
| tree | 84d9522927edc4e389d61b75f4306cf35a123424 /bin/cp | |
| parent | 8ad0fbc8a17accb2c4ec6fc4ae8ab9454a6831e3 (diff) | |
| download | src-2aafc4d48c094496bd4cbfe13b42f44eca1d7f23.tar.gz src-2aafc4d48c094496bd4cbfe13b42f44eca1d7f23.zip | |
Fix ACL preservation, apparently broken in 1.47.
Approved by: rwatson
MFC after: 3 weeks
Notes
Notes:
svn path=/head/; revision=181361
Diffstat (limited to 'bin/cp')
| -rw-r--r-- | bin/cp/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/cp/utils.c b/bin/cp/utils.c index a128188ebcdf..b8f340a49bcf 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -211,7 +211,6 @@ copy_file(const FTSENT *entp, int dne) rval = 1; } } - (void)close(from_fd); /* * Don't remove the target even after an error. The target might @@ -231,6 +230,9 @@ copy_file(const FTSENT *entp, int dne) rval = 1; } } + + (void)close(from_fd); + return (rval); } |