* src/copy.h (struct cp_options): Rename members:

s/preserve_owner_and_group/preserve_ownership/, and
s/preserve_chmod_bits/preserve_mode/.
* src/copy.c, src/cp.c, src/install.c, src/mv.c: Update all uses.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mv.c b/src/mv.c
index 284bc0142..be0191eeb 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -128,8 +128,8 @@ cp_option_init (struct cp_options *x)
   x->move_mode = 1;
   x->myeuid = geteuid ();
   x->one_file_system = 0;
-  x->preserve_owner_and_group = 1;
-  x->preserve_chmod_bits = 1;
+  x->preserve_ownership = 1;
+  x->preserve_mode = 1;
   x->preserve_timestamps = 1;
   x->require_preserve = 0;  /* FIXME: maybe make this an option */
   x->recursive = 1;