aboutsummaryrefslogtreecommitdiffstats
path: root/src/chmod.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/chmod.c')
-rw-r--r--src/chmod.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/chmod.c b/src/chmod.c
index 282eadaff..da350032f 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -279,7 +279,7 @@ process_file (FTS *fts, FTSENT *ent)
}
}
- if (chmod_succeeded & diagnose_surprises)
+ if (chmod_succeeded && diagnose_surprises)
{
mode_t naively_expected_mode =
mode_adjust (old_mode, S_ISDIR (old_mode) != 0, 0, change, NULL);
@@ -379,7 +379,7 @@ Change the mode of each FILE to MODE.\n\
\n\
Each MODE is of the form `[ugoa]*([-+=]([rwxXst]*|[ugo]))+'.\n\
"), stdout);
- emit_bug_reporting_address ();
+ emit_ancillary_info ();
}
exit (status);
}
@@ -523,7 +523,7 @@ main (int argc, char **argv)
umask_value = umask (0);
}
- if (recurse & preserve_root)
+ if (recurse && preserve_root)
{
static struct dev_ino dev_ino_buf;
root_dev_ino = get_root_dev_ino (&dev_ino_buf);