The --iconv option has now made it to the trunk.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index a273a61..8bcc134 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -83,6 +83,11 @@
 /* update this if you make incompatible changes */
 #define PROTOCOL_VERSION 30
 
+/* This is used when working on a new protocol version in CVS, and should
+ * be a new non-zero value for each CVS change that affects the protocol.
+ * It must ALWAYS be 0 when the protocol goes final! */
+#define SUBPROTOCOL_VERSION 2
+
 /* We refuse to interoperate with versions that are not in this range.
  * Note that we assume we'll work with later versions: the onus is on
  * people writing them to make sure that they don't send us anything
@@ -357,6 +362,15 @@ enum msgcode {
 # include <limits.h>
 #endif
 
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#include <iconv.h>
+#ifndef ICONV_CONST
+#define ICONV_CONST
+#endif
+#elif defined ICONV_CONST
+#undef ICONV_CONST
+#endif
+
 #include <assert.h>
 
 #include "lib/pool_alloc.h"
@@ -569,6 +583,7 @@ extern int file_extra_cnt;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_acls;
+extern int preserve_xattrs;
 
 #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
 #define EXTRA_LEN (sizeof (union file_extras))
@@ -593,7 +608,7 @@ extern int preserve_acls;
 #define F_SYMLINK(f) ((f)->basename + strlen((f)->basename) + 1)
 
 /* The sending side always has this available: */
-#define F_ROOTDIR(f) (*(const char**)REQ_EXTRA(f, PTR_EXTRA_LEN))
+#define F_PATHNAME(f) (*(const char**)REQ_EXTRA(f, PTR_EXTRA_LEN))
 
 /* The receiving side always has this available: */
 #define F_DEPTH(f) REQ_EXTRA(f, 1)->num
@@ -601,7 +616,9 @@ extern int preserve_acls;
 /* When the associated option is on, all entries will have these present: */
 #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
 #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
-#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
+#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num
+#define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num
+#define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num
 
 /* These items are per-entry optional and mutally exclusive: */
 #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
@@ -658,7 +675,7 @@ extern int preserve_acls;
 
 struct file_list {
        struct file_list *next, *prev;
-       struct file_struct **files;
+       struct file_struct **files, **sorted;
        alloc_pool_t file_pool;
        int count, malloced;
        int low, high; /* 0-relative index values excluding empties */
@@ -777,6 +794,7 @@ typedef struct {
 
 #ifndef __GNUC__
 #define __attribute__(x)
+#else
 # if __GNUC__ <= 2
 # define NORETURN
 # endif
@@ -793,12 +811,22 @@ typedef struct {
     struct rsync_acl *acc_acl; /* access ACL */
     struct rsync_acl *def_acl; /* default ACL */
 #endif
+#ifdef SUPPORT_XATTRS
+    item_list *xattr;
+#endif
 } statx;
 
 #define ACL_READY(sx) ((sx).acc_acl != NULL)
+#define XATTR_READY(sx) ((sx).xattr != NULL)
 
 #include "proto.h"
 
+#ifndef SUPPORT_XATTRS
+#define x_stat(fn,fst,xst) do_stat(fn,fst)
+#define x_lstat(fn,fst,xst) do_lstat(fn,fst)
+#define x_fstat(fd,fst,xst) do_fstat(fd,fst)
+#endif
+
 /* We have replacement versions of these if they're missing. */
 #ifndef HAVE_ASPRINTF
 int asprintf(char **ptr, const char *format, ...);
@@ -1017,6 +1045,26 @@ int inet_pton(int af, const char *src, void *dst);
 const char *get_panic_action(void);
 #endif
 
+static inline int to_wire_mode(mode_t mode)
+{
+#ifdef SUPPORT_LINKS
+#if _S_IFLNK != 0120000
+       if (S_ISLNK(mode))
+               return (mode & ~(_S_IFMT)) | 0120000;
+#endif
+#endif
+       return mode;
+}
+
+static inline mode_t from_wire_mode(int mode)
+{
+#if _S_IFLNK != 0120000
+       if ((mode & (_S_IFMT)) == 0120000)
+               return (mode & ~(_S_IFMT)) | _S_IFLNK;
+#endif
+       return mode;
+}
+
 static inline int
 isDigit(const char *ptr)
 {