Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug in --copy-unsafe that made it totally broken, and re-enable
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
381eb8e
..
169c33f
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-61,8
+61,6
@@
extern int sanitize_paths;
extern int read_batch;
extern int write_batch;
extern int read_batch;
extern int write_batch;
-static char topsrcname[MAXPATHLEN];
-
static struct exclude_struct **local_exclude_list;
static struct file_struct null_file;
static struct exclude_struct **local_exclude_list;
static struct file_struct null_file;
@@
-221,8
+219,11
@@
int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf)
if (l == -1)
return -1;
linkbuf[l] = 0;
if (l == -1)
return -1;
linkbuf[l] = 0;
- if (copy_unsafe_links && (topsrcname[0] != '\0') &&
- unsafe_symlink(linkbuf, topsrcname)) {
+ if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) {
+ if (verbose > 1) {
+ rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
+ path, linkbuf);
+ }
return do_stat(path, buffer);
}
}
return do_stat(path, buffer);
}
}
@@
-354,6
+355,8
@@
static void send_file_entry(struct file_struct *file, int f,
return;
}
return;
}
+ io_write_phase = "send_file_entry";
+
fname = f_name(file);
flags = base_flags;
fname = f_name(file);
flags = base_flags;
@@
-449,6
+452,8
@@
static void send_file_entry(struct file_struct *file, int f,
strlcpy(lastname, fname, MAXPATHLEN);
lastname[MAXPATHLEN - 1] = 0;
strlcpy(lastname, fname, MAXPATHLEN);
lastname[MAXPATHLEN - 1] = 0;
+
+ io_write_phase = "unknown";
}
}
@@
-534,7
+539,7
@@
static void receive_file_entry(struct file_struct **fptr,
(flags & SAME_GID) ? last_gid : (gid_t) read_int(f);
if (preserve_devices && IS_DEVICE(file->mode))
file->rdev =
(flags & SAME_GID) ? last_gid : (gid_t) read_int(f);
if (preserve_devices && IS_DEVICE(file->mode))
file->rdev =
- (flags & SAME_RDEV) ? last_rdev : (
dev_t
) read_int(f);
+ (flags & SAME_RDEV) ? last_rdev : (
DEV64_T
) read_int(f);
if (preserve_links && S_ISLNK(file->mode)) {
int l = read_int(f);
if (preserve_links && S_ISLNK(file->mode)) {
int l = read_int(f);
@@
-656,8
+661,10
@@
struct file_struct *make_file(int f, char *fname, struct string_area **ap,
if (readlink_stat(fname, &st, linkbuf) != 0) {
int save_errno = errno;
if (readlink_stat(fname, &st, linkbuf) != 0) {
int save_errno = errno;
- if ((errno == ENOENT) && copy_links && !noexcludes) {
- /* symlink pointing nowhere, see if excluded */
+ if ((errno == ENOENT) && !noexcludes) {
+ /* either symlink pointing nowhere or file that
+ * was removed during rsync run; see if excluded
+ * before reporting an error */
memset((char *) &st, 0, sizeof(st));
if (check_exclude_file(f, fname, &st)) {
/* file is excluded anyway, ignore silently */
memset((char *) &st, 0, sizeof(st));
if (check_exclude_file(f, fname, &st)) {
/* file is excluded anyway, ignore silently */
@@
-863,11
+870,11
@@
static void send_directory(int f, struct file_list *flist, char *dir)
}
}
-/*
+/*
*
*
*
- * I
*think* f==-1 means that the list should just be built in memory
- * and not transmitted. But who can tell? -- mbp
- */
+ * I
<b>think</b> f==-1 means that the list should just be built in
+ *
memory
and not transmitted. But who can tell? -- mbp
+ *
*
/
struct file_list *send_file_list(int f, int argc, char *argv[])
{
int i, l;
struct file_list *send_file_list(int f, int argc, char *argv[])
{
int i, l;
@@
-889,7
+896,8
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
}
for (i = 0; i < argc; i++) {
}
for (i = 0; i < argc; i++) {
- char *fname = topsrcname;
+ char fname2[MAXPATHLEN];
+ char *fname = fname2;
strlcpy(fname, argv[i], MAXPATHLEN);
strlcpy(fname, argv[i], MAXPATHLEN);
@@
-994,8
+1002,6
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
}
}
}
}
- topsrcname[0] = '\0';
-
if (f != -1) {
send_file_entry(NULL, f, 0);
}
if (f != -1) {
send_file_entry(NULL, f, 0);
}
@@
-1147,7
+1153,9
@@
int flist_find(struct file_list *flist, struct file_struct *f)
{
int low = 0, high = flist->count - 1;
{
int low = 0, high = flist->count - 1;
- if (flist->count <= 0)
+ while (high >= 0 && !flist->files[high]->basename) high--;
+
+ if (high < 0)
return -1;
while (low != high) {
return -1;
while (low != high) {
@@
-1189,7
+1197,7
@@
void free_file(struct file_struct *file)
/*
* allocate a new file list
*/
/*
* allocate a new file list
*/
-struct file_list *flist_new()
+struct file_list *flist_new(
void
)
{
struct file_list *flist;
{
struct file_list *flist;