aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan Simon <dylan@dylex.net>2011-06-17 17:51:30 -0400
committerMichael Bestas <mikeioannina@gmail.com>2015-08-19 00:16:20 +0300
commit9bdc277880a6c4b4ec54619c4540a2b377b622d3 (patch)
treed0ff85c227d5061d5106f83ff793a9be686ff7cd
parent1bb49b5e4f04b8922787f1521cfa3cbb577c289e (diff)
downloadandroid_external_rsync-9bdc277880a6c4b4ec54619c4540a2b377b622d3.tar.gz
android_external_rsync-9bdc277880a6c4b4ec54619c4540a2b377b622d3.tar.bz2
android_external_rsync-9bdc277880a6c4b4ec54619c4540a2b377b622d3.zip
update config.h and proto.h
-rw-r--r--config.h21
-rw-r--r--proto.h19
2 files changed, 30 insertions, 10 deletions
diff --git a/config.h b/config.h
index 74318936..a88f4467 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
/* config.h. Generated from config.h.in by configure. */
-/* config.h.in. Generated from configure.in by autoheader. */
+/* config.h.in. Generated from configure.ac by autoheader. */
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
@@ -402,7 +402,7 @@
/* Define to 1 if the system has the type `struct stat64'. */
#define HAVE_STRUCT_STAT64 1
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
+/* Define to 1 if `st_rdev' is a member of `struct stat'. */
#define HAVE_STRUCT_STAT_ST_RDEV 1
/* Define to 1 if you have the "struct utimbuf" type */
@@ -482,6 +482,9 @@
/* Define to 1 if you have the `utime' function. */
#define HAVE_UTIME 1
+/* Define to 1 if you have the `utimensat' function. */
+/* #undef HAVE_UTIMENSAT */
+
/* Define to 1 if you have the `utimes' function. */
#define HAVE_UTIMES 1
@@ -554,6 +557,15 @@
/* unprivileged user--e.g. nobody */
#define NOBODY_USER "nobody"
+/* True if device files do not support xattrs */
+/* #undef NO_DEVICE_XATTRS */
+
+/* True if special files do not support xattrs */
+/* #undef NO_SPECIAL_XATTRS */
+
+/* True if symlinks do not support xattrs */
+/* #undef NO_SYMLINK_XATTRS */
+
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
@@ -566,6 +578,9 @@
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME ""
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
#define PACKAGE_VERSION ""
@@ -582,7 +597,7 @@
#define RSYNC_RSH "ssh"
/* rsync release version */
-#define RSYNC_VERSION "3.0.7"
+#define RSYNC_VERSION "3.0.8"
/* Define to 1 if sockets need to be shutdown */
/* #undef SHUTDOWN_ALL_SOCKETS */
diff --git a/proto.h b/proto.h
index 8c2b84a7..ad72c6df 100644
--- a/proto.h
+++ b/proto.h
@@ -3,11 +3,11 @@
int allow_access(char *addr, char *host, char *allow_list, char *deny_list);
void free_acl(stat_x *sxp);
int get_acl(const char *fname, stat_x *sxp);
-void send_acl(stat_x *sxp, int f);
-void receive_acl(struct file_struct *file, int f);
+void send_acl(int f, stat_x *sxp);
+void receive_acl(int f, struct file_struct *file);
void cache_tmp_acl(struct file_struct *file, stat_x *sxp);
void uncache_tmp_acls(void);
-int set_acl(const char *fname, const struct file_struct *file, stat_x *sxp);
+int set_acl(const char *fname, const struct file_struct *file, stat_x *sxp, mode_t new_mode);
void match_acl_ids(void);
int default_perms_for_dir(const char *dir);
void base64_encode(const char *buf, int len, char *out, int pad);
@@ -73,7 +73,7 @@ char *get_rule_prefix(int match_flags, const char *pat, int for_xfer,
unsigned int *plen_ptr);
void send_filter_list(int f_out);
void recv_filter_list(int f_in);
-int sparse_end(int f);
+int sparse_end(int f, OFF_T size);
int flush_write_file(int f);
int write_file(int f, char *buf, int len);
struct map_struct *map_file(int fd, OFF_T len, int32 read_size,
@@ -100,7 +100,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2);
int f_name_has_prefix(const struct file_struct *f1, const struct file_struct *f2);
char *f_name_buf(void);
char *f_name(const struct file_struct *f, char *fbuf);
-struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules);
+struct file_list *get_dirlist(char *dirname, int dlen, int flags);
int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp);
void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statret,
stat_x *sxp, int32 iflags, uchar fnamecmp_type,
@@ -303,6 +303,7 @@ int do_rmdir(const char *pathname);
int do_open(const char *pathname, int flags, mode_t mode);
int do_chmod(const char *path, mode_t mode);
int do_rename(const char *fname1, const char *fname2);
+int do_ftruncate(int fd, OFF_T size);
void trim_trailing_slashes(char *name);
int do_mkdir(char *fname, mode_t mode);
int do_mkstemp(char *template, mode_t perms);
@@ -310,6 +311,10 @@ int do_stat(const char *fname, STRUCT_STAT *st);
int do_lstat(const char *fname, STRUCT_STAT *st);
int do_fstat(int fd, STRUCT_STAT *st);
OFF_T do_lseek(int fd, OFF_T offset, int whence);
+int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec);
+int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec);
+int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec);
+int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec));
void set_compression(const char *fname);
void send_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
int32 n, int32 toklen);
@@ -380,11 +385,11 @@ void *expand_item_list(item_list *lp, size_t item_size,
void free_xattr(stat_x *sxp);
int get_xattr(const char *fname, stat_x *sxp);
int copy_xattrs(const char *source, const char *dest);
-int send_xattr(stat_x *sxp, int f);
+int send_xattr(int f, stat_x *sxp);
int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all);
void send_xattr_request(const char *fname, struct file_struct *file, int f_out);
int recv_xattr_request(struct file_struct *file, int f_in);
-void receive_xattr(struct file_struct *file, int f);
+void receive_xattr(int f, struct file_struct *file);
void cache_tmp_xattr(struct file_struct *file, stat_x *sxp);
void uncache_tmp_xattrs(void);
int set_xattr(const char *fname, const struct file_struct *file,