EC_INIT;
struct stat st;
ssize_t cc;
- size_t roundup;
off_t r_off;
- if (ad_data_fileno(ad) == -2) {
- /* It's a symlink */
+ if (ad_data_fileno(ad) == AD_SYMLINK) {
errno = EACCES;
return -1;
}
- LOG(log_debug, logtype_default, "ad_write: off: %ju, size: %zu, eabuflen: %zu",
+ LOG(log_debug, logtype_ad, "ad_write: off: %ju, size: %zu, eabuflen: %zu",
(uintmax_t)off, buflen, ad->ad_rlen);
if ( eid == ADEID_DFORK ) {
return -1; /* we don't know how to write if it's not a ressource or data fork */
}
-EC_CLEANUP:
if (ret != 0)
return ret;
return( cc );
}
/* ------------------------ */
-int ad_rtruncate( struct adouble *ad, const off_t size)
+int ad_rtruncate(struct adouble *ad, const char *uname, const off_t size)
{
EC_INIT;
- if (ad->ad_vers == AD_VERSION_EA && size == 0) {
-#if HAVE_EAFD
- EC_NEG1( sys_lremovexattr(of_name(ofork), AD_EA_RESO) );
-#else
- EC_NEG1( unlink(ad->ad_ops->ad_path(ad->ad_name, 0)) );
-#endif
- }
+ /*
+ * We can't delete 0 byte size resource forks either, because a
+ * fork may reference the adouble handle with an open fd for the
+ * file, which means we would only delete the directory entry, not
+ * the file. Subsequently all code that works with fork handles
+ * finds the fork open, so eg flushing a fork (ad_flush()) will
+ * recreate ._ files. The correct place to delete 0 byte sized
+ * resource forks is in of_closefork().
+ */
EC_NEG1( sys_ftruncate(ad_reso_fileno(ad), size + ad->ad_eid[ ADEID_RFORK ].ade_off) );
+ ad->ad_rlen = size;
+
EC_CLEANUP:
- if (ret == 0)
- ad->ad_rlen = size;
- else
- LOG(log_error, logtype_default, "ad_rtruncate(\"%s\"): %s",
- fullpathname(ad->ad_name), strerror(errno));
+ if (ret != 0)
+ LOG(log_error, logtype_ad, "ad_rtruncate(\"%s\"): %s",
+ fullpathname(uname), strerror(errno));
EC_EXIT;
}
int ad_dtruncate(struct adouble *ad, const off_t size)
{
if (sys_ftruncate(ad_data_fileno(ad), size) < 0) {
- LOG(log_error, logtype_default, "sys_ftruncate(fd: %d): %s",
+ LOG(log_error, logtype_ad, "sys_ftruncate(fd: %d): %s",
ad_data_fileno(ad), strerror(errno));
return -1;
}