X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6e6f514c7a8771c046a3db812413382a9e70ac64..22585581a3e5bd3d11b76d50932f2ebb5f66ca30:/flags.diff diff --git a/flags.diff b/flags.diff index 60b48c9..cdbb2ea 100644 --- a/flags.diff +++ b/flags.diff @@ -5,7 +5,7 @@ Modified from a patch that was written by Rolf Grossmann: --- old/configure.in +++ new/configure.in -@@ -494,7 +494,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd +@@ -527,7 +527,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \ strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \ setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \ @@ -16,7 +16,7 @@ Modified from a patch that was written by Rolf Grossmann: AC_CHECK_FUNCS(getpgrp tcgetpgrp) --- old/flist.c +++ new/flist.c -@@ -48,6 +48,7 @@ extern int preserve_links; +@@ -44,6 +44,7 @@ extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; @@ -24,7 +24,7 @@ Modified from a patch that was written by Rolf Grossmann: extern int preserve_uid; extern int preserve_gid; extern int relative_paths; -@@ -312,6 +313,9 @@ static void send_file_entry(struct file_ +@@ -299,6 +300,9 @@ static void send_file_entry(struct file_ unsigned short flags; static time_t modtime; static mode_t mode; @@ -34,7 +34,7 @@ Modified from a patch that was written by Rolf Grossmann: static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -344,6 +348,12 @@ static void send_file_entry(struct file_ +@@ -329,6 +333,12 @@ static void send_file_entry(struct file_ flags |= XMIT_SAME_MODE; else mode = file->mode; @@ -47,7 +47,7 @@ Modified from a patch that was written by Rolf Grossmann: if ((preserve_devices && IS_DEVICE(mode)) || (preserve_specials && IS_SPECIAL(mode))) { if (protocol_version < 28) { -@@ -427,6 +437,10 @@ static void send_file_entry(struct file_ +@@ -412,6 +422,10 @@ static void send_file_entry(struct file_ write_int(f, modtime); if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -58,7 +58,7 @@ Modified from a patch that was written by Rolf Grossmann: if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -496,6 +510,9 @@ static struct file_struct *receive_file_ +@@ -479,6 +493,9 @@ static struct file_struct *receive_file_ { static time_t modtime; static mode_t mode; @@ -68,7 +68,7 @@ Modified from a patch that was written by Rolf Grossmann: static int64 dev; static dev_t rdev; static uint32 rdev_major; -@@ -569,9 +586,12 @@ static struct file_struct *receive_file_ +@@ -552,9 +569,12 @@ static struct file_struct *receive_file_ modtime = (time_t)read_int(f); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -82,7 +82,7 @@ Modified from a patch that was written by Rolf Grossmann: if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -622,6 +642,9 @@ static struct file_struct *receive_file_ +@@ -605,6 +625,9 @@ static struct file_struct *receive_file_ file->modtime = modtime; file->length = file_length; file->mode = mode; @@ -92,7 +92,7 @@ Modified from a patch that was written by Rolf Grossmann: file->uid = uid; file->gid = gid; -@@ -874,6 +897,9 @@ struct file_struct *make_file(char *fnam +@@ -857,6 +880,9 @@ struct file_struct *make_file(char *fnam file->modtime = st.st_mtime; file->length = st.st_size; file->mode = st.st_mode; @@ -104,7 +104,7 @@ Modified from a patch that was written by Rolf Grossmann: --- old/generator.c +++ new/generator.c -@@ -126,6 +126,9 @@ static int delete_item(char *fname, int +@@ -123,6 +123,9 @@ static int delete_item(char *fname, int if (!S_ISDIR(mode)) { if (max_delete && ++deletion_count > max_delete) return 0; @@ -114,7 +114,7 @@ Modified from a patch that was written by Rolf Grossmann: if (make_backups && (backup_dir || !is_backup_file(fname))) ok = make_backup(fname); else -@@ -150,10 +153,17 @@ static int delete_item(char *fname, int +@@ -147,10 +150,17 @@ static int delete_item(char *fname, int ok = 0; errno = ENOTEMPTY; } else if (make_backups && !backup_dir && !is_backup_file(fname) @@ -136,7 +136,7 @@ Modified from a patch that was written by Rolf Grossmann: log_delete(fname, mode); --- old/options.c +++ new/options.c -@@ -46,6 +46,7 @@ int copy_links = 0; +@@ -48,6 +48,7 @@ int copy_links = 0; int preserve_links = 0; int preserve_hard_links = 0; int preserve_perms = 0; @@ -144,7 +144,7 @@ Modified from a patch that was written by Rolf Grossmann: int preserve_executability = 0; int preserve_devices = 0; int preserve_specials = 0; -@@ -196,6 +197,7 @@ static void print_rsync_version(enum log +@@ -200,6 +201,7 @@ static void print_rsync_version(enum log char const *hardlinks = "no "; char const *links = "no "; char const *ipv6 = "no "; @@ -152,7 +152,7 @@ Modified from a patch that was written by Rolf Grossmann: STRUCT_STAT *dumstat; #ifdef HAVE_SOCKETPAIR -@@ -218,6 +220,10 @@ static void print_rsync_version(enum log +@@ -222,6 +224,10 @@ static void print_rsync_version(enum log ipv6 = ""; #endif @@ -163,7 +163,7 @@ Modified from a patch that was written by Rolf Grossmann: rprintf(f, "%s version %s protocol version %d\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n"); -@@ -230,9 +236,9 @@ static void print_rsync_version(enum log +@@ -234,9 +240,9 @@ static void print_rsync_version(enum log /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature * macros. */ @@ -175,15 +175,15 @@ Modified from a patch that was written by Rolf Grossmann: (int) (sizeof dumstat->st_ino * 8), (int) (sizeof (int64) * 8)); #ifdef MAINTAINER_MODE -@@ -294,6 +300,7 @@ void usage(enum logcode F) +@@ -302,6 +308,7 @@ void usage(enum logcode F) rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -p, --perms preserve permissions\n"); + rprintf(F," --flags preserve file flags\n"); rprintf(F," -E, --executability preserve the file's executability\n"); - rprintf(F," --chmod=CHMOD change destination permissions\n"); + rprintf(F," --chmod=CHMOD affect file and/or directory permissions\n"); rprintf(F," -o, --owner preserve owner (super-user only)\n"); -@@ -409,6 +416,8 @@ static struct poptOption long_options[] +@@ -420,6 +427,8 @@ static struct poptOption long_options[] {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 }, {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, @@ -192,7 +192,7 @@ Modified from a patch that was written by Rolf Grossmann: {"executability", 'E', POPT_ARG_NONE, &preserve_executability, 0, 0, 0 }, {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, -@@ -1107,6 +1116,15 @@ int parse_arguments(int *argc, const cha +@@ -1123,6 +1132,15 @@ int parse_arguments(int *argc, const cha } #endif @@ -208,7 +208,7 @@ Modified from a patch that was written by Rolf Grossmann: if (write_batch && read_batch) { snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); -@@ -1562,6 +1580,9 @@ void server_options(char **args,int *arg +@@ -1580,6 +1598,9 @@ void server_options(char **args,int *arg if (xfer_dirs && !recurse && delete_mode && am_sender) args[ac++] = "--no-r"; @@ -220,15 +220,15 @@ Modified from a patch that was written by Rolf Grossmann: goto oom; --- old/rsync.c +++ new/rsync.c -@@ -34,6 +34,7 @@ extern int verbose; +@@ -33,6 +33,7 @@ + extern int verbose; extern int dry_run; - extern int daemon_log_format_has_i; extern int preserve_perms; +extern int preserve_flags; extern int preserve_executability; extern int preserve_times; extern int omit_dir_times; -@@ -217,6 +218,19 @@ int set_file_attrs(char *fname, struct f +@@ -221,6 +222,19 @@ int set_file_attrs(char *fname, struct f } #endif @@ -246,9 +246,9 @@ Modified from a patch that was written by Rolf Grossmann: +#endif + if (verbose > 1 && flags & ATTRS_REPORT) { - enum logcode code = daemon_log_format_has_i || dry_run - ? FCLIENT : FINFO; -@@ -252,6 +266,10 @@ void finish_transfer(char *fname, char * + if (updated) + rprintf(FCLIENT, "%s\n", fname); +@@ -254,6 +268,10 @@ void finish_transfer(char *fname, char * { int ret; @@ -259,7 +259,7 @@ Modified from a patch that was written by Rolf Grossmann: if (inplace) { if (verbose > 2) rprintf(FINFO, "finishing %s\n", fname); -@@ -305,3 +323,27 @@ const char *who_am_i(void) +@@ -307,3 +325,21 @@ const char *who_am_i(void) return am_server ? "server" : "client"; return am_sender ? "sender" : am_generator ? "generator" : "receiver"; } @@ -270,18 +270,12 @@ Modified from a patch that was written by Rolf Grossmann: +{ +#define NOCHANGEBITS (UF_IMMUTABLE | UF_APPEND | UF_NOUNLINK | SF_IMMUTABLE | SF_APPEND | SF_NOUNLINK) + STRUCT_STAT stb; -+ int failed; + + if (dry_run) + return; + + /* XXX get rid of this extra stat() */ -+#ifdef SUPPORT_LINKS -+ failed = do_lstat(fname, &stb); -+#else -+ failed = do_stat(fname, &stb); -+#endif -+ if (failed) ++ if (do_lstat(fname, &stb) < 0) + return; + if (stb.st_flags & NOCHANGEBITS) + do_chflags(fname, stb.st_flags & ~NOCHANGEBITS); @@ -297,7 +291,7 @@ Modified from a patch that was written by Rolf Grossmann: /* These flags are used in the live flist data. */ -@@ -337,6 +338,10 @@ enum msgcode { +@@ -344,6 +345,10 @@ enum msgcode { #define schar char #endif @@ -308,7 +302,7 @@ Modified from a patch that was written by Rolf Grossmann: /* Find a variable that is either exactly 32-bits or longer. * If some code depends on 32-bit truncation, it will need to * take special action in a "#if SIZEOF_INT32 > 4" section. */ -@@ -519,6 +524,9 @@ struct file_struct { +@@ -526,6 +531,9 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; @@ -320,15 +314,15 @@ Modified from a patch that was written by Rolf Grossmann: mode_t mode; --- old/rsync.yo +++ new/rsync.yo -@@ -322,6 +322,7 @@ to the detailed description below for a +@@ -320,6 +320,7 @@ to the detailed description below for a + -K, --keep-dirlinks treat symlinked dir on receiver as dir + -H, --hard-links preserve hard links -p, --perms preserve permissions - -E, --executability preserve executability - --chmod=CHMOD change destination permissions + --flags preserve file flags + -E, --executability preserve executability + --chmod=CHMOD affect file and/or directory permissions -o, --owner preserve owner (super-user only) - -g, --group preserve group - --devices preserve device files (super-user only) -@@ -498,7 +499,9 @@ specified, in which case bf(-r) is not i +@@ -503,7 +504,9 @@ specified, in which case bf(-r) is not i Note that bf(-a) bf(does not preserve hardlinks), because finding multiply-linked files is expensive. You must separately @@ -339,7 +333,7 @@ Modified from a patch that was written by Rolf Grossmann: dit(--no-OPTION) You may turn off one or more implied options by prefixing the option name with "no-". Not all options may be prefixed with a "no-": -@@ -793,6 +796,13 @@ quote(itemize( +@@ -798,6 +801,13 @@ quote(itemize( If bf(--perms) is enabled, this option is ignored. @@ -355,7 +349,7 @@ Modified from a patch that was written by Rolf Grossmann: transfer. The resulting value is treated as though it was the permissions --- old/syscall.c +++ new/syscall.c -@@ -155,6 +155,15 @@ int do_chmod(const char *path, mode_t mo +@@ -152,6 +152,15 @@ int do_chmod(const char *path, mode_t mo } #endif