Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e2bccb5
)
Fixed a failed hunk.
author
Wayne Davison
<wayned@samba.org>
Sat, 1 Sep 2007 02:00:27 +0000
(
02:00
+0000)
committer
Wayne Davison
<wayned@samba.org>
Sat, 1 Sep 2007 02:00:27 +0000
(
02:00
+0000)
links-depth.diff
patch
|
blob
|
blame
|
history
diff --git
a/links-depth.diff
b/links-depth.diff
index
fda452d
..
e908bb8
100644
(file)
--- a/
links-depth.diff
+++ b/
links-depth.diff
@@
-14,7
+14,7
@@
To use this patch, run these commands for a successful build:
--- old/flist.c
+++ new/flist.c
--- old/flist.c
+++ new/flist.c
-@@ -4
5,6 +45
,7 @@ extern int keep_dirlinks;
+@@ -4
7,6 +47
,7 @@ extern int keep_dirlinks;
extern int preserve_acls;
extern int preserve_xattrs;
extern int preserve_links;
extern int preserve_acls;
extern int preserve_xattrs;
extern int preserve_links;
@@
-22,7
+22,7
@@
To use this patch, run these commands for a successful build:
extern int preserve_hard_links;
extern int preserve_devices;
extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_devices;
extern int preserve_specials;
-@@ -9
00,6 +90
1,30 @@ static struct file_struct *recv_file_ent
+@@ -9
80,6 +98
1,30 @@ static struct file_struct *recv_file_ent
return file;
}
return file;
}
@@
-50,10
+50,10
@@
To use this patch, run these commands for a successful build:
+}
+#endif
+
+}
+#endif
+
- /*
*
- *
Create a file_struct for a named file by reading its stat()
- *
information and performing extensive checks against global
-@@ -1
042,7 +1067
,13 @@ struct file_struct *make_file(const char
+ /*
Create a file_struct for a named file by reading its stat() information
+ *
and performing extensive checks against global options.
+ *
+@@ -1
120,7 +1145
,13 @@ struct file_struct *make_file(const char
basename_len = strlen(basename) + 1; /* count the '\0' */
#ifdef SUPPORT_LINKS
basename_len = strlen(basename) + 1; /* count the '\0' */
#ifdef SUPPORT_LINKS
@@
-70,7
+70,7
@@
To use this patch, run these commands for a successful build:
#endif
--- old/options.c
+++ new/options.c
#endif
--- old/options.c
+++ new/options.c
-@@ -4
5,6 +45
,7 @@ int keep_dirlinks = 0;
+@@ -4
6,6 +46
,7 @@ int keep_dirlinks = 0;
int copy_dirlinks = 0;
int copy_links = 0;
int preserve_links = 0;
int copy_dirlinks = 0;
int copy_links = 0;
int preserve_links = 0;
@@
-78,7
+78,7
@@
To use this patch, run these commands for a successful build:
int preserve_hard_links = 0;
int preserve_acls = 0;
int preserve_xattrs = 0;
int preserve_hard_links = 0;
int preserve_acls = 0;
int preserve_xattrs = 0;
-@@ -3
03,6 +304
,7 @@ void usage(enum logcode F)
+@@ -3
21,6 +322
,7 @@ void usage(enum logcode F)
rprintf(F," --append append data onto shorter files\n");
rprintf(F," -d, --dirs transfer directories without recursing\n");
rprintf(F," -l, --links copy symlinks as symlinks\n");
rprintf(F," --append append data onto shorter files\n");
rprintf(F," -d, --dirs transfer directories without recursing\n");
rprintf(F," -l, --links copy symlinks as symlinks\n");
@@
-86,7
+86,7
@@
To use this patch, run these commands for a successful build:
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");
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");
-@@ -4
70,6 +472
,7 @@ static struct poptOption long_options[]
+@@ -4
96,6 +498
,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 },
{"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 },
@@
-96,7
+96,7
@@
To use this patch, run these commands for a successful build:
{"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
--- old/rsync.yo
+++ new/rsync.yo
{"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
--- old/rsync.yo
+++ new/rsync.yo
-@@ -3
14,6 +314
,7 @@ to the detailed description below for a
+@@ -3
35,6 +335
,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
--append append data onto shorter files
-d, --dirs transfer directories without recursing
-l, --links copy symlinks as symlinks