X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f227ffe4b9d7decb5e59e7c1b0c7168ec9c671a6..13710874ce907cd9405f83814cbebbe73f884e2e:/rsync.c diff --git a/rsync.c b/rsync.c index e23f1ab4..731528fe 100644 --- a/rsync.c +++ b/rsync.c @@ -1,187 +1,407 @@ /* - Copyright (C) Andrew Tridgell 1996 - Copyright (C) Paul Mackerras 1996 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -/* this file contains code used by more than one part of the rsync - process */ + * Routines common to more than one of the rsync processes. + * + * Copyright (C) 1996 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2003-2007 Wayne Davison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, visit the http://fsf.org website. + */ #include "rsync.h" +#include "ifuncs.h" +#if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET +#include +#elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO +#include +#endif extern int verbose; extern int dry_run; +extern int preserve_acls; +extern int preserve_xattrs; +extern int preserve_perms; +extern int preserve_executability; extern int preserve_times; extern int am_root; +extern int am_server; extern int am_sender; extern int am_generator; -extern int preserve_uid; -extern int preserve_gid; -extern int force_delete; -extern int recurse; +extern int am_starting_up; +extern int allow_8bit_chars; +extern int protocol_version; +extern int uid_ndx; +extern int gid_ndx; +extern int inc_recurse; +extern int inplace; +extern int flist_eof; extern int keep_dirlinks; extern int make_backups; -extern char *backup_dir; -extern int inplace; +extern struct file_list *cur_flist, *first_flist, *dir_flist; +extern struct chmod_mode_struct *daemon_chmod_modes; +#ifdef ICONV_OPTION +extern char *iconv_opt; +#endif +#ifdef ICONV_CONST +iconv_t ic_chck = (iconv_t)-1; +# ifdef ICONV_OPTION +iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1; +# endif -/* - free a sums struct - */ -void free_sums(struct sum_struct *s) +static const char *default_charset(void) { - if (s->sums) free(s->sums); - free(s); +# if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET + return locale_charset(); +# elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO + return nl_langinfo(CODESET); +# else + return ""; /* Works with (at the very least) gnu iconv... */ +# endif } - -/* - * delete a file or directory. If force_delete is set then delete - * recursively - */ -int delete_file(char *fname, int flags) +void setup_iconv(void) { - DIR *d; - struct dirent *di; - char buf[MAXPATHLEN]; - STRUCT_STAT st; - - if (!(flags & DEL_DIR)) { - if (robust_unlink(fname) == 0) { - if (verbose && !(flags & DEL_TERSE)) { - rprintf(FINFO, "deleting %s\n", - safe_fname(fname)); + const char *defset = default_charset(); +# ifdef ICONV_OPTION + const char *charset; + char *cp; +# endif + + if (!am_server && !allow_8bit_chars) { + + /* It's OK if this fails... */ + ic_chck = iconv_open(defset, defset); + + if (verbose > 3) { + if (ic_chck == (iconv_t)-1) { + rprintf(FINFO, + "note: iconv_open(\"%s\", \"%s\") failed (%d)" + " -- using isprint() instead of iconv().\n", + defset, defset, errno); + } else { + rprintf(FINFO, + "note: iconv_open(\"%s\", \"%s\") succeeded.\n", + defset, defset); } - return 0; } - if (errno == ENOENT) - return 0; - rsyserr(FERROR, errno, "delete_file: unlink %s failed", - full_fname(fname)); - return -1; } - if (do_rmdir(fname) == 0) { - if (verbose && !(flags & DEL_TERSE)) { - rprintf(FINFO, "deleting %s/\n", - safe_fname(fname)); - } - return 0; +# ifdef ICONV_OPTION + if (!iconv_opt) + return; + + if ((cp = strchr(iconv_opt, ',')) != NULL) { + if (am_server) /* A local transfer needs this. */ + iconv_opt = cp + 1; + else + *cp = '\0'; } - if (errno == ENOENT) - return 0; - if ((flags & DEL_NO_RECURSE) || !force_delete || !recurse - || (errno != ENOTEMPTY && errno != EEXIST)) { - rsyserr(FERROR, errno, "delete_file: rmdir %s failed", - full_fname(fname)); - return -1; + + if (!*iconv_opt || (*iconv_opt == '.' && iconv_opt[1] == '\0')) + charset = defset; + else + charset = iconv_opt; + + if ((ic_send = iconv_open(UTF8_CHARSET, charset)) == (iconv_t)-1) { + rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n", + UTF8_CHARSET, charset); + exit_cleanup(RERR_UNSUPPORTED); } - /* now we do a recsursive delete on the directory ... */ - if (!(d = opendir(fname))) { - rsyserr(FERROR, errno, "delete_file: opendir %s failed", - full_fname(fname)); - return -1; + if ((ic_recv = iconv_open(charset, UTF8_CHARSET)) == (iconv_t)-1) { + rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n", + charset, UTF8_CHARSET); + exit_cleanup(RERR_UNSUPPORTED); } - if (!(flags & DEL_TERSE)) { - if (verbose) - rprintf(FINFO, "deleting %s/\n", safe_fname(fname)); - flags |= DEL_TERSE; + if (verbose > 1) { + rprintf(FINFO, "%s charset: %s\n", + am_server ? "server" : "client", + *charset ? charset : "[LOCALE]"); } +# endif +} - for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { - char *dname = d_name(di); - if (dname[0] == '.' && (dname[1] == '\0' - || (dname[1] == '.' && dname[2] == '\0'))) - continue; - pathjoin(buf, sizeof buf, fname, dname); +# ifdef ICONV_OPTION + +/* This function converts the characters in the "in" xbuf into characters + * in the "out" xbuf. The "len" of the "in" xbuf is used starting from its + * "pos". The "size" of the "out" xbuf restricts how many characters can be + * stored, starting at its "pos+len" position. Note that the last byte of + * the buffer is never used, which reserves space for a terminating '\0'. + * We return a 0 on success or a -1 on error. An error also sets errno to + * E2BIG, EILSEQ, or EINVAL (see below); otherwise errno will be set to 0. + * The "in" xbuf is altered to update "pos" and "len". The "out" xbuf has + * data appended, and its "len" incremented. If ICB_EXPAND_OUT is set in + * "flags", the "out" xbuf will also be allocated if empty, and expanded if + * too small (so E2BIG will not be returned). If ICB_INCLUDE_BAD is set in + * "flags", any badly-encoded chars are included verbatim in the "out" xbuf, + * so EILSEQ will not be returned. Likewise for ICB_INCLUDE_INCOMPLETE with + * respect to an incomplete multi-byte char at the end, which ensures that + * EINVAL is not returned. Anytime "in.pos" is 0 we will reset the iconv() + * state prior to processing the characters. */ +int iconvbufs(iconv_t ic, xbuf *in, xbuf *out, int flags) +{ + ICONV_CONST char *ibuf; + size_t icnt, ocnt; + char *obuf; + + if (!out->size && flags & ICB_EXPAND_OUT) + alloc_xbuf(out, 1024); + + if (!in->pos) + iconv(ic, NULL, 0, NULL, 0); + + ibuf = in->buf + in->pos; + icnt = in->len; + + obuf = out->buf + (out->pos + out->len); + ocnt = out->size - (out->pos + out->len) - 1; + + while (icnt) { + while (iconv(ic, &ibuf, &icnt, &obuf, &ocnt) == (size_t)-1) { + if (errno == EINTR) + continue; + if (errno == EINVAL) { + if (!(flags & ICB_INCLUDE_INCOMPLETE)) + goto finish; + } else if (errno == EILSEQ) { + if (!(flags & ICB_INCLUDE_BAD)) + goto finish; + } else { + size_t opos = obuf - out->buf; + if (!(flags & ICB_EXPAND_OUT)) { + errno = E2BIG; + goto finish; + } + realloc_xbuf(out, out->size + 1024); + obuf = out->buf + opos; + ocnt += 1024; + continue; + } + *obuf++ = *ibuf++; + ocnt--, icnt--; + } + } - if (do_lstat(buf, &st) < 0) + errno = 0; + + finish: + in->len = icnt; + in->pos = ibuf - in->buf; + out->len = obuf - out->buf - out->pos; + + return errno ? -1 : 0; +} +# endif +#endif + +int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr, + char *buf, int *len_ptr) +{ + int len, iflags = 0; + struct file_list *flist; + uchar fnamecmp_type = FNAMECMP_FNAME; + int ndx; + + read_loop: + while (1) { + ndx = read_ndx(f_in); + + if (ndx >= 0) + break; + if (ndx == NDX_DONE) + return ndx; + if (!inc_recurse || am_sender) + goto invalid_ndx; + if (ndx == NDX_FLIST_EOF) { + flist_eof = 1; + send_msg(MSG_FLIST_EOF, "", 0, 0); continue; - if (S_ISDIR(st.st_mode)) - flags |= DEL_DIR; - else - flags &= ~DEL_DIR; - - if (verbose) - rprintf(FINFO, "deleting %s%s\n", safe_fname(buf), - flags & DEL_DIR ? "/" : ""); - if (delete_file(buf, flags) != 0) { - closedir(d); - return -1; } - } - if (errno) { - rsyserr(FERROR, errno, "delete_file: readdir %s failed", - full_fname(fname)); - closedir(d); - return -1; + ndx = NDX_FLIST_OFFSET - ndx; + if (ndx < 0 || ndx >= dir_flist->used) { + ndx = NDX_FLIST_OFFSET - ndx; + rprintf(FERROR, + "[%s] Invalid dir index: %d (%d - %d)\n", + who_am_i(), ndx, NDX_FLIST_OFFSET, + NDX_FLIST_OFFSET - dir_flist->used + 1); + exit_cleanup(RERR_PROTOCOL); + } + + /* Send everything read from f_in to msg_fd_out. */ + send_msg_int(MSG_FLIST, ndx); + start_flist_forward(f_in); + if (verbose > 3) { + rprintf(FINFO, "[%s] receiving flist for dir %d\n", + who_am_i(), ndx); + } + flist = recv_file_list(f_in); + flist->parent_ndx = ndx; + stop_flist_forward(); } - closedir(d); + iflags = protocol_version >= 29 ? read_shortint(f_in) + : ITEM_TRANSFER | ITEM_MISSING_DATA; - if (do_rmdir(fname) != 0 && errno != ENOENT) { - rsyserr(FERROR, errno, "delete_file: rmdir %s failed", - full_fname(fname)); - return -1; + /* Honor the old-style keep-alive indicator. */ + if (protocol_version < 30 + && ndx == cur_flist->used && iflags == ITEM_IS_NEW) { + if (am_sender) + maybe_send_keepalive(); + goto read_loop; } - return 0; + if (!(flist = flist_for_ndx(ndx))) { + invalid_ndx: + rprintf(FERROR, + "Invalid file index: %d (%d - %d) with iflags %x [%s]\n", + ndx, first_flist->ndx_start - 1, first_flist->prev->ndx_end, + iflags, who_am_i()); + exit_cleanup(RERR_PROTOCOL); + } + cur_flist = flist; + + if (iflags & ITEM_BASIS_TYPE_FOLLOWS) + fnamecmp_type = read_byte(f_in); + *type_ptr = fnamecmp_type; + + if (iflags & ITEM_XNAME_FOLLOWS) { + if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0) + exit_cleanup(RERR_PROTOCOL); + } else { + *buf = '\0'; + len = -1; + } + *len_ptr = len; + + if (iflags & ITEM_TRANSFER) { + int i = ndx - cur_flist->ndx_start; + if (i < 0 || !S_ISREG(cur_flist->files[i]->mode)) { + rprintf(FERROR, + "received request to transfer non-regular file: %d [%s]\n", + ndx, who_am_i()); + exit_cleanup(RERR_PROTOCOL); + } + } + + *iflag_ptr = iflags; + return ndx; +} + +/* + free a sums struct + */ +void free_sums(struct sum_struct *s) +{ + if (s->sums) free(s->sums); + free(s); } -int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, - int flags) +/* This is only called when we aren't preserving permissions. Figure out what + * the permissions should be and return them merged back into the mode. */ +mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms, + int exists) +{ + int new_mode; + /* If the file already exists, we'll return the local permissions, + * possibly tweaked by the --executability option. */ + if (exists) { + new_mode = (flist_mode & ~CHMOD_BITS) | (stat_mode & CHMOD_BITS); + if (preserve_executability && S_ISREG(flist_mode)) { + /* If the source file is executable, grant execute + * rights to everyone who can read, but ONLY if the + * file isn't already executable. */ + if (!(flist_mode & 0111)) + new_mode &= ~0111; + else if (!(stat_mode & 0111)) + new_mode |= (new_mode & 0444) >> 2; + } + } else { + /* Apply destination default permissions and turn + * off special permissions. */ + new_mode = flist_mode & (~CHMOD_BITS | dflt_perms); + } + return new_mode; +} + +int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, + const char *fnamecmp, int flags) { int updated = 0; - STRUCT_STAT st2; + stat_x sx2; int change_uid, change_gid; + mode_t new_mode = file->mode; + int inherit; - if (!st) { + if (!sxp) { if (dry_run) return 1; - if (link_stat(fname, &st2, 0) < 0) { + if (link_stat(fname, &sx2.st, 0) < 0) { rsyserr(FERROR, errno, "stat %s failed", full_fname(fname)); return 0; } - st = &st2; +#ifdef SUPPORT_ACLS + sx2.acc_acl = sx2.def_acl = NULL; +#endif +#ifdef SUPPORT_XATTRS + sx2.xattr = NULL; +#endif + sxp = &sx2; + inherit = !preserve_perms; + } else + inherit = !preserve_perms && file->flags & FLAG_DIR_CREATED; + + if (inherit && S_ISDIR(new_mode) && sxp->st.st_mode & S_ISGID) { + /* We just created this directory and its setgid + * bit is on, so make sure it stays on. */ + new_mode |= S_ISGID; } - if (!preserve_times || S_ISLNK(st->st_mode) - || (make_backups && !backup_dir && S_ISDIR(st->st_mode))) - flags |= PERMS_SKIP_MTIME; - if (!(flags & PERMS_SKIP_MTIME) - && cmp_modtime(st->st_mtime, file->modtime) != 0) { - /* don't complain about not setting times on directories - * because some filesystems can't do it */ - if (set_modtime(fname,file->modtime) != 0 && - !S_ISDIR(st->st_mode)) { +#ifdef SUPPORT_ACLS + if (preserve_acls && !S_ISLNK(file->mode) && !ACL_READY(*sxp)) + get_acl(fname, sxp); +#endif + +#ifdef SUPPORT_XATTRS + if (preserve_xattrs && fnamecmp) + set_xattr(fname, file, fnamecmp, sxp); + if (am_root < 0) + set_stat_xattr(fname, file); +#endif + + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1)) + flags |= ATTRS_SKIP_MTIME; + if (!(flags & ATTRS_SKIP_MTIME) + && cmp_time(sxp->st.st_mtime, file->modtime) != 0) { + int ret = set_modtime(fname, file->modtime, sxp->st.st_mode); + if (ret < 0) { rsyserr(FERROR, errno, "failed to set times on %s", full_fname(fname)); - return 0; + goto cleanup; } - updated = 1; + if (ret == 0) /* ret == 1 if symlink could not be set */ + updated = 1; } - change_uid = am_root && preserve_uid && st->st_uid != file->uid; - change_gid = preserve_gid && file->gid != GID_NONE - && st->st_gid != file->gid; -#if !HAVE_LCHOWN && !CHOWN_MODIFIES_SYMLINK - if (S_ISLNK(st->st_mode)) + change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file); + change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP) + && sxp->st.st_gid != (gid_t)F_GROUP(file); +#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK + if (S_ISLNK(sxp->st.st_mode)) ; else #endif @@ -189,59 +409,86 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, if (verbose > 2) { if (change_uid) { rprintf(FINFO, - "set uid of %s from %ld to %ld\n", - fname, (long)st->st_uid, (long)file->uid); + "set uid of %s from %u to %u\n", + fname, (unsigned)sxp->st.st_uid, F_OWNER(file)); } if (change_gid) { rprintf(FINFO, - "set gid of %s from %ld to %ld\n", - fname, (long)st->st_gid, (long)file->gid); + "set gid of %s from %u to %u\n", + fname, (unsigned)sxp->st.st_gid, F_GROUP(file)); } } - if (do_lchown(fname, - change_uid ? file->uid : st->st_uid, - change_gid ? file->gid : st->st_gid) != 0) { + if (am_root < 0) { + ; + } else if (do_lchown(fname, + change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid, + change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid) != 0) { /* shouldn't have attempted to change uid or gid * unless have the privilege */ rsyserr(FERROR, errno, "%s %s failed", change_uid ? "chown" : "chgrp", full_fname(fname)); - return 0; - } + goto cleanup; + } else /* a lchown had been done - we have to re-stat if the * destination had the setuid or setgid bits set due * to the side effect of the chown call */ - if (st->st_mode & (S_ISUID | S_ISGID)) { - link_stat(fname, st, - keep_dirlinks && S_ISDIR(st->st_mode)); + if (sxp->st.st_mode & (S_ISUID | S_ISGID)) { + link_stat(fname, &sxp->st, + keep_dirlinks && S_ISDIR(sxp->st.st_mode)); } updated = 1; } + if (daemon_chmod_modes && !S_ISLNK(new_mode)) + new_mode = tweak_mode(new_mode, daemon_chmod_modes); + +#ifdef SUPPORT_ACLS + /* It's OK to call set_acl() now, even for a dir, as the generator + * will enable owner-writability using chmod, if necessary. + * + * If set_acl() changes permission bits in the process of setting + * an access ACL, it changes sxp->st.st_mode so we know whether we + * need to chmod(). */ + if (preserve_acls && !S_ISLNK(new_mode) && set_acl(fname, file, sxp) == 0) + updated = 1; +#endif + #ifdef HAVE_CHMOD - if (!S_ISLNK(st->st_mode)) { - if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) { - updated = 1; - if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) { - rsyserr(FERROR, errno, "failed to set permissions on %s", - full_fname(fname)); - return 0; - } + if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) { + int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode); + if (ret < 0) { + rsyserr(FERROR, errno, + "failed to set permissions on %s", + full_fname(fname)); + goto cleanup; } + if (ret == 0) /* ret == 1 if symlink could not be set */ + updated = 1; } #endif - if (verbose > 1 && flags & PERMS_REPORT) { + if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) - rprintf(FINFO,"%s\n",fname); + rprintf(FCLIENT, "%s\n", fname); else - rprintf(FINFO,"%s is uptodate\n",fname); + rprintf(FCLIENT, "%s is uptodate\n", fname); + } + cleanup: + if (sxp == &sx2) { +#ifdef SUPPORT_ACLS + if (preserve_acls) + free_acl(&sx2); +#endif +#ifdef SUPPORT_XATTRS + if (preserve_xattrs) + free_xattr(&sx2); +#endif } return updated; } - -void sig_int(void) +RETSIGTYPE sig_int(UNUSED(int val)) { /* KLUGE: if the user hits Ctrl-C while ssh is prompting * for a password, then our cleanup's sending of a SIGUSR1 @@ -255,34 +502,40 @@ void sig_int(void) exit_cleanup(RERR_SIGNAL); } - -/* finish off a file transfer, renaming the file and setting the permissions - and ownership */ -void finish_transfer(char *fname, char *fnametmp, struct file_struct *file, - int ok_to_set_time, int overwriting_basis) +/* Finish off a file transfer: renaming the file and setting the file's + * attributes (e.g. permissions, ownership, etc.). If partialptr is not + * NULL and the robust_rename() call is forced to copy the temp file, we + * stage the file into the partial-dir and then rename it into place. */ +void finish_transfer(const char *fname, const char *fnametmp, + const char *fnamecmp, const char *partialptr, + struct file_struct *file, int ok_to_set_time, + int overwriting_basis) { int ret; if (inplace) { if (verbose > 2) rprintf(FINFO, "finishing %s\n", fname); - goto do_set_perms; + fnametmp = fname; + goto do_set_file_attrs; } - if (make_backups && overwriting_basis && !make_backup(fname)) + if (make_backups > 0 && overwriting_basis && !make_backup(fname)) return; /* Change permissions before putting the file into place. */ - set_perms(fnametmp, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME); + set_file_attrs(fnametmp, file, NULL, fnamecmp, + ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); /* move tmp file over real file */ if (verbose > 2) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); - ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS); + ret = robust_rename(fnametmp, fname, partialptr, + file->mode & INITACCESSPERMS); if (ret < 0) { rsyserr(FERROR, errno, "%s %s -> \"%s\"", - ret == -2 ? "copy" : "rename", - full_fname(fnametmp), fname); + ret == -2 ? "copy" : "rename", + full_fname(fnametmp), fname); do_unlink(fnametmp); return; } @@ -290,11 +543,45 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file, /* The file was moved into place (not copied), so it's done. */ return; } - do_set_perms: - set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME); + /* The file was copied, so tweak the perms of the copied file. If it + * was copied to partialptr, move it into its final destination. */ + fnametmp = partialptr ? partialptr : fname; + + do_set_file_attrs: + set_file_attrs(fnametmp, file, NULL, fnamecmp, + ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); + + if (partialptr) { + if (do_rename(fnametmp, fname) < 0) { + rsyserr(FERROR, errno, "rename %s -> \"%s\"", + full_fname(fnametmp), fname); + } else + handle_partial_dir(partialptr, PDIR_DELETE); + } +} + +struct file_list *flist_for_ndx(int ndx) +{ + struct file_list *flist = cur_flist; + + if (!flist && !(flist = first_flist)) + return NULL; + + while (ndx < flist->ndx_start-1) { + if (flist == first_flist) + return NULL; + flist = flist->prev; + } + while (ndx > flist->ndx_end) { + if (!(flist = flist->next)) + return NULL; + } + return flist; } const char *who_am_i(void) { + if (am_starting_up) + return am_server ? "server" : "client"; return am_sender ? "sender" : am_generator ? "generator" : "receiver"; }