(struct cp_options): Rename members:

s/preserve_owner_and_group/preserve_ownership/, and
s/preserve_chmod_bits/preserve_mode/.

diff --git a/src/copy.h b/src/copy.h
index 643cf8f1c568ca272acfaf6d54406a7b3cd71134..f6a3bad5e392e05b6ddf7327e4d7db5bfc76f66a 100644 (file)
--- a/src/copy.h
+++ b/src/copy.h
@@ -96,8 +96,8 @@ struct cp_options
 
   /* If nonzero, attempt to give the copies the original files' permissions,
      owner, group, and timestamps. */
-  int preserve_owner_and_group;
-  int preserve_chmod_bits;
+  int preserve_ownership;
+  int preserve_mode;
   int preserve_timestamps;
 
   /* If nonzero and any of the above (for preserve) file attributes cannot