From 3731f97bf656a867134f92b1bd4651318cb1d7c8 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 7 Mar 2006 07:41:08 +0000 Subject: [PATCH] Got rid of some patch fuzz. --- links-depth.diff | 18 +++++++++--------- slp.diff | 10 +++++----- xattrs.diff | 36 ++++++++++++++++++------------------ 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/links-depth.diff b/links-depth.diff index f9434d8..30cac5a 100644 --- a/links-depth.diff +++ b/links-depth.diff @@ -8,15 +8,15 @@ in this modified version. --- old/flist.c +++ new/flist.c -@@ -45,6 +45,7 @@ extern int filesfrom_fd; - extern int one_file_system; +@@ -45,6 +45,7 @@ extern int one_file_system; + extern int copy_dirlinks; extern int keep_dirlinks; extern int preserve_links; +extern int follow_links_depth; extern int preserve_hard_links; - extern int preserve_perms; extern int preserve_devices; -@@ -716,6 +717,30 @@ static struct file_struct *receive_file_ + extern int preserve_specials; +@@ -715,6 +716,30 @@ static struct file_struct *receive_file_ return file; } @@ -47,7 +47,7 @@ in this modified version. /** * Create a file_struct for a named file by reading its stat() * information and performing extensive checks against global -@@ -850,7 +875,13 @@ struct file_struct *make_file(char *fnam +@@ -849,7 +874,13 @@ struct file_struct *make_file(char *fnam basename_len = strlen(basename) + 1; /* count the '\0' */ #ifdef SUPPORT_LINKS @@ -64,8 +64,8 @@ in this modified version. #endif --- old/options.c +++ new/options.c -@@ -43,6 +43,7 @@ int append_mode = 0; - int keep_dirlinks = 0; +@@ -44,6 +44,7 @@ int keep_dirlinks = 0; + int copy_dirlinks = 0; int copy_links = 0; int preserve_links = 0; +int follow_links_depth = 0; @@ -80,7 +80,7 @@ in this modified version. rprintf(F," -L, --copy-links transform symlink into referent file/dir\n"); rprintf(F," --copy-unsafe-links only \"unsafe\" symlinks are transformed\n"); rprintf(F," --safe-links ignore symlinks that point outside the source tree\n"); -@@ -433,6 +435,7 @@ static struct poptOption long_options[] +@@ -432,6 +434,7 @@ static struct poptOption long_options[] {"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 }, {"no-links", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 }, {"no-l", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 }, @@ -90,7 +90,7 @@ in this modified version. {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 }, --- old/rsync.yo +++ new/rsync.yo -@@ -310,6 +310,7 @@ to the detailed description below for a +@@ -313,6 +313,7 @@ to the detailed description below for a --append append data onto shorter files -d, --dirs transfer directories without recursing -l, --links copy symlinks as symlinks diff --git a/slp.diff b/slp.diff index ae9c0ad..1410e7c 100644 --- a/slp.diff +++ b/slp.diff @@ -40,7 +40,7 @@ and we can't honor that request. --- old/clientserver.c +++ new/clientserver.c -@@ -836,6 +836,13 @@ int daemon_main(void) +@@ -847,6 +847,13 @@ int daemon_main(void) * address too. In fact, why not just do inet_ntop on the * local address??? */ @@ -120,9 +120,9 @@ and we can't honor that request. FN_LOCAL_STRING(lp_auth_users, auth_users) --- old/main.c +++ new/main.c -@@ -962,6 +962,18 @@ static int start_client(int argc, char * +@@ -971,6 +971,18 @@ static int start_client(int argc, char * + if (!read_batch) { /* for read_batch, NO source is specified */ - argc--; shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port); + + if (shell_machine && !shell_machine[0]) { @@ -186,7 +186,7 @@ and we can't honor that request. * FLOG and FCLIENT are only used on the daemon side for custom logging, --- old/rsync.yo +++ new/rsync.yo -@@ -137,7 +137,12 @@ particular rsync daemon by leaving off t +@@ -139,7 +139,12 @@ particular rsync daemon by leaving off t quote(tt(rsync somehost.mydomain.com::)) @@ -224,7 +224,7 @@ and we can't honor that request. enddit() -@@ -544,6 +553,7 @@ use chroot = no +@@ -543,6 +552,7 @@ use chroot = no max connections = 4 syslog facility = local5 pid file = /var/run/rsyncd.pid diff --git a/xattrs.diff b/xattrs.diff index 835d685..fb67fc3 100644 --- a/xattrs.diff +++ b/xattrs.diff @@ -26,7 +26,7 @@ After applying this patch, run these commands for a successful build: popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ --- old/backup.c +++ new/backup.c -@@ -136,6 +136,7 @@ static int make_bak_dir(char *fullpath) +@@ -133,6 +133,7 @@ static int make_bak_dir(char *fullpath) do_lchown(fullpath, st.st_uid, st.st_gid); do_chmod(fullpath, st.st_mode); (void)DUP_ACL(end, fullpath, st.st_mode); @@ -34,7 +34,7 @@ After applying this patch, run these commands for a successful build: } } *p = '/'; -@@ -190,6 +191,7 @@ static int keep_backup(char *fname) +@@ -187,6 +188,7 @@ static int keep_backup(char *fname) return 0; PUSH_KEEP_BACKUP_ACL(file, fname, buf); @@ -42,7 +42,7 @@ After applying this patch, run these commands for a successful build: /* Check to see if this is a device file, or link */ if ((am_root && preserve_devices && IS_DEVICE(file->mode)) -@@ -267,6 +269,7 @@ static int keep_backup(char *fname) +@@ -264,6 +266,7 @@ static int keep_backup(char *fname) } set_file_attrs(buf, file, NULL, 0); CLEANUP_KEEP_BACKUP_ACL(); @@ -85,7 +85,7 @@ After applying this patch, run these commands for a successful build: --- old/flist.c +++ new/flist.c -@@ -969,6 +969,8 @@ static struct file_struct *send_file_nam +@@ -968,6 +968,8 @@ static struct file_struct *send_file_nam return NULL; if (MAKE_ACL(file, fname) < 0) return NULL; @@ -94,7 +94,7 @@ After applying this patch, run these commands for a successful build: if (chmod_modes && !S_ISLNK(file->mode)) file->mode = tweak_mode(file->mode, chmod_modes); -@@ -981,9 +983,11 @@ static struct file_struct *send_file_nam +@@ -980,9 +982,11 @@ static struct file_struct *send_file_nam flist->files[flist->count++] = file; send_file_entry(file, f); SEND_ACL(file, f); @@ -106,15 +106,15 @@ After applying this patch, run these commands for a successful build: } return file; } -@@ -1373,6 +1377,7 @@ struct file_list *recv_file_list(int f) +@@ -1372,6 +1376,7 @@ struct file_list *recv_file_list(int f) file = receive_file_entry(flist, flags, f); RECEIVE_ACL(file, f); + RECEIVE_XATTR(file, f ); - if (S_ISREG(file->mode)) + if (S_ISREG(file->mode) || S_ISLNK(file->mode)) stats.total_size += file->length; -@@ -1397,6 +1402,7 @@ struct file_list *recv_file_list(int f) +@@ -1396,6 +1401,7 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); SORT_FILE_ACL_INDEX_LISTS(); @@ -124,7 +124,7 @@ After applying this patch, run these commands for a successful build: recv_uid_list(f, flist); --- old/generator.c +++ new/generator.c -@@ -908,6 +908,10 @@ static void recv_generator(char *fname, +@@ -916,6 +916,10 @@ static void recv_generator(char *fname, if (f_out == -1) SET_ACL(fname, file); #endif @@ -193,7 +193,7 @@ After applying this patch, run these commands for a successful build: +#endif /* No xattrs */ --- old/options.c +++ new/options.c -@@ -45,6 +45,7 @@ int copy_links = 0; +@@ -46,6 +46,7 @@ int copy_links = 0; int preserve_links = 0; int preserve_hard_links = 0; int preserve_acls = 0; @@ -232,7 +232,7 @@ After applying this patch, run these commands for a successful build: /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature -@@ -303,6 +307,9 @@ void usage(enum logcode F) +@@ -304,6 +308,9 @@ void usage(enum logcode F) #ifdef SUPPORT_ACLS rprintf(F," -A, --acls preserve ACLs (implies --perms)\n"); #endif @@ -242,7 +242,7 @@ After applying this patch, run these commands for a successful build: rprintf(F," --chmod=CHMOD change destination permissions\n"); rprintf(F," -o, --owner preserve owner (super-user only)\n"); rprintf(F," -g, --group preserve group\n"); -@@ -423,6 +430,9 @@ static struct poptOption long_options[] +@@ -422,6 +429,9 @@ static struct poptOption long_options[] {"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 }, {"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 }, {"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 }, @@ -252,7 +252,7 @@ After applying this patch, run these commands for a successful build: {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, -@@ -1088,6 +1098,17 @@ int parse_arguments(int *argc, const cha +@@ -1096,6 +1106,17 @@ int parse_arguments(int *argc, const cha return 0; #endif @@ -270,7 +270,7 @@ After applying this patch, run these commands for a successful build: default: /* A large opt value means that set_refuse_options() -@@ -1532,6 +1553,10 @@ void server_options(char **args,int *arg +@@ -1544,6 +1565,10 @@ void server_options(char **args,int *arg if (preserve_acls) argstr[x++] = 'A'; #endif @@ -283,7 +283,7 @@ After applying this patch, run these commands for a successful build: if (preserve_gid) --- old/rsync.c +++ new/rsync.c -@@ -215,12 +215,15 @@ int set_file_attrs(char *fname, struct f +@@ -218,12 +218,15 @@ int set_file_attrs(char *fname, struct f } #endif @@ -304,7 +304,7 @@ After applying this patch, run these commands for a successful build: if (verbose > 1 && flags & ATTRS_REPORT) { --- old/rsync.h +++ new/rsync.h -@@ -695,6 +695,38 @@ struct chmod_mode_struct; +@@ -696,6 +696,38 @@ struct chmod_mode_struct; #endif /* SUPPORT_ACLS */ #include "smb_acls.h" @@ -345,7 +345,7 @@ After applying this patch, run these commands for a successful build: /* We have replacement versions of these if they're missing. */ --- old/rsync.yo +++ new/rsync.yo -@@ -318,6 +318,7 @@ to the detailed description below for a +@@ -322,6 +322,7 @@ to the detailed description below for a -p, --perms preserve permissions -E, --executability preserve executability -A, --acls preserve ACLs (implies -p) [non-standard] @@ -353,7 +353,7 @@ After applying this patch, run these commands for a successful build: --chmod=CHMOD change destination permissions -o, --owner preserve owner (super-user only) -g, --group preserve group -@@ -752,6 +753,11 @@ dit(bf(-A, --acls)) This option causes r +@@ -802,6 +803,11 @@ dit(bf(-A, --acls)) This option causes r ACLs to be the same as the source ACLs. This nonstandard option only works if the remote rsync also supports it. bf(--acls) implies bf(--perms). -- 2.34.1