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
Some more IOERR_VANISHED support.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
415de19
..
6a11d0f
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-33,6
+33,7
@@
extern int verbose;
extern int do_progress;
extern int am_root;
extern int am_server;
extern int do_progress;
extern int am_root;
extern int am_server;
+extern int am_daemon;
extern int always_checksum;
extern int module_id;
extern int ignore_errors;
extern int always_checksum;
extern int module_id;
extern int ignore_errors;
@@
-46,7
+47,6
@@
extern char *files_from;
extern int filesfrom_fd;
extern int one_file_system;
extern int filesfrom_fd;
extern int one_file_system;
-extern int make_backups;
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;
@@
-81,7
+81,7
@@
void init_flist(void)
struct file_struct f;
/* Figure out how big the file_struct is without trailing padding */
struct file_struct f;
/* Figure out how big the file_struct is without trailing padding */
- file_struct_len =
((char*)&f.flags - (char*)&f
) + sizeof f.flags;
+ file_struct_len =
offsetof(struct file_struct, flags
) + sizeof f.flags;
}
}
@@
-659,10
+659,8
@@
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
#if SUPPORT_HARD_LINKS
if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
flags |= XMIT_HAS_IDEV_DATA;
#if SUPPORT_HARD_LINKS
if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
flags |= XMIT_HAS_IDEV_DATA;
- if (flags & XMIT_HAS_IDEV_DATA
&& flist->hlink_pool
) {
+ if (flags & XMIT_HAS_IDEV_DATA) {
INO64_T inode;
INO64_T inode;
- file->link_u.idev = pool_talloc(flist->hlink_pool,
- struct idev, 1, "inode_table");
if (protocol_version < 26) {
dev = read_int(f);
inode = read_int(f);
if (protocol_version < 26) {
dev = read_int(f);
inode = read_int(f);
@@
-672,6
+670,8
@@
void receive_file_entry(struct file_struct **fptr, unsigned short flags,
inode = read_longint(f);
}
if (flist->hlink_pool) {
inode = read_longint(f);
}
if (flist->hlink_pool) {
+ file->link_u.idev = pool_talloc(flist->hlink_pool,
+ struct idev, 1, "inode_table");
file->F_INODE = inode;
file->F_DEV = dev;
}
file->F_INODE = inode;
file->F_DEV = dev;
}
@@
-732,6
+732,8
@@
struct file_struct *make_file(char *fname,
char *basename, *dirname, *bp;
unsigned short flags = 0;
char *basename, *dirname, *bp;
unsigned short flags = 0;
+ if (!flist) /* lastdir isn't valid if flist is NULL */
+ lastdir_len = -1;
if (strlcpy(thisname, fname, sizeof thisname)
>= sizeof thisname - flist_dir_len) {
if (strlcpy(thisname, fname, sizeof thisname)
>= sizeof thisname - flist_dir_len) {
@@
-746,18
+748,26
@@
struct file_struct *make_file(char *fname,
if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
- if (errno == ENOENT && exclude_level != NO_EXCLUDES) {
+ if (errno == ENOENT) {
+ enum logcode c = am_daemon && protocol_version < 28
+ ? FERROR : FINFO;
/* either symlink pointing nowhere or file that
* was removed during rsync run; see if excluded
* before reporting an error */
/* either symlink pointing nowhere or file that
* was removed during rsync run; see if excluded
* before reporting an error */
- if (check_exclude_file(thisname, 0, exclude_level)) {
+ if (exclude_level != NO_EXCLUDES
+ && check_exclude_file(thisname, 0, exclude_level)) {
/* file is excluded anyway, ignore silently */
return NULL;
}
/* file is excluded anyway, ignore silently */
return NULL;
}
+ io_error |= IOERR_VANISHED;
+ rprintf(c, "file has vanished: %s\n",
+ full_fname(thisname));
+ }
+ else {
+ io_error |= IOERR_GENERAL;
+ rprintf(FERROR, "readlink %s failed: %s\n",
+ full_fname(thisname), strerror(save_errno));
}
}
- io_error |= IOERR_GENERAL;
- rprintf(FERROR, "readlink %s failed: %s\n",
- full_fname(thisname), strerror(save_errno));
return NULL;
}
return NULL;
}
@@
-1175,8
+1185,7
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
finish_filelist_progress(flist);
}
finish_filelist_progress(flist);
}
- if (flist->hlink_pool)
- {
+ if (flist->hlink_pool) {
pool_destroy(flist->hlink_pool);
flist->hlink_pool = NULL;
}
pool_destroy(flist->hlink_pool);
flist->hlink_pool = NULL;
}