- strlcpy(fname, file->basedir, MAXPATHLEN);
- if (strlen(fname) == MAXPATHLEN-1) {
- io_error = 1;
- rprintf(FERROR, "send_files failed on long-named directory %s\n",
- fname);
- return;
- }
- strlcat(fname, "/", MAXPATHLEN);
- offset = strlen(file->basedir)+1;
- }
- strlcat(fname, f_name(file), MAXPATHLEN);
+ offset = stringjoin(fname, sizeof fname,
+ file->basedir, "/", NULL);
+ } else
+ offset = 0;
+ f_name_to(file, fname + offset);