- strlcpy(p, f->dirname, MAXPATHLEN);
- strlcat(p, "/", MAXPATHLEN);
- strlcat(p, f->basename, MAXPATHLEN);
+ int off;
+
+ off = strlcpy(p, f->dirname, MAXPATHLEN);
+ off += strlcpy(p+off, "/", MAXPATHLEN-off);
+ off += strlcpy(p+off, f->basename, MAXPATHLEN-off);