#include <atalk/ea.h>
#include <atalk/bstrlib.h>
#include <atalk/bstradd.h>
-
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif /* ! MIN */
+#include <atalk/logger.h>
+#include <atalk/util.h>
+#include <atalk/errchk.h>
/* XXX: locking has to be checked before each stream of consecutive
* ad_writes to prevent a lock in the middle from causing problems.
/* end is always 0 */
ssize_t ad_write(struct adouble *ad, uint32_t eid, off_t off, int end, const char *buf, size_t buflen)
{
+ 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 */
errno = EACCES;
return -1;
}
+
+ LOG(log_debug, logtype_default, "ad_write: off: %ju, size: %zu, eabuflen: %zu",
+ (uintmax_t)off, buflen, ad->ad_rlen);
if ( eid == ADEID_DFORK ) {
if ( end ) {
}
cc = adf_pwrite(&ad->ad_data_fork, buf, buflen, off);
} else if ( eid == ADEID_RFORK ) {
- if (ad->ad_flags != AD_VERSION_EA) {
- off_t r_off;
- if ( end ) {
- if ( fstat( ad_data_fileno(ad), &st ) < 0 )
- return( -1 );
- off = st.st_size - off -ad_getentryoff(ad, eid);
- }
- r_off = ad_getentryoff(ad, eid) + off;
- cc = adf_pwrite(&ad->ad_resource_fork, buf, buflen, r_off);
-
- /* sync up our internal buffer FIXME always false? */
- if (r_off < ad_getentryoff(ad, ADEID_RFORK))
- memcpy(ad->ad_data + r_off, buf, MIN(sizeof(ad->ad_data) -r_off, cc));
- if ( ad->ad_rlen < off + cc )
- ad->ad_rlen = off + cc;
- } else { /* AD_VERSION_EA */
- if ((off + buflen) > ad->ad_resforkbufsize) {
- size_t roundup = (((off + buflen) / RFORK_EA_ALLOCSIZE) + 1) * RFORK_EA_ALLOCSIZE;
- if ((ad->ad_resforkbuf = realloc(ad->ad_resforkbuf, roundup)) == NULL)
- return -1;
- ad->ad_resforkbufsize = roundup;
- }
- memcpy(ad->ad_resforkbuf + off, buf, buflen);
- if ((off + buflen) > ad->ad_rlen)
- ad->ad_rlen = off + buflen;
-
- if (sys_lsetxattr(cfrombstr(ad->ad_fullpath), AD_EA_RESO, ad->ad_resforkbuf, ad->ad_rlen, 0) == -1)
- return -1;
- cc = buflen;
+ if (end) {
+ if (fstat( ad_reso_fileno(ad), &st ) < 0)
+ return(-1);
+ off = st.st_size - off - ad_getentryoff(ad, eid);
}
+#ifdef HAVE_EAFD
+ if (ad->ad_vers == AD_VERSION_EA) {
+ r_off = 0;
+ } else
+#endif
+ r_off = ad_getentryoff(ad, eid) + off;
+
+ cc = adf_pwrite(&ad->ad_resource_fork, buf, buflen, r_off);
+
+ if ( ad->ad_rlen < off + cc )
+ ad->ad_rlen = off + cc;
} else {
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)
{
- if (ad->ad_flags != AD_VERSION_EA)
+ if (ad->ad_vers != AD_VERSION_EA)
if (sys_ftruncate(ad_reso_fileno(ad), size + ad->ad_eid[ ADEID_RFORK ].ade_off ) < 0 )
return -1;