- offset = stringjoin(fname, sizeof fname,
- file->basedir, "/", NULL);
- if (offset >= MAXPATHLEN-1) {
- io_error |= IOERR_GENERAL;
- rprintf(FERROR, "send_files failed on long-named directory %s\n",
- full_fname(fname));
- return;
- }
- }
- f_name_to(file, fname + offset, MAXPATHLEN - offset);
+ /* 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;
+ f_name_to(file, fname + offset);