From: Jim Meyering <meyering@redhat.com>
Date: Mon, 4 Jan 2010 15:46:44 +0000 (+0100)
Subject: maint: use more readable operator: "||" rather than "|"
X-Git-Tag: v8.3~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc0f5eb6a01b759c92478be7f21de3e685ebfbca;p=thirdparty%2Fcoreutils.git

maint: use more readable operator: "||" rather than "|"

* src/cp.c (make_dir_parents_private): Use "||" rather than "|",
so that clang understands there is no undefined pointer dereference.
---

diff --git a/src/cp.c b/src/cp.c
index 980c0589d7..b2a7269065 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -411,8 +411,8 @@ make_dir_parents_private (char const *const_dir, size_t src_offset,
           *slash = '\0';
           missing_dir = (stat (dir, &stats) != 0);
 
-          if (missing_dir | x->preserve_ownership | x->preserve_mode
-              | x->preserve_timestamps)
+          if (missing_dir || x->preserve_ownership || x->preserve_mode
+              || x->preserve_timestamps)
             {
               /* Add this directory to the list of directories whose
                  modes might need fixing later. */