diff options
| author | trasz <trasz@FreeBSD.org> | 2008-08-07 07:29:26 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2008-08-07 07:29:26 +0000 |
| commit | 198530b5ebe7c5865a0012ee833c612bf673a79f (patch) | |
| tree | 84d9522927edc4e389d61b75f4306cf35a123424 /bin | |
| parent | 9503a623e91fcda1a0ccb226d56ebe394e55a494 (diff) | |
| download | FreeBSD-src-198530b5ebe7c5865a0012ee833c612bf673a79f.zip FreeBSD-src-198530b5ebe7c5865a0012ee833c612bf673a79f.tar.gz | |
Fix ACL preservation, apparently broken in 1.47.
Approved by: rwatson
MFC after: 3 weeks
Diffstat (limited to 'bin')
| -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 a128188..b8f340a 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); } |
