summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1995-04-02 00:49:16 +0000
committerbde <bde@FreeBSD.org>1995-04-02 00:49:16 +0000
commitcb1457c9ad35fcc7447bb49fb91fbe9eeb7553e7 (patch)
treef22860551f2a0f681f9e4b0f18f4e96e1b51cd2b /bin
parentf7680ac091f3f04edb7a0ac39dc48b2417980e3f (diff)
downloadFreeBSD-src-cb1457c9ad35fcc7447bb49fb91fbe9eeb7553e7.zip
FreeBSD-src-cb1457c9ad35fcc7447bb49fb91fbe9eeb7553e7.tar.gz
Add braces to fix wrong if-if-else-if nesting that broke `cp -pR' for
fifos.
Diffstat (limited to 'bin')
-rw-r--r--bin/cp/cp.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index 85cb966..c051950 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: cp.c,v 1.3 1994/12/30 13:12:12 bde Exp $
+ * $Id: cp.c,v 1.4 1995/01/25 07:31:01 davidg Exp $
*/
#ifndef lint
@@ -389,17 +389,19 @@ copy(argv, type, fts_options)
if (Rflag) {
if (copy_special(curr->fts_statp, !dne))
rval = 1;
- } else
+ } else {
if (copy_file(curr, dne))
rval = 1;
+ }
break;
case S_IFIFO:
- if (Rflag)
+ if (Rflag) {
if (copy_fifo(curr->fts_statp, !dne))
rval = 1;
- else
+ } else {
if (copy_file(curr, dne))
rval = 1;
+ }
break;
default:
if (copy_file(curr, dne))
OpenPOWER on IntegriCloud