- strlcpy(fname,file->basedir,MAXPATHLEN-1);
- if (strlen(fname) == MAXPATHLEN-1) {
- io_error = 1;
- rprintf(FERROR, "send_files failed on long-named directory %s\n",
- fname);
- return;
- }
- strlcat(fname,"/",MAXPATHLEN-1);
- offset = strlen(file->basedir)+1;
- }
- strlcat(fname,f_name(file),MAXPATHLEN-strlen(fname));
- clean_fname(fname);
-
- if (verbose > 2)
- rprintf(FINFO,"send_files(%d,%s)\n",i,fname);
-
- if (dry_run) {
- if (!am_server) {
- log_transfer(file, fname+offset);
- }
- write_int(f_out,i);
+ /* N.B. We're sure that this fits, so offset is OK. */
+ offset = strlcpy(fname, file->basedir, sizeof fname);
+ if (!offset || fname[offset-1] != '/')
+ fname[offset++] = '/';
+ } else
+ offset = 0;
+ fname2 = f_name_to(file, fname + offset);
+ if (inplace && protocol_version >= 29) {
+ uchar fnamecmp_type = read_byte(f_in);
+ updating_basis_file = fnamecmp_type == FNAMECMP_FNAME;
+ } else
+ updating_basis_file = inplace && !make_backups;
+
+ if (verbose > 2)
+ rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
+
+ if (dry_run) {
+ if (!am_server && verbose) /* log the transfer */
+ rprintf(FINFO, "%s\n", safe_fname(fname2));
+ write_int(f_out, i);