X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bd9e9eccbd2a43de6fca84cbb8edae497b0884db..32f761755e2cfee243a1513c9ea9871586463fa6:/flist.c diff --git a/flist.c b/flist.c index 3d0ff535..77f2995c 100644 --- a/flist.c +++ b/flist.c @@ -196,47 +196,52 @@ static void list_file_entry(struct file_struct *f) * Stat either a symlink or its referent, depending on the settings of * copy_links, copy_unsafe_links, etc. * - * @return -1 on error; or 0. If a symlink, then @p Linkbuf (of size + * @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) +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 } @@ -349,6 +354,8 @@ static void send_file_entry(struct file_struct *file, int f, return; } + io_write_phase = "send_file_entry"; + fname = f_name(file); flags = base_flags; @@ -444,6 +451,8 @@ static void send_file_entry(struct file_struct *file, int f, strlcpy(lastname, fname, MAXPATHLEN); lastname[MAXPATHLEN - 1] = 0; + + io_write_phase = "unknown"; } @@ -858,11 +867,11 @@ static void send_directory(int f, struct file_list *flist, char *dir) } -/* +/** * - * I *think* f==-1 means that the list should just be built in memory - * and not transmitted. But who can tell? -- mbp - */ + * I think 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;