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
The finish_transfer() function now takes a "partialptr" arg that, if
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
32f0dde
..
e444def
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-38,6
+38,7
@@
extern int relative_paths;
extern int keep_dirlinks;
extern int preserve_links;
extern int preserve_devices;
extern int keep_dirlinks;
extern int preserve_links;
extern int preserve_devices;
+extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_uid;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_uid;
@@
-217,14
+218,13
@@
static int delete_item(char *fname, int mode, int flags)
* call will append names onto the end, but the old dir value will be restored
* on exit). */
static void delete_in_dir(struct file_list *flist, char *fbuf,
* call will append names onto the end, but the old dir value will be restored
* on exit). */
static void delete_in_dir(struct file_list *flist, char *fbuf,
- struct file_struct *file)
+ struct file_struct *file
, STRUCT_STAT *stp
)
{
static int min_depth = MAXPATHLEN, cur_depth = -1;
static void *filt_array[MAXPATHLEN/2+1];
static int already_warned = 0;
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
{
static int min_depth = MAXPATHLEN, cur_depth = -1;
static void *filt_array[MAXPATHLEN/2+1];
static int already_warned = 0;
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
- STRUCT_STAT st;
int dlen, i;
if (!flist) {
int dlen, i;
if (!flist) {
@@
-261,13
+261,10
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
dlen = strlen(fbuf);
filt_array[cur_depth] = push_local_filters(fbuf, dlen);
dlen = strlen(fbuf);
filt_array[cur_depth] = push_local_filters(fbuf, dlen);
- if (link_stat(fbuf, &st, keep_dirlinks) < 0 || !S_ISDIR(st.st_mode))
- return;
-
if (one_file_system) {
if (file->flags & FLAG_TOP_DIR)
if (one_file_system) {
if (file->flags & FLAG_TOP_DIR)
- filesystem_dev = st
.
st_dev;
- else if (filesystem_dev != st
.
st_dev)
+ filesystem_dev = st
p->
st_dev;
+ else if (filesystem_dev != st
p->
st_dev)
return;
}
return;
}
@@
-280,9
+277,8
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
continue;
if (flist_find(flist, fp) < 0) {
if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
continue;
if (flist_find(flist, fp) < 0) {
- int mode = fp->mode;
f_name(fp, delbuf);
f_name(fp, delbuf);
- delete_item(delbuf, mode, DEL_FORCE_RECURSE);
+ delete_item(delbuf,
fp->
mode, DEL_FORCE_RECURSE);
}
}
}
}
@@
-294,6
+290,7
@@
static void delete_in_dir(struct file_list *flist, char *fbuf,
static void do_delete_pass(struct file_list *flist)
{
char fbuf[MAXPATHLEN];
static void do_delete_pass(struct file_list *flist)
{
char fbuf[MAXPATHLEN];
+ STRUCT_STAT st;
int j;
if (dry_run > 1 /* destination doesn't exist yet */
int j;
if (dry_run > 1 /* destination doesn't exist yet */
@@
-310,9
+307,13
@@
static void do_delete_pass(struct file_list *flist)
if (verbose > 1 && file->flags & FLAG_TOP_DIR)
rprintf(FINFO, "deleting in %s\n", fbuf);
if (verbose > 1 && file->flags & FLAG_TOP_DIR)
rprintf(FINFO, "deleting in %s\n", fbuf);
- delete_in_dir(flist, fbuf, file);
+ if (link_stat(fbuf, &st, keep_dirlinks) < 0
+ || !S_ISDIR(st.st_mode))
+ continue;
+
+ delete_in_dir(flist, fbuf, file, &st);
}
}
- delete_in_dir(NULL, NULL, NULL);
+ delete_in_dir(NULL, NULL, NULL
, NULL
);
if (do_progress && !am_server)
rprintf(FINFO, " \r");
if (do_progress && !am_server)
rprintf(FINFO, " \r");
@@
-360,7
+361,7
@@
void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
iflags &= 0xffff;
if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
iflags &= 0xffff;
if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
- || (xname && *xname)) && !read_batch) {
+ ||
log_format_has_i > 1 ||
(xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
if (ndx >= 0)
write_int(sock_f_out, ndx);
if (protocol_version >= 29) {
if (ndx >= 0)
write_int(sock_f_out, ndx);
@@
-606,7
+607,7
@@
void check_for_finished_hlinks(int itemizing, enum logcode code)
* value if we found an alternate basis file. */
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
* value if we found an alternate basis file. */
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
- int maybe_
PERM
S_REPORT, enum logcode code)
+ int maybe_
ATTR
S_REPORT, enum logcode code)
{
int best_match = -1;
int match_level = 0;
{
int best_match = -1;
int match_level = 0;
@@
-662,7
+663,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
hard_link_cluster(file, ndx, itemizing, code);
} else if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
hard_link_cluster(file, ndx, itemizing, code);
} else if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
- if (verbose > 1 && maybe_
PERM
S_REPORT) {
+ if (verbose > 1 && maybe_
ATTR
S_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
@@
-682,8
+683,8
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
}
if (itemizing)
itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
}
if (itemizing)
itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
- set_
perm
s(fname, file, NULL, 0);
- if (maybe_
PERM
S_REPORT
+ set_
file_attr
s(fname, file, NULL, 0);
+ if (maybe_
ATTR
S_REPORT
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
code = daemon_log_format_has_i || dry_run
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
code = daemon_log_format_has_i || dry_run
@@
-703,7
+704,7
@@
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
* handling the file, or -1 if no dest-linking occurred. */
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
int itemizing, int *possible_ptr,
* handling the file, or -1 if no dest-linking occurred. */
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
int itemizing, int *possible_ptr,
- int maybe_
PERM
S_REPORT, enum logcode code)
+ int maybe_
ATTR
S_REPORT, enum logcode code)
{
char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN];
STRUCT_STAT st;
{
char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN];
STRUCT_STAT st;
@@
-715,10
+716,12
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
|| !unchanged_attrs(file, &st))
continue;
if (S_ISLNK(file->mode)) {
|| !unchanged_attrs(file, &st))
continue;
if (S_ISLNK(file->mode)) {
+#ifdef SUPPORT_LINKS
if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
continue;
lnk[len] = '\0';
if (strcmp(lnk, file->u.link) != 0)
if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
continue;
lnk[len] = '\0';
if (strcmp(lnk, file->u.link) != 0)
+#endif
continue;
} else {
if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
continue;
} else {
if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
@@
-739,7
+742,7
@@
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
char *lp = link_dest ? "" : NULL;
itemize(file, ndx, 0, &st, changes, 0, lp);
}
char *lp = link_dest ? "" : NULL;
itemize(file, ndx, 0, &st, changes, 0, lp);
}
- if (verbose > 1 && maybe_
PERM
S_REPORT) {
+ if (verbose > 1 && maybe_
ATTR
S_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
@@
-763,7
+766,7
@@
static int phase = 0;
* Note that f_out is set to -1 when doing final directory-permission and
* modification-time repair. */
static void recv_generator(char *fname, struct file_struct *file, int ndx,
* Note that f_out is set to -1 when doing final directory-permission and
* modification-time repair. */
static void recv_generator(char *fname, struct file_struct *file, int ndx,
- int itemizing, int maybe_
PERM
S_REPORT,
+ int itemizing, int maybe_
ATTR
S_REPORT,
enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
@@
-887,12
+890,12
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
full_fname(fname));
}
}
full_fname(fname));
}
}
- if (set_
perm
s(fname, file, statret ? NULL : &st, 0)
+ if (set_
file_attr
s(fname, file, statret ? NULL : &st, 0)
&& verbose && code && f_out != -1)
rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
&& verbose && code && f_out != -1)
rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
- delete_in_dir(the_file_list, fname, file);
+ delete_in_dir(the_file_list, fname, file
, &st
);
return;
}
return;
}
@@
-928,8
+931,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
itemize(file, ndx, 0, &st, 0,
0, NULL);
}
itemize(file, ndx, 0, &st, 0,
0, NULL);
}
- set_
perm
s(fname, file, &st,
-
maybe_PERM
S_REPORT);
+ set_
file_attr
s(fname, file, &st,
+
maybe_ATTR
S_REPORT);
if (preserve_hard_links
&& file->link_u.links) {
hard_link_cluster(file, ndx,
if (preserve_hard_links
&& file->link_u.links) {
hard_link_cluster(file, ndx,
@@
-948,7
+951,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
} else if (basis_dir[0] != NULL && can_link_symlinks) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_symlinks,
} else if (basis_dir[0] != NULL && can_link_symlinks) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_symlinks,
- maybe_
PERM
S_REPORT, code) == -2) {
+ maybe_
ATTR
S_REPORT, code) == -2) {
if (!copy_dest)
return;
itemizing = code = 0;
if (!copy_dest)
return;
itemizing = code = 0;
@@
-962,7
+965,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), file->u.link);
} else {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), file->u.link);
} else {
- set_
perms(fname,file,NULL,
0);
+ set_
file_attrs(fname, file, NULL,
0);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
@@
-983,12
+986,13
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
return;
}
- if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
+ if ((am_root && preserve_devices && IS_DEVICE(file->mode))
+ || (preserve_specials && IS_SPECIAL(file->mode))) {
if (statret != 0
&& (basis_dir[0] != NULL && can_link_devices)) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_devices,
if (statret != 0
&& (basis_dir[0] != NULL && can_link_devices)) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_devices,
- maybe_
PERM
S_REPORT, code) == -2) {
+ maybe_
ATTR
S_REPORT, code) == -2) {
if (!copy_dest)
return;
itemizing = code = 0;
if (!copy_dest)
return;
itemizing = code = 0;
@@
-1004,7
+1008,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
&& hard_link_check(file, ndx, fname, -1, &st,
itemizing, code, HL_SKIP))
return;
&& hard_link_check(file, ndx, fname, -1, &st,
itemizing, code, HL_SKIP))
return;
- if (!IS_DEVICE(st.st_mode))
+ if ((IS_DEVICE(file->mode) && !IS_DEVICE(st.st_mode))
+ || (IS_SPECIAL(file->mode) && !IS_SPECIAL(st.st_mode)))
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
@@
-1015,7
+1020,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
- set_
perms(fname,file,NULL,
0);
+ set_
file_attrs(fname, file, NULL,
0);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
@@
-1030,7
+1035,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
} else {
if (itemizing)
itemize(file, ndx, statret, &st, 0, 0, NULL);
} else {
if (itemizing)
itemize(file, ndx, statret, &st, 0, 0, NULL);
- set_
perms(fname, file, &st, maybe_PERM
S_REPORT);
+ set_
file_attrs(fname, file, &st, maybe_ATTR
S_REPORT);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
}
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
}
@@
-1086,7
+1091,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
- itemizing, maybe_
PERM
S_REPORT, code);
+ itemizing, maybe_
ATTR
S_REPORT, code);
if (j == -2)
return;
if (j != -1) {
if (j == -2)
return;
if (j != -1) {
@@
-1151,7
+1156,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
itemize(file, ndx, real_ret, &real_st,
0, 0, NULL);
}
itemize(file, ndx, real_ret, &real_st,
0, 0, NULL);
}
- set_
perms(fname, file, &st, maybe_PERM
S_REPORT);
+ set_
file_attrs(fname, file, &st, maybe_ATTR
S_REPORT);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
return;
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
return;
@@
-1195,7
+1200,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
close(fd);
return;
}
close(fd);
return;
}
- if (!(back_file = make_file(fname, NULL, NULL, NO_FILTERS))) {
+ if (!(back_file = make_file(fname, NULL, NULL,
0,
NO_FILTERS))) {
close(fd);
goto pretend_missing;
}
close(fd);
goto pretend_missing;
}
@@
-1256,7
+1261,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
if (f_copy >= 0) {
close(f_copy);
if (f_copy >= 0) {
close(f_copy);
- set_
perm
s(backupptr, back_file, NULL, 0);
+ set_
file_attr
s(backupptr, back_file, NULL, 0);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
fname, backupptr);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
fname, backupptr);
@@
-1271,7
+1276,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
{
int i;
char fbuf[MAXPATHLEN];
{
int i;
char fbuf[MAXPATHLEN];
- int itemizing, maybe_
PERM
S_REPORT;
+ int itemizing, maybe_
ATTR
S_REPORT;
enum logcode code;
int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
enum logcode code;
int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
@@
-1283,19
+1288,19
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (protocol_version >= 29) {
itemizing = 1;
if (protocol_version >= 29) {
itemizing = 1;
- maybe_
PERMS_REPORT = log_format_has_i ? 0 : PERM
S_REPORT;
+ maybe_
ATTRS_REPORT = log_format_has_i ? 0 : ATTR
S_REPORT;
code = daemon_log_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
itemizing = daemon_log_format_has_i && do_xfers;
code = daemon_log_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
itemizing = daemon_log_format_has_i && do_xfers;
- maybe_
PERMS_REPORT = PERM
S_REPORT;
+ maybe_
ATTRS_REPORT = ATTR
S_REPORT;
code = itemizing || !do_xfers ? FCLIENT : FINFO;
} else if (!am_server) {
itemizing = log_format_has_i;
code = itemizing || !do_xfers ? FCLIENT : FINFO;
} else if (!am_server) {
itemizing = log_format_has_i;
- maybe_
PERMS_REPORT = log_format_has_i ? 0 : PERM
S_REPORT;
+ maybe_
ATTRS_REPORT = log_format_has_i ? 0 : ATTR
S_REPORT;
code = itemizing ? 0 : FINFO;
} else {
itemizing = 0;
code = itemizing ? 0 : FINFO;
} else {
itemizing = 0;
- maybe_
PERMS_REPORT = PERM
S_REPORT;
+ maybe_
ATTRS_REPORT = ATTR
S_REPORT;
code = FINFO;
}
code = FINFO;
}
@@
-1333,7
+1338,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
- recv_generator(fbuf, file, i, itemizing, maybe_
PERM
S_REPORT,
+ recv_generator(fbuf, file, i, itemizing, maybe_
ATTR
S_REPORT,
code, f_out);
/* We need to ensure that any dirs we create have writeable
code, f_out);
/* We need to ensure that any dirs we create have writeable
@@
-1342,7
+1347,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
&& !list_only) {
#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
&& !list_only) {
-
in
t mode = file->mode | S_IWUSR; /* user write */
+
mode_
t mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode) < 0) {
rsyserr(FERROR, errno,
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode) < 0) {
rsyserr(FERROR, errno,
@@
-1363,7
+1368,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
if (delete_during)
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
if (delete_during)
- delete_in_dir(NULL, NULL, NULL);
+ delete_in_dir(NULL, NULL, NULL
, NULL
);
phase++;
csum_length = SUM_LENGTH;
phase++;
csum_length = SUM_LENGTH;
@@
-1387,7
+1392,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
- recv_generator(fbuf, file, i, itemizing, maybe_
PERM
S_REPORT,
+ recv_generator(fbuf, file, i, itemizing, maybe_
ATTR
S_REPORT,
code, f_out);
}
code, f_out);
}
@@
-1435,7
+1440,7
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
recv_generator(f_name(file, NULL), file, i, itemizing,
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
recv_generator(f_name(file, NULL), file, i, itemizing,
- maybe_
PERM
S_REPORT, code, -1);
+ maybe_
ATTR
S_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
else if (!(j % 200))
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
else if (!(j % 200))