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
Document the improved "refuse options" syntax.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
9fafd92
..
412b089
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-47,6
+47,7
@@
extern char *files_from;
extern int filesfrom_fd;
extern int one_file_system;
extern int filesfrom_fd;
extern int one_file_system;
+extern int keep_dirlinks;
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_perms;
@@
-59,9
+60,9
@@
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
extern int sanitize_paths;
extern int copy_unsafe_links;
extern int protocol_version;
extern int sanitize_paths;
-
-extern int
read_batch
;
-extern int
write_batch
;
+extern int delete_excluded;
+extern int
orig_umask
;
+extern int
list_only
;
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
@@
-174,7
+175,7
@@
int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
#if SUPPORT_LINKS
if (copy_links)
return do_stat(path, buffer);
#if SUPPORT_LINKS
if (copy_links)
return do_stat(path, buffer);
- if (
do_lstat(path, buffer) == -1
)
+ if (
link_stat(path, buffer, keep_dirlinks) < 0
)
return -1;
if (S_ISLNK(buffer->st_mode)) {
int l = readlink((char *)path, linkbuf, MAXPATHLEN - 1);
return -1;
if (S_ISLNK(buffer->st_mode)) {
int l = readlink((char *)path, linkbuf, MAXPATHLEN - 1);
@@
-195,12
+196,19
@@
int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
#endif
}
#endif
}
-int link_stat(const char *path, STRUCT_STAT *buffer)
+int link_stat(const char *path, STRUCT_STAT *buffer
, int follow_dirlinks
)
{
#if SUPPORT_LINKS
if (copy_links)
return do_stat(path, buffer);
{
#if SUPPORT_LINKS
if (copy_links)
return do_stat(path, buffer);
- return do_lstat(path, buffer);
+ if (do_lstat(path, buffer) < 0)
+ return -1;
+ if (follow_dirlinks && S_ISLNK(buffer->st_mode)) {
+ STRUCT_STAT st;
+ if (do_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
+ *buffer = st;
+ }
+ return 0;
#else
return do_stat(path, buffer);
#endif
#else
return do_stat(path, buffer);
#endif
@@
-513,7
+521,7
@@
void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
- struct file_list *flist, int f)
+
struct file_list *flist, int f)
{
static time_t modtime;
static mode_t mode;
{
static time_t modtime;
static mode_t mode;
@@
-707,7
+715,6
@@
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
}
if (!preserve_perms) {
}
if (!preserve_perms) {
- extern int orig_umask;
/* set an appropriate set of permissions based on original
* permissions and umask. This emulates what GNU cp does */
file->mode &= ~orig_umask;
/* set an appropriate set of permissions based on original
* permissions and umask. This emulates what GNU cp does */
file->mode &= ~orig_umask;
@@
-730,8
+737,8
@@
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
* statting directories if we're not recursing, but this is not a very
* important case. Some systems may not have d_type.
**/
* statting directories if we're not recursing, but this is not a very
* important case. Some systems may not have d_type.
**/
-struct file_struct *make_file(char *fname,
-
struct file_list *flist,
int exclude_level)
+struct file_struct *make_file(char *fname,
struct file_list *flist,
+
int exclude_level)
{
static char *lastdir;
static int lastdir_len = -1;
{
static char *lastdir;
static int lastdir_len = -1;
@@
-928,7
+935,6
@@
void send_file_name(int f, struct file_list *flist, char *fname,
{
struct file_struct *file;
char fbuf[MAXPATHLEN];
{
struct file_struct *file;
char fbuf[MAXPATHLEN];
- extern int delete_excluded;
/* f is set to -1 when calculating deletion file list */
file = make_file(fname, flist,
/* f is set to -1 when calculating deletion file list */
file = make_file(fname, flist,
@@
-941,9
+947,6
@@
void send_file_name(int f, struct file_list *flist, char *fname,
flist_expand(flist);
flist_expand(flist);
- if (write_batch)
- file->flags |= FLAG_TOP_DIR;
-
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f, base_flags);
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f, base_flags);
@@
-1030,6
+1033,8
@@
static void send_directory(int f, struct file_list *flist, char *dir)
/**
/**
+ * This function is normally called by the sender, but the receiver also
+ * uses it to construct its own file list if --delete has been specified.
* The delete_files() function in receiver.c sets f to -1 so that we just
* construct the file list in memory without sending it over the wire. It
* also has the side-effect of ignoring user-excludes if delete_excluded
* The delete_files() function in receiver.c sets f to -1 so that we just
* construct the file list in memory without sending it over the wire. It
* also has the side-effect of ignoring user-excludes if delete_excluded
@@
-1054,7
+1059,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
"send_file_list");
if (f != -1) {
"send_file_list");
if (f != -1) {
- io_start_buffering_out(
f
);
+ io_start_buffering_out();
if (filesfrom_fd >= 0) {
if (argv[0] && !push_dir(argv[0])) {
rsyserr(FERROR, errno, "push_dir %s failed",
if (filesfrom_fd >= 0) {
if (argv[0] && !push_dir(argv[0])) {
rsyserr(FERROR, errno, "push_dir %s failed",
@@
-1092,7
+1097,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
}
}
}
}
- if (link_stat(fname, &st) != 0) {
+ if (link_stat(fname, &st
, keep_dirlinks
) != 0) {
if (f != -1) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
if (f != -1) {
io_error |= IOERR_GENERAL;
rsyserr(FERROR, errno, "link_stat %s failed",
@@
-1220,8
+1225,6
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
io_end_buffering();
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
io_end_buffering();
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
- if (write_batch)
- write_batch_flist_info(flist->count, flist->files);
}
if (verbose > 3)
}
if (verbose > 3)
@@
-1239,7
+1242,6
@@
struct file_list *recv_file_list(int f)
struct file_list *flist;
unsigned short flags;
int64 start_read;
struct file_list *flist;
unsigned short flags;
int64 start_read;
- extern int list_only;
if (show_filelist_p())
start_filelist_progress("receiving file list");
if (show_filelist_p())
start_filelist_progress("receiving file list");
@@
-1291,13
+1293,11
@@
struct file_list *recv_file_list(int f)
* protocol version 15 */
recv_uid_list(f, flist);
* protocol version 15 */
recv_uid_list(f, flist);
- if (!read_batch) {
- /* Recv the io_error flag */
- if (lp_ignore_errors(module_id) || ignore_errors)
- read_int(f);
- else
- io_error |= read_int(f);
- }
+ /* Recv the io_error flag */
+ if (lp_ignore_errors(module_id) || ignore_errors)
+ read_int(f);
+ else
+ io_error |= read_int(f);
}
if (verbose > 3)
}
if (verbose > 3)