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;
permstring(perms, f->mode);
+#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
perms,
(double) f->length, timestring(f->modtime),
- f_name(f), f->link);
- } else {
+ f_name(f), f->u.link);
+ } else
+#endif
rprintf(FINFO, "%s %11.0f %s %s\n",
perms,
(double) f->length, timestring(f->modtime),
f_name(f));
- }
}
static int to_wire_mode(mode_t mode)
{
+#if SUPPORT_LINKS
if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
return (mode & ~(_S_IFMT)) | 0120000;
+#endif
return (int) mode;
}
static void send_directory(int f, struct file_list *flist, char *dir);
static char *flist_dir;
+static int flist_dir_len;
/**
}
if (verbose >= 2) {
- rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
+ rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
+ who_am_i(),
(double)sizeof(flist->files[0])
* flist->malloced,
(new_ptr == flist->files) ? " not" : "");
unsigned short flags;
static time_t modtime;
static mode_t mode;
- static DEV64_T rdev; /* just high bytes in p28 onward */
+ static DEV64_T rdev, rdev_high;
static DEV64_T dev;
static uid_t uid;
static gid_t gid;
if (!file) {
write_byte(f, 0);
modtime = 0, mode = 0;
- rdev = 0, dev = 0;
+ rdev = 0, rdev_high = 0, dev = 0;
uid = 0, gid = 0;
*lastname = '\0';
return;
io_write_phase = "send_file_entry";
- fname = f_name_to(file, fbuf, sizeof fbuf);
+ fname = f_name_to(file, fbuf);
flags = base_flags;
if (file->mode == mode)
- flags |= SAME_MODE;
+ flags |= XMIT_SAME_MODE;
else
mode = file->mode;
if (preserve_devices) {
if (protocol_version < 28) {
- if (IS_DEVICE(mode) && file->rdev == rdev) {
- /* Set both flags so that the test when
- * writing the data is simpler. */
- flags |= SAME_RDEV_pre28|SAME_HIGH_RDEV;
+ if (IS_DEVICE(mode)) {
+ if (file->u.rdev == rdev) {
+ /* Set both flags to simplify the test
+ * when writing the data. */
+ flags |= XMIT_SAME_RDEV_pre28
+ | XMIT_SAME_HIGH_RDEV;
+ } else
+ rdev = file->u.rdev;
+ } else
+ rdev = 0;
+ } else if (IS_DEVICE(mode)) {
+ if ((file->u.rdev & ~0xFF) == rdev_high)
+ flags |= XMIT_SAME_HIGH_RDEV;
+ else {
+ rdev = file->u.rdev;
+ rdev_high = rdev & ~0xFF;
}
- else
- rdev = file->rdev;
- }
- else if (IS_DEVICE(mode)) {
- if ((file->rdev & ~0xFF) == rdev)
- flags |= SAME_HIGH_RDEV;
- else
- rdev = file->rdev & ~0xFF;
}
}
if (file->uid == uid)
- flags |= SAME_UID;
+ flags |= XMIT_SAME_UID;
else
uid = file->uid;
if (file->gid == gid)
- flags |= SAME_GID;
+ flags |= XMIT_SAME_GID;
else
gid = file->gid;
if (file->modtime == modtime)
- flags |= SAME_TIME;
+ flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
- if (file->flags & HAS_INODE_DATA) {
- if (file->dev == dev) {
+#if SUPPORT_HARD_LINKS
+ if (file->link_u.idev) {
+ if (file->F_DEV == dev) {
if (protocol_version >= 28)
- flags |= SAME_DEV;
- }
- else
- dev = file->dev;
- flags |= HAS_INODE_DATA;
+ flags |= XMIT_SAME_DEV;
+ } else
+ dev = file->F_DEV;
+ flags |= XMIT_HAS_IDEV_DATA;
}
+#endif
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;
+ flags |= XMIT_SAME_NAME;
if (l2 > 255)
- flags |= LONG_NAME;
+ flags |= XMIT_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(mode))
- flags |= FLAG_DELETE; /* NOTE: no meaning for non-dir */
+ /* We must make sure we don't send a zero flag byte or the
+ * other end will terminate the flist transfer. Note that
+ * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
+ * it's harmless way to add a bit to the first flag byte. */
if (protocol_version >= 28) {
- if ((flags & 0xFF00) || flags == 0) {
- flags |= EXTENDED_FLAGS;
+ if (!flags && !S_ISDIR(mode))
+ flags |= XMIT_TOP_DIR;
+ if ((flags & 0xFF00) || !flags) {
+ flags |= XMIT_EXTENDED_FLAGS;
write_byte(f, flags);
write_byte(f, flags >> 8);
} else
write_byte(f, flags);
} else {
- if (flags == 0)
- flags |= LONG_NAME;
+ if (!(flags & 0xFF) && !S_ISDIR(mode))
+ flags |= XMIT_TOP_DIR;
+ if (!(flags & 0xFF))
+ flags |= XMIT_LONG_NAME;
write_byte(f, flags);
}
- if (flags & SAME_NAME)
+ if (flags & XMIT_SAME_NAME)
write_byte(f, l1);
- if (flags & LONG_NAME)
+ if (flags & XMIT_LONG_NAME)
write_int(f, l2);
else
write_byte(f, l2);
write_buf(f, fname + l1, l2);
write_longint(f, file->length);
- if (!(flags & SAME_TIME))
+ if (!(flags & XMIT_SAME_TIME))
write_int(f, modtime);
- if (!(flags & SAME_MODE))
+ if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
- if (preserve_uid && !(flags & SAME_UID)) {
+ if (preserve_uid && !(flags & XMIT_SAME_UID)) {
add_uid(uid);
write_int(f, uid);
}
- if (preserve_gid && !(flags & SAME_GID)) {
+ if (preserve_gid && !(flags & XMIT_SAME_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->rdev);
+ /* If XMIT_SAME_HIGH_RDEV is off, XMIT_SAME_RDEV_pre28 is
+ * also off. */
+ if (!(flags & XMIT_SAME_HIGH_RDEV))
+ write_int(f, rdev);
else if (protocol_version >= 28)
- write_byte(f, file->rdev);
+ write_byte(f, rdev);
}
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
- write_int(f, strlen(file->link));
- write_buf(f, file->link, strlen(file->link));
+ int len = strlen(file->u.link);
+ write_int(f, len);
+ write_buf(f, file->u.link, len);
}
#endif
#if SUPPORT_HARD_LINKS
- if (flags & HAS_INODE_DATA) {
+ if (flags & XMIT_HAS_IDEV_DATA) {
if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
write_int(f, dev);
- write_int(f, file->inode);
+ write_int(f, file->F_INODE);
} else {
/* 64-bit dev_t and ino_t */
- if (!(flags & SAME_DEV))
+ if (!(flags & XMIT_SAME_DEV))
write_longint(f, dev);
- write_longint(f, file->inode);
+ write_longint(f, file->F_INODE);
}
}
#endif
- if (always_checksum && (protocol_version < 28 || S_ISREG(mode))) {
- char *sum = file->sum? file->sum : empty_sum;
- write_buf(f, sum, protocol_version < 21? 2
- : MD4_SUM_LENGTH);
+ if (always_checksum) {
+ 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);
+ }
}
strlcpy(lastname, fname, MAXPATHLEN);
- lastname[MAXPATHLEN - 1] = 0;
io_write_phase = "unknown";
}
{
static time_t modtime;
static mode_t mode;
- static DEV64_T rdev; /* just high bytes in p28 onward */
+ static DEV64_T rdev, rdev_high;
static DEV64_T dev;
static uid_t uid;
static gid_t gid;
if (!fptr) {
modtime = 0, mode = 0;
- rdev = 0, dev = 0;
+ rdev = 0, rdev_high = 0, dev = 0;
uid = 0, gid = 0;
*lastname = '\0';
return;
}
- if (flags & SAME_NAME)
+ if (flags & XMIT_SAME_NAME)
l1 = read_byte(f);
- if (flags & LONG_NAME)
+ if (flags & XMIT_LONG_NAME)
l2 = read_int(f);
else
l2 = read_byte(f);
thisname[l1 + l2] = 0;
strlcpy(lastname, thisname, MAXPATHLEN);
- lastname[MAXPATHLEN - 1] = 0;
clean_fname(thisname);
- if (sanitize_paths) {
+ if (sanitize_paths)
sanitize_path(thisname, NULL);
- }
if ((p = strrchr(thisname, '/'))) {
static char *lastdir;
if (!file->basename)
out_of_memory("receive_file_entry 1");
- file->flags = flags;
+ file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
file->length = read_longint(f);
- if (!(flags & SAME_TIME))
+ if (!(flags & XMIT_SAME_TIME))
modtime = (time_t)read_int(f);
file->modtime = modtime;
- if (!(flags & SAME_MODE))
+ if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
file->mode = mode;
if (preserve_uid) {
- if (!(flags & SAME_UID))
+ if (!(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
file->uid = uid;
}
if (preserve_gid) {
- if (!(flags & SAME_GID))
+ if (!(flags & XMIT_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))
+ if (!(flags & XMIT_SAME_RDEV_pre28))
rdev = (DEV64_T)read_int(f);
- file->rdev = rdev;
+ file->u.rdev = rdev;
} else
rdev = 0;
} else if (IS_DEVICE(mode)) {
- if (!(flags & SAME_HIGH_RDEV)) {
- file->rdev = (DEV64_T)read_int(f);
- rdev = file->rdev & ~0xFF;
+ if (!(flags & XMIT_SAME_HIGH_RDEV)) {
+ rdev = (DEV64_T)read_int(f);
+ rdev_high = rdev & ~0xFF;
} else
- file->rdev = rdev | (DEV64_T)read_byte(f);
+ rdev = rdev_high | (DEV64_T)read_byte(f);
+ file->u.rdev = rdev;
}
}
+#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(mode)) {
- int l = read_int(f);
- if (l < 0) {
- rprintf(FERROR, "overflow: l=%d\n", l);
+ int len = read_int(f);
+ if (len < 0 || len >= MAXPATHLEN) {
+ rprintf(FERROR, "overflow: len=%d\n", len);
overflow("receive_file_entry");
}
- file->link = new_array(char, l + 1);
- if (!file->link)
+ if (!(file->u.link = new_array(char, len + 1)))
out_of_memory("receive_file_entry 2");
- read_sbuf(f, file->link, l);
+ read_sbuf(f, file->u.link, len);
if (sanitize_paths)
- sanitize_path(file->link, file->dirname);
+ sanitize_path(file->u.link, file->dirname);
}
+#endif
+
#if SUPPORT_HARD_LINKS
- if (preserve_hard_links && protocol_version < 28
- && S_ISREG(mode))
- file->flags |= HAS_INODE_DATA;
- if (file->flags & HAS_INODE_DATA) {
+ if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
+ flags |= XMIT_HAS_IDEV_DATA;
+ if (flags & XMIT_HAS_IDEV_DATA) {
+ if (!(file->link_u.idev = new(struct idev)))
+ out_of_memory("file inode data");
if (protocol_version < 26) {
dev = read_int(f);
- file->inode = read_int(f);
+ file->F_INODE = read_int(f);
} else {
- if (!(flags & SAME_DEV))
+ if (!(flags & XMIT_SAME_DEV))
dev = read_longint(f);
- file->inode = read_longint(f);
+ file->F_INODE = read_longint(f);
}
- file->dev = dev;
+ file->F_DEV = dev;
}
#endif
if (always_checksum) {
char *sum;
if (S_ISREG(mode)) {
- sum = file->sum = new_array(char, MD4_SUM_LENGTH);
+ sum = file->u.sum = new_array(char, MD4_SUM_LENGTH);
if (!sum)
out_of_memory("md4 sum");
} else if (protocol_version < 28) {
}
-/* determine if a file in a different filesstem 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)
-{
- STRUCT_STAT st2;
- char *p = strrchr(fname, '/');
-
- /* skip all but directories */
- if (!S_ISDIR(st->st_mode))
- return 1;
-
- /* if its not a subdirectory then allow */
- if (!p)
- return 0;
-
- *p = 0;
- if (link_stat(fname, &st2)) {
- *p = '/';
- return 0;
- }
- *p = '/';
-
- return (st2.st_dev != filesystem_dev);
-}
-
#define STRDUP(ap, p) (ap ? string_area_strdup(ap, p) : strdup(p))
/* IRIX cc cares that the operands to the ternary have the same type. */
#define MALLOC(ap, i) (ap ? (void*) string_area_malloc(ap, i) : malloc(i))
STRUCT_STAT st;
char sum[SUM_LENGTH];
char *p;
- char cleaned_name[MAXPATHLEN];
- char linkbuf[MAXPATHLEN];
- extern int module_id;
+ char thisname[MAXPATHLEN];
+ char linkname[MAXPATHLEN];
+ unsigned short flags = 0;
- strlcpy(cleaned_name, fname, MAXPATHLEN);
- cleaned_name[MAXPATHLEN - 1] = 0;
- clean_fname(cleaned_name);
+ if (strlcpy(thisname, fname, sizeof thisname)
+ >= sizeof thisname - flist_dir_len) {
+ rprintf(FINFO, "skipping overly long name: %s\n", fname);
+ return NULL;
+ }
+ clean_fname(thisname);
if (sanitize_paths)
- sanitize_path(cleaned_name, NULL);
- fname = cleaned_name;
+ sanitize_path(thisname, NULL);
memset(sum, 0, SUM_LENGTH);
- if (readlink_stat(fname, &st, linkbuf) != 0) {
+ if (readlink_stat(thisname, &st, linkname) != 0) {
int save_errno = errno;
if (errno == ENOENT && exclude_level != NO_EXCLUDES) {
/* either symlink pointing nowhere or file that
* was removed during rsync run; see if excluded
* before reporting an error */
- if (check_exclude_file(fname, 0, exclude_level)) {
+ if (check_exclude_file(thisname, 0, exclude_level)) {
/* file is excluded anyway, ignore silently */
return NULL;
}
}
io_error |= IOERR_GENERAL;
rprintf(FERROR, "readlink %s failed: %s\n",
- full_fname(fname), strerror(save_errno));
+ full_fname(thisname), strerror(save_errno));
return NULL;
}
goto skip_excludes;
if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
- rprintf(FINFO, "skipping directory %s\n", fname);
+ rprintf(FINFO, "skipping directory %s\n", thisname);
return NULL;
}
if (one_file_system && st.st_dev != filesystem_dev) {
- if (skip_filesystem(fname, &st))
+ /* We allow a directory though to preserve the mount point.
+ * However, flag it so that we don't recurse. */
+ if (!S_ISDIR(st.st_mode))
return NULL;
+ flags |= FLAG_MOUNT_POINT;
}
- if (check_exclude_file(fname, S_ISDIR(st.st_mode) != 0, exclude_level))
+ if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
return NULL;
- if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0)
+ if (lp_ignore_nonreadable(module_id) && access(thisname, R_OK) != 0)
return NULL;
skip_excludes:
- if (verbose > 2)
- rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level);
+ if (verbose > 2) {
+ rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
+ who_am_i(), thisname, exclude_level);
+ }
file = new(struct file_struct);
if (!file)
out_of_memory("make_file");
memset((char *) file, 0, sizeof(*file));
+ file->flags = flags;
- if ((p = strrchr(fname, '/'))) {
+ if ((p = strrchr(thisname, '/'))) {
static char *lastdir;
*p = 0;
- if (lastdir && strcmp(fname, lastdir) == 0)
+ if (lastdir && strcmp(thisname, lastdir) == 0)
file->dirname = lastdir;
else {
- file->dirname = strdup(fname);
+ file->dirname = strdup(thisname);
lastdir = file->dirname;
}
file->basename = STRDUP(ap, p + 1);
*p = '/';
} else {
file->dirname = NULL;
- file->basename = STRDUP(ap, fname);
+ file->basename = STRDUP(ap, thisname);
}
file->modtime = st.st_mtime;
file->mode = st.st_mode;
file->uid = st.st_uid;
file->gid = st.st_gid;
- if (preserve_hard_links) {
- if (protocol_version < 28? S_ISREG(st.st_mode)
- : !S_ISDIR(st.st_mode) && st.st_nlink > 1) {
- file->dev = st.st_dev;
- file->inode = st.st_ino;
- file->flags |= HAS_INODE_DATA;
- }
- }
+
#ifdef HAVE_STRUCT_STAT_ST_RDEV
- file->rdev = st.st_rdev;
+ if (preserve_devices && 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);
+ file->u.link = STRDUP(ap, linkname);
+#endif
+
+#if SUPPORT_HARD_LINKS
+ 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;
+ }
+ }
#endif
if (always_checksum && S_ISREG(st.st_mode)) {
- file->sum = (char*)MALLOC(ap, MD4_SUM_LENGTH);
- if (!file->sum)
+ if (!(file->u.sum = (char*)MALLOC(ap, MD4_SUM_LENGTH)))
out_of_memory("md4 sum");
- file_checksum(fname, file->sum, st.st_size);
+ file_checksum(thisname, 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;
flist_expand(flist);
if (write_batch)
- file->flags |= FLAG_DELETE;
+ file->flags |= FLAG_TOP_DIR;
if (file->basename[0]) {
flist->files[flist->count++] = file;
send_file_entry(file, f, base_flags);
}
- if (S_ISDIR(file->mode) && recursive) {
- struct exclude_struct **last_exclude_list =
- local_exclude_list;
- send_directory(f, flist, f_name_to(file, fbuf, sizeof fbuf));
+ if (recursive && S_ISDIR(file->mode)
+ && !(file->flags & FLAG_MOUNT_POINT)) {
+ struct exclude_struct **last_exclude_list = local_exclude_list;
+ send_directory(f, flist, f_name_to(file, fbuf));
local_exclude_list = last_exclude_list;
return;
}
DIR *d;
struct dirent *di;
char fname[MAXPATHLEN];
- int l;
+ unsigned int offset;
char *p;
d = opendir(dir);
return;
}
- strlcpy(fname, dir, MAXPATHLEN);
- l = strlen(fname);
- if (fname[l - 1] != '/') {
- if (l == MAXPATHLEN - 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 {
+ 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",
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 |= 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;
if (f != -1) {
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';
}
}
}
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) {
+ 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 {
+ flist_dir = lastdir = strdup(dir);
+ flist_dir_len = lastdir_len = strlen(dir);
+ }
}
if (one_file_system)
set_filesystem(fname);
- send_file_name(f, flist, fname, recurse, FLAG_DELETE);
+ send_file_name(f, flist, fname, recurse, XMIT_TOP_DIR);
- 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)
+ 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)
+ 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;
flist_expand(flist);
- if (protocol_version >= 28 && (flags & EXTENDED_FLAGS))
+ if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
flags |= read_byte(f) << 8;
receive_file_entry(&flist->files[i], flags, f);
if (verbose > 2)
rprintf(FINFO, "received %d names\n", flist->count);
- clean_flist(flist, relative_paths, 1);
-
if (show_filelist_p())
finish_filelist_progress(flist);
- /* now recv the uid/gid list. This was introduced in protocol version 15 */
- if (f != -1)
+ 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) {
list_file_entry(flist->files[i]);
}
-
if (verbose > 2)
rprintf(FINFO, "recv_file_list done\n");
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.sum)
+ free(file->u.sum); /* Handles u.link too. */
+#if SUPPORT_HARD_LINKS
+ if (file->link_u.idev)
+ free((char*)file->link_u.idev); /* Handles link_u.links too. */
+#endif
*file = null_file;
}
/* Make sure that if we unduplicate '.', that we don't
* lose track of a user-specified starting point (or
* else deletions will mysteriously fail with -R). */
- if (flist->files[i]->flags & FLAG_DELETE)
- flist->files[prev_i]->flags |= FLAG_DELETE;
+ if (flist->files[i]->flags & FLAG_TOP_DIR)
+ flist->files[prev_i]->flags |= FLAG_TOP_DIR;
/* it's not great that the flist knows the semantics of
* the file memory usage, but i'd rather not add a flag
* byte to that struct.
flist->files[i][0] = null_file;
else
free_file(flist->files[i]);
- }
- else
+ } else
prev_i = i;
}
return;
for (i = 0; i < flist->count; i++) {
- rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n",
- (long) getpid(), i,
+ rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f\n",
+ who_am_i(), i,
+ NS(flist->files[i]->basedir),
NS(flist->files[i]->dirname),
NS(flist->files[i]->basename),
(int) flist->files[i]->mode,
if (!(c1 = (uchar*)f1->dirname)) {
state1 = fnc_BASE;
c1 = (uchar*)f1->basename;
- }
- else
+ } else
state1 = fnc_DIR;
if (!(c2 = (uchar*)f2->dirname)) {
state2 = fnc_BASE;
c2 = (uchar*)f2->basename;
- }
- else
+ } else
state2 = fnc_DIR;
while (1) {
/* Return a copy of the full filename of a flist entry, using the indicated
- * buffer.
+ * 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, int bsize)
+char *f_name_to(struct file_struct *f, char *fbuf)
{
if (!f || !f->basename)
return NULL;
if (f->dirname) {
- int off = strlcpy(fbuf, f->dirname, bsize);
- off += strlcpy(fbuf + off, "/", bsize - off);
- strlcpy(fbuf + off, f->basename, bsize - off);
+ int len = strlen(f->dirname);
+ memcpy(fbuf, f->dirname, len);
+ fbuf[len] = '/';
+ strcpy(fbuf + len + 1, f->basename);
} else
- strlcpy(fbuf, f->basename, bsize);
+ strcpy(fbuf, f->basename);
return fbuf;
}
n = (n + 1) % (sizeof names / sizeof names[0]);
- return f_name_to(f, names[n], sizeof names[0]);
+ return f_name_to(f, names[n]);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff