Mention the chmod utility's manpage number.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index dcc0799..2939e07 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -117,8 +117,8 @@
 #define XFLG_ANCHORED2ABS      (1<<2)
 #define XFLG_ABS_IF_SLASH      (1<<3)
 
-#define PERMS_REPORT           (1<<0)
-#define PERMS_SKIP_MTIME       (1<<1)
+#define ATTRS_REPORT           (1<<0)
+#define ATTRS_SKIP_MTIME       (1<<1)
 
 #define FULL_FLUSH     1
 #define NORMAL_FLUSH   0
@@ -493,11 +493,6 @@ struct hlink {
        int hlindex;
 };
 
-struct id_pair {
-       uid_t uid;
-       gid_t gid;
-};
-
 #define F_DEV  link_u.idev->dev
 #define F_INODE        link_u.idev->inode
 
@@ -521,8 +516,9 @@ struct file_struct {
                struct idev *idev;
                struct hlink *links;
        } link_u;
-       struct id_pair *ids;
        time_t modtime;
+       uid_t uid;
+       gid_t gid;
        mode_t mode;
        uchar flags;    /* this item MUST remain last */
 };
@@ -644,6 +640,7 @@ struct stats {
        int current_file_index;
 };
 
+struct chmod_mode_struct;
 
 #include "byteorder.h"
 #include "lib/mdfour.h"
@@ -791,7 +788,8 @@ extern int errno;
 #define INADDR_NONE 0xffffffff
 #endif
 
-#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
+#define IS_SPECIAL(mode) (S_ISSOCK(mode) || S_ISFIFO(mode))
+#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))
 
 /* Initial mask on permissions given to temporary files.  Mask off setuid
      bits and group access because of potential race-condition security
@@ -875,5 +873,3 @@ const char *get_panic_action(void);
 #endif
 
 #define UNUSED(x) x __attribute__((__unused__))
-
-extern const char *io_write_phase, *io_read_phase;