diff options
author | Pádraig Brady <P@draigBrady.com> | 2009-09-23 10:10:51 +0100 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2009-09-23 14:33:40 +0100 |
commit | a037e838e15c9a698f1634398e0fe2726398d575 (patch) | |
tree | 7361ac5f2c3dbd8fc4763e6fa960e6646670dc79 /src/cp.c | |
parent | ade8dd2096e1898edefadf2314d4e1ec654adda5 (diff) | |
download | coreutils-a037e838e15c9a698f1634398e0fe2726398d575.tar.xz |
maint: Use logical rather than bitwise operators on bools
This is because bitwise operators are:
- confusing and inconsistent in a boolean context
- non short circuiting
- brittle in C89 where bool can be an int (so > 1)
Diffstat (limited to 'src/cp.c')
-rw-r--r-- | src/cp.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1089,7 +1089,7 @@ main (int argc, char **argv) } } - if (x.hard_link & x.symbolic_link) + if (x.hard_link && x.symbolic_link) { error (0, 0, _("cannot make both hard and symbolic links")); usage (EXIT_FAILURE); @@ -1130,7 +1130,7 @@ main (int argc, char **argv) /* If --force (-f) was specified and we're in link-creation mode, first remove any existing destination file. */ - if (x.unlink_dest_after_failed_open & (x.hard_link | x.symbolic_link)) + if (x.unlink_dest_after_failed_open && (x.hard_link || x.symbolic_link)) x.unlink_dest_before_opening = true; if (x.preserve_security_context) |