rflush(FINFO);
}
+
static void emit_filelist_progress(const struct file_list *flist)
{
rprintf(FINFO, " %d files...\r", flist->count);
}
+static void maybe_emit_filelist_progress(const struct file_list *flist)
+{
+ if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
+ emit_filelist_progress(flist);
+}
+
+
static void finish_filelist_progress(const struct file_list *flist)
{
if (do_progress) {
/* This overwrites the progress line */
- rprintf(FINFO, "%d files to consider\n", flist->count);
- } else
+ rprintf(FINFO, "%d file%sto consider\n",
+ flist->count, flist->count == 1 ? " " : "s ");
+ } else {
rprintf(FINFO, "done\n");
+ }
}
-
void show_flist_stats(void)
{
/* Nothing yet */
}
-int readlink_stat(const char *Path, STRUCT_STAT * Buffer, char *Linkbuf)
+/**
+ * Stat either a symlink or its referent, depending on the settings of
+ * copy_links, copy_unsafe_links, etc.
+ *
+ * @retval -1 on error
+ *
+ * @retval 0 for success
+ *
+ * @post If @p path is a symlink, then @p linkbuf (of size @c
+ * MAXPATHLEN) contains the symlink target.
+ *
+ * @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)
{
#if SUPPORT_LINKS
if (copy_links) {
- return do_stat(Path, Buffer);
+ 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)) {
+ if (S_ISLNK(buffer->st_mode)) {
int l;
- if ((l =
- readlink((char *) Path, Linkbuf,
- MAXPATHLEN - 1)) == -1) {
+ l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
+ if (l == -1)
return -1;
- }
- Linkbuf[l] = 0;
+ linkbuf[l] = 0;
if (copy_unsafe_links && (topsrcname[0] != '\0') &&
- unsafe_symlink(Linkbuf, topsrcname)) {
- return do_stat(Path, Buffer);
+ unsafe_symlink(linkbuf, topsrcname)) {
+ return do_stat(path, buffer);
}
}
return 0;
#else
- return do_stat(Path, Buffer);
+ return do_stat(path, buffer);
#endif
}
-int link_stat(const char *Path, STRUCT_STAT * Buffer)
+int link_stat(const char *path, STRUCT_STAT * buffer)
{
#if SUPPORT_LINKS
if (copy_links) {
- return do_stat(Path, Buffer);
+ return do_stat(path, buffer);
} else {
- return do_lstat(Path, Buffer);
+ return do_lstat(path, buffer);
}
#else
- return do_stat(Path, Buffer);
+ return do_stat(path, buffer);
#endif
}
new_bytes = sizeof(flist->files[0]) * flist->malloced;
- new_ptr = realloc(flist->files, new_bytes);
+ if (flist->files)
+ new_ptr = realloc(flist->files, new_bytes);
+ else
+ new_ptr = malloc(new_bytes);
if (verbose >= 2) {
rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
return;
}
+ io_write_phase = "send_file_entry";
+
fname = f_name(file);
flags = base_flags;
strlcpy(lastname, fname, MAXPATHLEN);
lastname[MAXPATHLEN - 1] = 0;
+
+ io_write_phase = "unknown";
}
(flags & SAME_GID) ? last_gid : (gid_t) read_int(f);
if (preserve_devices && IS_DEVICE(file->mode))
file->rdev =
- (flags & SAME_RDEV) ? last_rdev : (dev_t) read_int(f);
+ (flags & SAME_RDEV) ? last_rdev : (DEV64_T) read_int(f);
if (preserve_links && S_ISLNK(file->mode)) {
int l = read_int(f);
/* 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))
-/* create a file_struct for a named file */
+/**
+ * Create a file_struct for a named file by reading its stat()
+ * information and performing extensive checks against global
+ * options.
+ *
+ * @return the new file, or NULL if there was an error or this file
+ * should be excluded.
+ *
+ * @todo There is a small optimization opportunity here to avoid
+ * stat()ing the file in some circumstances, which has a certain cost.
+ * We are called immediately after doing readdir(), and so we may
+ * already know the d_type of the file. We could for example avoid
+ * 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(int f, char *fname, struct string_area **ap,
int noexcludes)
{
if (readlink_stat(fname, &st, linkbuf) != 0) {
int save_errno = errno;
- if ((errno == ENOENT) && copy_links && !noexcludes) {
- /* symlink pointing nowhere, see if excluded */
+ if ((errno == ENOENT) && !noexcludes) {
+ /* either symlink pointing nowhere or file that
+ * was removed during rsync run; see if excluded
+ * before reporting an error */
memset((char *) &st, 0, sizeof(st));
if (check_exclude_file(f, fname, &st)) {
/* file is excluded anyway, ignore silently */
if (!file)
return;
- if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
- emit_filelist_progress(flist);
+ maybe_emit_filelist_progress(flist);
flist_expand(flist);
}
-/*
+/**
*
- * I *think* f==-1 means that the list should just be built in memory
- * and not transmitted. But who can tell? -- mbp
- */
+ * I <b>think</b> f==-1 means that the list should just be built in
+ * memory and not transmitted. But who can tell? -- mbp
+ **/
struct file_list *send_file_list(int f, int argc, char *argv[])
{
int i, l;
send_file_entry(NULL, f, 0);
}
- if (show_filelist_p())
+ if (show_filelist_p() && f != -1) {
finish_filelist_progress(flist);
+ }
clean_flist(flist, 0);
flist->count++;
- if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
- emit_filelist_progress(flist);
+ maybe_emit_filelist_progress(flist);
if (verbose > 2)
rprintf(FINFO, "recv_file_name(%s)\n",
{
int low = 0, high = flist->count - 1;
- if (flist->count <= 0)
+ while (high >= 0 && !flist->files[high]->basename) high--;
+
+ if (high < 0)
return -1;
while (low != high) {
/*
* allocate a new file list
*/
-struct file_list *flist_new()
+struct file_list *flist_new(void)
{
struct file_list *flist;