extern int do_progress;
extern int am_server;
extern int always_checksum;
+extern int module_id;
+extern int ignore_errors;
extern int cvs_exclude;
extern int recurse;
+extern char curr_dir[MAXPATHLEN];
extern char *files_from;
extern int filesfrom_fd;
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
-extern int io_error;
extern int sanitize_paths;
extern int read_batch;
extern struct exclude_struct **server_exclude_list;
extern struct exclude_struct **local_exclude_list;
+int io_error;
+
static struct file_struct null_file;
+static char empty_sum[MD4_SUM_LENGTH];
static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
/* This overwrites the progress line */
rprintf(FINFO, "%d file%sto consider\n",
flist->count, flist->count == 1 ? " " : "s ");
- } else {
+ } else
rprintf(FINFO, "done\n");
- }
}
void show_flist_stats(void)
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
perms,
(double) f->length, timestring(f->modtime),
- f_name(f), f->link);
+ f_name(f), f->u.link);
} else {
rprintf(FINFO, "%s %11.0f %s %s\n",
perms,
* @post @p buffer contains information about the link or the
* referrent as appropriate, if they exist.
**/
-int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf)
+int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
{
#if SUPPORT_LINKS
- if (copy_links) {
+ if (copy_links)
return do_stat(path, buffer);
- }
- if (do_lstat(path, buffer) == -1) {
+ if (do_lstat(path, buffer) == -1)
return -1;
- }
if (S_ISLNK(buffer->st_mode)) {
- int l;
- l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
+ int l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
if (l == -1)
return -1;
linkbuf[l] = 0;
int link_stat(const char *path, STRUCT_STAT * buffer)
{
#if SUPPORT_LINKS
- if (copy_links) {
+ if (copy_links)
return do_stat(path, buffer);
- } else {
- return do_lstat(path, buffer);
- }
+ return do_lstat(path, buffer);
#else
return do_stat(path, buffer);
#endif
static int to_wire_mode(mode_t mode)
{
- if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) {
+ if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
return (mode & ~(_S_IFMT)) | 0120000;
- }
return (int) mode;
}
static mode_t from_wire_mode(int mode)
{
- if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) {
+ if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000))
return (mode & ~(_S_IFMT)) | _S_IFLNK;
- }
return (mode_t) mode;
}
static void send_directory(int f, struct file_list *flist, char *dir);
static char *flist_dir;
+static int flist_dir_len;
/**
}
}
-
-static void send_file_entry(struct file_struct *file, int f,
- unsigned base_flags)
+void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
{
- unsigned char flags;
- static time_t last_time;
- static mode_t last_mode;
- static DEV64_T last_rdev;
- static uid_t last_uid;
- static gid_t last_gid;
+ unsigned short flags;
+ static time_t modtime;
+ static mode_t mode;
+ static DEV64_T rdev; /* just high bytes in p28 onward */
+ static DEV64_T dev;
+ static uid_t uid;
+ static gid_t gid;
static char lastname[MAXPATHLEN];
- char *fname;
+ char *fname, fbuf[MAXPATHLEN];
int l1, l2;
if (f == -1)
if (!file) {
write_byte(f, 0);
+ modtime = 0, mode = 0;
+ rdev = 0, dev = 0;
+ uid = 0, gid = 0;
+ *lastname = '\0';
return;
}
io_write_phase = "send_file_entry";
- fname = f_name(file);
+ fname = f_name_to(file, fbuf);
flags = base_flags;
- if (file->mode == last_mode)
+ if (file->mode == mode)
flags |= SAME_MODE;
- if (file->rdev == last_rdev)
- flags |= SAME_RDEV;
- if (file->uid == last_uid)
+ else
+ mode = file->mode;
+ if (preserve_devices) {
+ if (protocol_version < 28) {
+ if (IS_DEVICE(mode)) {
+ if (file->u.rdev == rdev) {
+ /* Set both flags so that the test when
+ * writing the data is simpler. */
+ flags |= SAME_RDEV_pre28|SAME_HIGH_RDEV;
+ } else
+ rdev = file->u.rdev;
+ } else
+ rdev = 0;
+ } else if (IS_DEVICE(mode)) {
+ if ((file->u.rdev & ~0xFF) == rdev)
+ flags |= SAME_HIGH_RDEV;
+ else
+ rdev = file->u.rdev & ~0xFF;
+ }
+ }
+ if (file->uid == uid)
flags |= SAME_UID;
- if (file->gid == last_gid)
+ else
+ uid = file->uid;
+ if (file->gid == gid)
flags |= SAME_GID;
- if (file->modtime == last_time)
+ else
+ gid = file->gid;
+ if (file->modtime == modtime)
flags |= SAME_TIME;
+ else
+ modtime = file->modtime;
+ if (file->link_u.idev) {
+ if (file->F_DEV == dev) {
+ if (protocol_version >= 28)
+ flags |= SAME_DEV;
+ } else
+ dev = file->F_DEV;
+ flags |= HAS_INODE_DATA;
+ }
for (l1 = 0;
lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);
l1++) {}
- l2 = strlen(fname) - l1;
+ l2 = strlen(fname+l1);
if (l1 > 0)
flags |= SAME_NAME;
if (l2 > 255)
flags |= LONG_NAME;
- /* we must make sure we don't send a zero flags byte or the other
- end will terminate the flist transfer */
- if (flags == 0 && !S_ISDIR(file->mode))
- flags |= FLAG_DELETE;
- if (flags == 0)
- flags |= LONG_NAME;
-
- write_byte(f, flags);
+ /* We must make sure we don't send a zero flags byte or
+ * the other end will terminate the flist transfer. */
+ if (flags == 0 && !S_ISDIR(mode))
+ flags |= FLAG_DELETE; /* NOTE: no meaning for non-dir */
+ if (protocol_version >= 28) {
+ if ((flags & 0xFF00) || flags == 0) {
+ flags |= EXTENDED_FLAGS;
+ write_byte(f, flags);
+ write_byte(f, flags >> 8);
+ } else
+ write_byte(f, flags);
+ } else {
+ if (flags == 0)
+ flags |= LONG_NAME;
+ write_byte(f, flags);
+ }
if (flags & SAME_NAME)
write_byte(f, l1);
if (flags & LONG_NAME)
write_longint(f, file->length);
if (!(flags & SAME_TIME))
- write_int(f, (int) file->modtime);
+ write_int(f, modtime);
if (!(flags & SAME_MODE))
- write_int(f, to_wire_mode(file->mode));
+ write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & SAME_UID)) {
- add_uid(file->uid);
- write_int(f, (int) file->uid);
+ add_uid(uid);
+ write_int(f, uid);
}
if (preserve_gid && !(flags & SAME_GID)) {
- add_gid(file->gid);
- write_int(f, (int) file->gid);
+ add_gid(gid);
+ write_int(f, gid);
+ }
+ if (preserve_devices && IS_DEVICE(mode)) {
+ /* If SAME_HIGH_RDEV is off, SAME_RDEV_pre28 is also off.
+ * Also, avoid using "rdev" because it may be incomplete. */
+ if (!(flags & SAME_HIGH_RDEV))
+ write_int(f, file->u.rdev);
+ else if (protocol_version >= 28)
+ write_byte(f, file->u.rdev);
}
- if (preserve_devices && IS_DEVICE(file->mode)
- && !(flags & SAME_RDEV))
- write_int(f, (int) file->rdev);
#if SUPPORT_LINKS
- if (preserve_links && S_ISLNK(file->mode)) {
- write_int(f, strlen(file->link));
- write_buf(f, file->link, strlen(file->link));
+ if (preserve_links && S_ISLNK(mode)) {
+ write_int(f, strlen(file->u.link));
+ write_buf(f, file->u.link, strlen(file->u.link));
}
#endif
#if SUPPORT_HARD_LINKS
- if (preserve_hard_links && S_ISREG(file->mode)) {
+ if (flags & HAS_INODE_DATA) {
if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
- write_int(f, (int) file->dev);
- write_int(f, (int) file->inode);
+ write_int(f, dev);
+ write_int(f, file->F_INODE);
} else {
/* 64-bit dev_t and ino_t */
- write_longint(f, file->dev);
- write_longint(f, file->inode);
+ if (!(flags & SAME_DEV))
+ write_longint(f, dev);
+ write_longint(f, file->F_INODE);
}
}
#endif
if (always_checksum) {
- if (protocol_version < 21) {
- write_buf(f, file->sum, 2);
- } else {
- write_buf(f, file->sum, MD4_SUM_LENGTH);
+ char *sum;
+ if (S_ISREG(mode))
+ sum = file->u.sum;
+ else if (protocol_version < 28) {
+ /* Prior to 28, we sent a useless set of nulls. */
+ sum = empty_sum;
+ } else
+ sum = NULL;
+ if (sum) {
+ write_buf(f, sum, protocol_version < 21? 2
+ : MD4_SUM_LENGTH);
}
}
- last_mode = file->mode;
- last_rdev = file->rdev;
- last_uid = file->uid;
- last_gid = file->gid;
- last_time = file->modtime;
-
strlcpy(lastname, fname, MAXPATHLEN);
- lastname[MAXPATHLEN - 1] = 0;
io_write_phase = "unknown";
}
-static void receive_file_entry(struct file_struct **fptr,
- unsigned flags, int f)
+void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
{
- static time_t last_time;
- static mode_t last_mode;
- static DEV64_T last_rdev;
- static uid_t last_uid;
- static gid_t last_gid;
+ static time_t modtime;
+ static mode_t mode;
+ static DEV64_T rdev; /* just high bytes in p28 onward */
+ static DEV64_T dev;
+ static uid_t uid;
+ static gid_t gid;
static char lastname[MAXPATHLEN];
char thisname[MAXPATHLEN];
unsigned int l1 = 0, l2 = 0;
char *p;
struct file_struct *file;
+ if (!fptr) {
+ modtime = 0, mode = 0;
+ rdev = 0, dev = 0;
+ uid = 0, gid = 0;
+ *lastname = '\0';
+ return;
+ }
+
if (flags & SAME_NAME)
l1 = read_byte(f);
if ((p = strrchr(thisname, '/'))) {
static char *lastdir;
*p = 0;
- if (lastdir && strcmp(thisname, lastdir) == 0) {
+ if (lastdir && strcmp(thisname, lastdir) == 0)
file->dirname = lastdir;
- } else {
+ else {
file->dirname = strdup(thisname);
lastdir = file->dirname;
}
if (!file->basename)
out_of_memory("receive_file_entry 1");
-
- file->flags = flags;
+ file->flags = flags & LIVE_FLAGS;
file->length = read_longint(f);
- file->modtime =
- (flags & SAME_TIME) ? last_time : (time_t) read_int(f);
- file->mode =
- (flags & SAME_MODE) ? last_mode : from_wire_mode(read_int(f));
- if (preserve_uid)
- file->uid =
- (flags & SAME_UID) ? last_uid : (uid_t) read_int(f);
- if (preserve_gid)
- file->gid =
- (flags & SAME_GID) ? last_gid : (gid_t) read_int(f);
- if (preserve_devices && IS_DEVICE(file->mode))
- file->rdev =
- (flags & SAME_RDEV) ? last_rdev : (DEV64_T) read_int(f);
-
- if (preserve_links && S_ISLNK(file->mode)) {
+ if (!(flags & SAME_TIME))
+ modtime = (time_t)read_int(f);
+ file->modtime = modtime;
+ if (!(flags & SAME_MODE))
+ mode = from_wire_mode(read_int(f));
+ file->mode = mode;
+
+ if (preserve_uid) {
+ if (!(flags & SAME_UID))
+ uid = (uid_t)read_int(f);
+ file->uid = uid;
+ }
+ if (preserve_gid) {
+ if (!(flags & SAME_GID))
+ gid = (gid_t)read_int(f);
+ file->gid = gid;
+ }
+ if (preserve_devices) {
+ if (protocol_version < 28) {
+ if (IS_DEVICE(mode)) {
+ if (!(flags & SAME_RDEV_pre28))
+ rdev = (DEV64_T)read_int(f);
+ file->u.rdev = rdev;
+ } else
+ rdev = 0;
+ } else if (IS_DEVICE(mode)) {
+ if (!(flags & SAME_HIGH_RDEV)) {
+ file->u.rdev = (DEV64_T)read_int(f);
+ rdev = file->u.rdev & ~0xFF;
+ } else
+ file->u.rdev = rdev | (DEV64_T)read_byte(f);
+ }
+ }
+
+ if (preserve_links && S_ISLNK(mode)) {
int l = read_int(f);
if (l < 0) {
rprintf(FERROR, "overflow: l=%d\n", l);
overflow("receive_file_entry");
}
- file->link = new_array(char, l + 1);
- if (!file->link)
+ if (!(file->u.link = new_array(char, l + 1)))
out_of_memory("receive_file_entry 2");
- read_sbuf(f, file->link, l);
- if (sanitize_paths) {
- sanitize_path(file->link, file->dirname);
- }
+ read_sbuf(f, file->u.link, l);
+ if (sanitize_paths)
+ sanitize_path(file->u.link, file->dirname);
}
#if SUPPORT_HARD_LINKS
- if (preserve_hard_links && S_ISREG(file->mode)) {
+ if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
+ flags |= HAS_INODE_DATA;
+ if (flags & HAS_INODE_DATA) {
+ if (!(file->link_u.idev = new(struct idev)))
+ out_of_memory("file inode data");
if (protocol_version < 26) {
- file->dev = read_int(f);
- file->inode = read_int(f);
+ dev = read_int(f);
+ file->F_INODE = read_int(f);
} else {
- file->dev = read_longint(f);
- file->inode = read_longint(f);
+ if (!(flags & SAME_DEV))
+ dev = read_longint(f);
+ file->F_INODE = read_longint(f);
}
+ file->F_DEV = dev;
}
#endif
if (always_checksum) {
- file->sum = new_array(char, MD4_SUM_LENGTH);
- if (!file->sum)
- out_of_memory("md4 sum");
- if (protocol_version < 21) {
- read_buf(f, file->sum, 2);
- } else {
- read_buf(f, file->sum, MD4_SUM_LENGTH);
+ char *sum;
+ if (S_ISREG(mode)) {
+ sum = file->u.sum = new_array(char, MD4_SUM_LENGTH);
+ if (!sum)
+ out_of_memory("md4 sum");
+ } else if (protocol_version < 28) {
+ /* Prior to 28, we get a useless set of nulls. */
+ sum = empty_sum;
+ } else
+ sum = NULL;
+ if (sum) {
+ read_buf(f, sum, protocol_version < 21? 2
+ : MD4_SUM_LENGTH);
}
}
- last_mode = file->mode;
- last_rdev = file->rdev;
- last_uid = file->uid;
- last_gid = file->gid;
- last_time = file->modtime;
-
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 */
+ * permissions and umask. This emulates what GNU cp does */
file->mode &= ~orig_umask;
}
}
-/* determine if a file in a different filesstem should be skipped
+/* determine if a file in a different filesystem should be skipped
when one_file_system is set. We bascally only want to include
the mount points - but they can be hard to find! */
static int skip_filesystem(char *fname, STRUCT_STAT * st)
char *p;
char cleaned_name[MAXPATHLEN];
char linkbuf[MAXPATHLEN];
- extern int module_id;
- strlcpy(cleaned_name, fname, MAXPATHLEN);
- cleaned_name[MAXPATHLEN - 1] = 0;
+ if (strlcpy(cleaned_name, fname, sizeof cleaned_name)
+ >= sizeof cleaned_name - flist_dir_len) {
+ rprintf(FINFO, "skipping overly long name: %s\n", fname);
+ return NULL;
+ }
clean_fname(cleaned_name);
- if (sanitize_paths) {
+ if (sanitize_paths)
sanitize_path(cleaned_name, NULL);
- }
fname = cleaned_name;
memset(sum, 0, SUM_LENGTH);
return NULL;
}
}
- io_error = 1;
+ io_error |= IOERR_GENERAL;
rprintf(FERROR, "readlink %s failed: %s\n",
full_fname(fname), strerror(save_errno));
return NULL;
if ((p = strrchr(fname, '/'))) {
static char *lastdir;
*p = 0;
- if (lastdir && strcmp(fname, lastdir) == 0) {
+ if (lastdir && strcmp(fname, lastdir) == 0)
file->dirname = lastdir;
- } else {
+ else {
file->dirname = strdup(fname);
lastdir = file->dirname;
}
file->mode = st.st_mode;
file->uid = st.st_uid;
file->gid = st.st_gid;
- file->dev = st.st_dev;
- file->inode = st.st_ino;
+ if (preserve_hard_links) {
+ if (protocol_version < 28 ? S_ISREG(st.st_mode)
+ : !S_ISDIR(st.st_mode) && st.st_nlink > 1) {
+ if (!(file->link_u.idev = new(struct idev)))
+ out_of_memory("file inode data");
+ file->F_DEV = st.st_dev;
+ file->F_INODE = st.st_ino;
+ }
+ }
#ifdef HAVE_STRUCT_STAT_ST_RDEV
- file->rdev = st.st_rdev;
+ if (IS_DEVICE(st.st_mode))
+ file->u.rdev = st.st_rdev;
#endif
#if SUPPORT_LINKS
- if (S_ISLNK(st.st_mode)) {
- file->link = STRDUP(ap, linkbuf);
- }
+ if (S_ISLNK(st.st_mode))
+ file->u.link = STRDUP(ap, linkbuf);
#endif
- if (always_checksum) {
- file->sum = (char *) MALLOC(ap, MD4_SUM_LENGTH);
- if (!file->sum)
+ if (always_checksum && S_ISREG(st.st_mode)) {
+ if (!(file->u.sum = (char*)MALLOC(ap, MD4_SUM_LENGTH)))
out_of_memory("md4 sum");
- /* drat. we have to provide a null checksum for non-regular
- files in order to be compatible with earlier versions
- of rsync */
- if (S_ISREG(st.st_mode)) {
- file_checksum(fname, file->sum, st.st_size);
- } else {
- memset(file->sum, 0, MD4_SUM_LENGTH);
- }
+ file_checksum(fname, file->u.sum, st.st_size);
}
- if (flist_dir) {
- static char *lastdir;
- if (lastdir && strcmp(lastdir, flist_dir) == 0) {
- file->basedir = lastdir;
- } else {
- file->basedir = strdup(flist_dir);
- lastdir = file->basedir;
- }
- } else {
- file->basedir = NULL;
- }
+ file->basedir = flist_dir;
if (!S_ISDIR(st.st_mode))
stats.total_size += st.st_size;
}
-
void send_file_name(int f, struct file_list *flist, char *fname,
- int recursive, unsigned base_flags)
+ int recursive, unsigned short base_flags)
{
struct file_struct *file;
+ char fbuf[MAXPATHLEN];
extern int delete_excluded;
/* f is set to -1 when calculating deletion file list */
flist_expand(flist);
- if (write_batch) /* dw */
- file->flags = FLAG_DELETE;
+ if (write_batch)
+ file->flags |= FLAG_DELETE;
if (file->basename[0]) {
flist->files[flist->count++] = file;
if (S_ISDIR(file->mode) && recursive) {
struct exclude_struct **last_exclude_list =
local_exclude_list;
- send_directory(f, flist, f_name(file));
+ send_directory(f, flist, f_name_to(file, fbuf));
local_exclude_list = last_exclude_list;
return;
}
}
-
static void send_directory(int f, struct file_list *flist, char *dir)
{
DIR *d;
struct dirent *di;
char fname[MAXPATHLEN];
- int l;
+ unsigned int offset;
char *p;
d = opendir(dir);
if (!d) {
- io_error = 1;
+ io_error |= IOERR_GENERAL;
rprintf(FERROR, "opendir %s failed: %s\n",
full_fname(dir), strerror(errno));
return;
}
- strlcpy(fname, dir, MAXPATHLEN);
- l = strlen(fname);
- if (fname[l - 1] != '/') {
- if (l == MAXPATHLEN - 1) {
- io_error = 1;
+ offset = strlcpy(fname, dir, MAXPATHLEN);
+ p = fname + offset;
+ if (offset >= MAXPATHLEN || p[-1] != '/') {
+ if (offset >= MAXPATHLEN - 1) {
+ io_error |= IOERR_GENERAL;
rprintf(FERROR, "skipping long-named directory: %s\n",
full_fname(fname));
closedir(d);
return;
}
- strlcat(fname, "/", MAXPATHLEN);
- l++;
+ *p++ = '/';
+ offset++;
}
- p = fname + strlen(fname);
local_exclude_list = NULL;
if (cvs_exclude) {
- if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN - 1) {
- strcpy(p, ".cvsignore");
- add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
- } else {
- io_error = 1;
+ if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
+ < MAXPATHLEN - offset)
+ add_exclude_file(&local_exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
+ else {
+ io_error |= IOERR_GENERAL;
rprintf(FINFO,
"cannot cvs-exclude in long-named directory %s\n",
full_fname(fname));
if (dname[0] == '.' && (dname[1] == '\0'
|| (dname[1] == '.' && dname[2] == '\0')))
continue;
- strlcpy(p, dname, MAXPATHLEN - l);
- send_file_name(f, flist, fname, recurse, 0);
+ if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset)
+ send_file_name(f, flist, fname, recurse, 0);
+ else {
+ io_error |= IOERR_GENERAL;
+ rprintf(FINFO,
+ "cannot send long-named file %s\n",
+ full_fname(fname));
+ }
}
if (errno) {
- io_error = 1;
+ io_error |= IOERR_GENERAL;
rprintf(FERROR, "readdir(%s): (%d) %s\n",
- dir, errno, strerror(errno));
+ dir, errno, strerror(errno));
}
if (local_exclude_list)
{
int l;
STRUCT_STAT st;
- char *p, *dir, *olddir;
+ char *p, *dir, olddir[sizeof curr_dir];
char lastpath[MAXPATHLEN] = "";
struct file_list *flist;
int64 start_write;
flist = flist_new();
if (f != -1) {
- io_start_buffering(f);
+ io_start_buffering_out(f);
if (filesfrom_fd >= 0) {
- if (argv[0] && !push_dir(argv[0], 0)) {
+ if (argv[0] && !push_dir(argv[0])) {
rprintf(FERROR, "push_dir %s failed: %s\n",
full_fname(argv[0]), strerror(errno));
exit_cleanup(RERR_FILESELECT);
if (l == 2 && fname[0] == '.') {
/* Turn "./" into just "." rather than "./." */
fname[1] = '\0';
- } else {
- strlcat(fname, ".", MAXPATHLEN);
+ } else if (l < MAXPATHLEN) {
+ fname[l++] = '.';
+ fname[l] = '\0';
}
}
if (link_stat(fname, &st) != 0) {
if (f != -1) {
- io_error = 1;
+ io_error |= IOERR_GENERAL;
rprintf(FERROR, "link_stat %s failed: %s\n",
full_fname(fname), strerror(errno));
}
}
dir = NULL;
- olddir = NULL;
+ olddir[0] = '\0';
if (!relative_paths) {
p = strrchr(fname, '/');
fname = ".";
if (dir && *dir) {
- olddir = push_dir(dir, 1);
+ static char *lastdir;
+ static int lastdir_len;
- if (!olddir) {
- io_error = 1;
+ strcpy(olddir, curr_dir); /* can't overflow */
+
+ if (!push_dir(dir)) {
+ io_error |= IOERR_GENERAL;
rprintf(FERROR, "push_dir %s failed: %s\n",
full_fname(dir), strerror(errno));
continue;
}
- flist_dir = dir;
+ if (lastdir && strcmp(lastdir, dir) == 0) {
+ flist_dir = lastdir;
+ flist_dir_len = lastdir_len;
+ } else {
+ if (lastdir)
+ free(lastdir);
+ flist_dir = lastdir = strdup(dir);
+ flist_dir_len = lastdir_len = strlen(dir);
+ }
}
if (one_file_system)
send_file_name(f, flist, fname, recurse, FLAG_DELETE);
- if (olddir != NULL) {
+ if (olddir[0]) {
flist_dir = NULL;
- if (pop_dir(olddir) != 0) {
+ flist_dir_len = 0;
+ if (!pop_dir(olddir)) {
rprintf(FERROR, "pop_dir %s failed: %s\n",
full_fname(dir), strerror(errno));
exit_cleanup(RERR_FILESELECT);
if (f != -1) {
send_file_entry(NULL, f, 0);
- }
- if (show_filelist_p() && f != -1) {
- finish_filelist_progress(flist);
+ if (show_filelist_p())
+ finish_filelist_progress(flist);
}
clean_flist(flist, 0, 0);
- /* now send the uid/gid list. This was introduced in protocol
- version 15 */
if (f != -1) {
+ /* Now send the uid/gid list. This was introduced in
+ * protocol version 15 */
send_uid_list(f);
- }
- /* send the io_error flag */
- if (f != -1) {
- extern int module_id;
+ /* send the io_error flag */
write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
- }
- if (f != -1) {
io_end_buffering();
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
- if (write_batch) /* dw */
+ if (write_batch)
write_batch_flist_info(flist->count, flist->files);
}
struct file_list *recv_file_list(int f)
{
struct file_list *flist;
- unsigned char flags;
+ unsigned short flags;
int64 start_read;
extern int list_only;
goto oom;
- for (flags = read_byte(f); flags; flags = read_byte(f)) {
+ while ((flags = read_byte(f)) != 0) {
int i = flist->count;
flist_expand(flist);
+ if (protocol_version >= 28 && (flags & EXTENDED_FLAGS))
+ flags |= read_byte(f) << 8;
receive_file_entry(&flist->files[i], flags, f);
if (S_ISREG(flist->files[i]->mode))
maybe_emit_filelist_progress(flist);
- if (verbose > 2)
+ if (verbose > 2) {
rprintf(FINFO, "recv_file_name(%s)\n",
f_name(flist->files[i]));
+ }
}
-
+ receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
if (verbose > 2)
rprintf(FINFO, "received %d names\n", flist->count);
- clean_flist(flist, relative_paths, 1);
-
- if (show_filelist_p()) {
+ if (show_filelist_p())
finish_filelist_progress(flist);
- }
- /* now recv the uid/gid list. This was introduced in protocol version 15 */
+ clean_flist(flist, relative_paths, 1);
+
if (f != -1) {
+ /* Now send the uid/gid list. This was introduced in
+ * protocol version 15 */
recv_uid_list(f, flist);
- }
- /* recv the io_error flag */
- if (f != -1 && !read_batch) { /* dw-added readbatch */
- extern int module_id;
- extern int ignore_errors;
- if (lp_ignore_errors(module_id) || ignore_errors) {
- read_int(f);
- } else {
- io_error |= read_int(f);
+ 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);
}
}
if (list_only) {
int i;
- for (i = 0; i < flist->count; i++) {
+ for (i = 0; i < flist->count; i++)
list_file_entry(flist->files[i]);
- }
}
-
if (verbose > 2)
rprintf(FINFO, "recv_file_list done\n");
}
-/*
- * XXX: This is currently the hottest function while building the file
- * list, because building f_name()s every time is expensive.
- **/
-int file_compare(struct file_struct **f1, struct file_struct **f2)
+int file_compare(struct file_struct **file1, struct file_struct **file2)
{
- if (!(*f1)->basename && !(*f2)->basename)
+ struct file_struct *f1 = *file1;
+ struct file_struct *f2 = *file2;
+
+ if (!f1->basename && !f2->basename)
return 0;
- if (!(*f1)->basename)
+ if (!f1->basename)
return -1;
- if (!(*f2)->basename)
+ if (!f2->basename)
return 1;
- if ((*f1)->dirname == (*f2)->dirname)
- return u_strcmp((*f1)->basename, (*f2)->basename);
- return u_strcmp(f_name(*f1), f_name(*f2));
+ if (f1->dirname == f2->dirname)
+ return u_strcmp(f1->basename, f2->basename);
+ return f_name_cmp(f1, f2);
}
while (low != high) {
int mid = (low + high) / 2;
- int ret =
- file_compare(&flist->files[flist_up(flist, mid)], &f);
+ int ret = file_compare(&flist->files[flist_up(flist, mid)],&f);
if (ret == 0)
return flist_up(flist, mid);
- if (ret > 0) {
+ if (ret > 0)
high = mid;
- } else {
+ else
low = mid + 1;
- }
}
if (file_compare(&flist->files[flist_up(flist, low)], &f) == 0)
return;
if (file->basename)
free(file->basename);
- if (file->link)
- free(file->link);
- if (file->sum)
- free(file->sum);
+ if (!IS_DEVICE(file->mode) && file->u.link)
+ free(file->u.link); /* Handles u.sum too. */
+ if (file->link_u.idev)
+ free((char*)file->link_u.idev); /* Handles link_u.links too. */
*file = null_file;
}
static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
{
int i, prev_i = 0;
- char *name, *prev_name = NULL;
if (!flist || flist->count == 0)
return;
for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
if (flist->files[i]->basename) {
prev_i = i;
- prev_name = f_name(flist->files[i]);
break;
}
}
while (++i < flist->count) {
if (!flist->files[i]->basename)
continue;
- name = f_name(flist->files[i]);
- if (strcmp(name, prev_name) == 0) {
+ if (f_name_cmp(flist->files[i], flist->files[prev_i]) == 0) {
if (verbose > 1 && !am_server) {
rprintf(FINFO,
"removing duplicate name %s from file list %d\n",
- name, i);
+ f_name(flist->files[i]), i);
}
/* Make sure that if we unduplicate '.', that we don't
* lose track of a user-specified starting point (or
flist->files[i][0] = null_file;
else
free_file(flist->files[i]);
- }
- else
+ } else
prev_i = i;
- /* We set prev_name every iteration to avoid it becoming
- * invalid when names[][] in f_name() wraps around. */
- prev_name = name;
}
if (strip_root) {
return;
for (i = 0; i < flist->count; i++) {
- rprintf(FINFO, "[%d] i=%d %s %s mode=0%o len=%.0f\n",
- (int) getpid(), i,
+ rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n",
+ (long) getpid(), i,
NS(flist->files[i]->dirname),
NS(flist->files[i]->basename),
(int) flist->files[i]->mode,
}
-/*
- * return the full filename of a flist entry
- *
- * This function is too expensive at the moment, because it copies
- * strings when often we only want to compare them. In any case,
- * using strlcat is silly because it will walk the string repeatedly.
+enum fnc_state { fnc_DIR, fnc_SLASH, fnc_BASE };
+
+/* Compare the names of two file_struct entities, just like strcmp()
+ * would do if it were operating on the joined strings. We assume
+ * that there are no 0-length strings.
*/
-char *f_name(struct file_struct *f)
+int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
{
- static char names[10][MAXPATHLEN];
- static int n;
- char *p = names[n];
+ int dif;
+ const uchar *c1, *c2;
+ enum fnc_state state1, state2;
+
+ if (!f1 || !f1->basename) {
+ if (!f2 || !f2->basename)
+ return 0;
+ return -1;
+ }
+ if (!f2 || !f2->basename)
+ return 1;
+
+ if (!(c1 = (uchar*)f1->dirname)) {
+ state1 = fnc_BASE;
+ c1 = (uchar*)f1->basename;
+ } else
+ state1 = fnc_DIR;
+ if (!(c2 = (uchar*)f2->dirname)) {
+ state2 = fnc_BASE;
+ c2 = (uchar*)f2->basename;
+ } else
+ state2 = fnc_DIR;
+
+ while (1) {
+ if ((dif = (int)*c1 - (int)*c2) != 0)
+ break;
+ if (!*++c1) {
+ switch (state1) {
+ case fnc_DIR:
+ state1 = fnc_SLASH;
+ c1 = (uchar*)"/";
+ break;
+ case fnc_SLASH:
+ state1 = fnc_BASE;
+ c1 = (uchar*)f1->basename;
+ break;
+ case fnc_BASE:
+ break;
+ }
+ }
+ if (!*++c2) {
+ switch (state2) {
+ case fnc_DIR:
+ state2 = fnc_SLASH;
+ c2 = (uchar*)"/";
+ break;
+ case fnc_SLASH:
+ state2 = fnc_BASE;
+ c2 = (uchar*)f2->basename;
+ break;
+ case fnc_BASE:
+ if (!*c1)
+ return 0;
+ break;
+ }
+ }
+ }
+
+ return dif;
+}
+
+/* Return a copy of the full filename of a flist entry, using the indicated
+ * buffer. No size-checking is done because we checked the size when creating
+ * the file_struct entry.
+ */
+char *f_name_to(struct file_struct *f, char *fbuf)
+{
if (!f || !f->basename)
return NULL;
- n = (n + 1) % 10;
-
if (f->dirname) {
- int off;
+ int len = strlen(f->dirname);
+ memcpy(fbuf, f->dirname, len);
+ fbuf[len] = '/';
+ strcpy(fbuf + len + 1, f->basename);
+ } else
+ strcpy(fbuf, f->basename);
+ return fbuf;
+}
- off = strlcpy(p, f->dirname, MAXPATHLEN);
- off += strlcpy(p + off, "/", MAXPATHLEN - off);
- off += strlcpy(p + off, f->basename, MAXPATHLEN - off);
- } else {
- strlcpy(p, f->basename, MAXPATHLEN);
- }
- return p;
+/* Like f_name_to(), but we rotate through 5 static buffers of our own.
+ */
+char *f_name(struct file_struct *f)
+{
+ static char names[5][MAXPATHLEN];
+ static unsigned int n;
+
+ n = (n + 1) % (sizeof names / sizeof names[0]);
+
+ return f_name_to(f, names[n]);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff