1 The attached patch gives the user ability to define how many symbolic
2 links rsync should follow before actually adding it to the file list.
4 The patch has been heavily modified from its original form to work
5 with the latest codebase, but even in its original form it didn't
6 handle relative symlinks properly, and that has not yet been fixed
7 in this modified version.
11 @@ -45,6 +45,7 @@ extern int one_file_system;
12 extern int copy_dirlinks;
13 extern int keep_dirlinks;
14 extern int preserve_links;
15 +extern int follow_links_depth;
16 extern int preserve_hard_links;
17 extern int preserve_devices;
18 extern int preserve_specials;
19 @@ -715,6 +716,30 @@ static struct file_struct *receive_file_
24 +static int links_depth(char *linkname, STRUCT_STAT *st_ptr)
26 + char buf[MAXPATHLEN];
30 + for (i = 0; i < follow_links_depth; i++) {
31 + /* XXX This doesn't handle relative symlinks! */
32 + if (readlink_stat(linkname, &st, buf) != 0)
35 + if (!S_ISLNK(st.st_mode))
37 + strlcpy(linkname, buf, MAXPATHLEN);
39 + fprintf(stderr, "\n%s:%i [#%i] %s -> %s\n", __FILE__, __LINE__, i, file->u.link, linkname);
48 * Create a file_struct for a named file by reading its stat()
49 * information and performing extensive checks against global
50 @@ -849,7 +874,13 @@ struct file_struct *make_file(char *fnam
51 basename_len = strlen(basename) + 1; /* count the '\0' */
54 - linkname_len = S_ISLNK(st.st_mode) ? strlen(linkname) + 1 : 0;
55 + if (S_ISLNK(st.st_mode)) {
56 + if (follow_links_depth && links_depth(linkname, &st))
59 + linkname_len = strlen(linkname) + 1;
67 @@ -44,6 +44,7 @@ int keep_dirlinks = 0;
68 int copy_dirlinks = 0;
70 int preserve_links = 0;
71 +int follow_links_depth = 0;
72 int preserve_hard_links = 0;
73 int preserve_perms = 0;
74 int preserve_executability = 0;
75 @@ -287,6 +288,7 @@ void usage(enum logcode F)
76 rprintf(F," --append append data onto shorter files\n");
77 rprintf(F," -d, --dirs transfer directories without recursing\n");
78 rprintf(F," -l, --links copy symlinks as symlinks\n");
79 + rprintf(F," --links-depth=NUM follow symlinks up to NUM depth\n");
80 rprintf(F," -L, --copy-links transform symlink into referent file/dir\n");
81 rprintf(F," --copy-unsafe-links only \"unsafe\" symlinks are transformed\n");
82 rprintf(F," --safe-links ignore symlinks that point outside the source tree\n");
83 @@ -432,6 +434,7 @@ static struct poptOption long_options[]
84 {"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 },
85 {"no-links", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 },
86 {"no-l", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 },
87 + {"links-depth", 0, POPT_ARG_INT, &follow_links_depth , 0, 0, 0 },
88 {"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 },
89 {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
90 {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
93 @@ -313,6 +313,7 @@ to the detailed description below for a
94 --append append data onto shorter files
95 -d, --dirs transfer directories without recursing
96 -l, --links copy symlinks as symlinks
97 + --links-depth=NUM follow symlinks up to NUM depth
98 -L, --copy-links transform symlink into referent file/dir
99 --copy-unsafe-links only "unsafe" symlinks are transformed
100 --safe-links ignore symlinks that point outside the tree