#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <arpa/inet.h>
#include <atalk/adouble.h>
#include <atalk/ea.h>
#include "ad_lock.h"
-static const u_int32_t set_eid[] = {
+static const uint32_t set_eid[] = {
0,1,2,3,4,5,6,7,8,
9,10,11,12,13,14,15,
AD_DEV, AD_INO, AD_SYN, AD_ID
*/
int ad_rebuild_adouble_header(struct adouble *ad)
{
- u_int32_t eid;
- u_int32_t temp;
- u_int16_t nent;
+ uint32_t eid;
+ uint32_t temp;
+ uint16_t nent;
char *buf, *nentp;
int len;
*/
int ad_copy_header(struct adouble *add, struct adouble *ads)
{
- u_int32_t eid;
- u_int32_t len;
+ uint32_t eid;
+ uint32_t len;
for ( eid = 0; eid < ADEID_MAX; eid++ ) {
if ( ads->ad_eid[ eid ].ade_off == 0 ) {
int ad_flush(struct adouble *ad)
{
int len;
+ struct ad_fd *adf;
- if (( ad->ad_md->adf_flags & O_RDWR )) {
+ switch (ad->ad_flags) {
+ case AD_VERSION2:
+ adf = ad->ad_mdp;
+ break;
+ case AD_VERSION_EA:
+ adf = &ad->ad_data_fork;
+ break;
+ default:
+ LOG(log_error, logtype_afpd, "ad_flush: unexpected adouble version");
+ return -1;
+ }
+
+ if ((adf->adf_flags & O_RDWR)) {
if (ad_getentryoff(ad, ADEID_RFORK)) {
if (ad->ad_rlen > 0xffffffff)
ad_setentrylen(ad, ADEID_RFORK, 0xffffffff);
switch (ad->ad_flags) {
case AD_VERSION2:
- if (adf_pwrite(ad->ad_md, ad->ad_data, len, 0) != len) {
+ if (adf_pwrite(ad->ad_mdp, ad->ad_data, len, 0) != len) {
if (errno == 0)
errno = EIO;
return( -1 );
}
break;
case AD_VERSION_EA:
- if (sys_lsetxattr(cfrombstr(ad->ad_fullpath), AD_EA_META, ad->ad_data, AD_DATASZ_EA, 0) != 0) {
+ if (sys_fsetxattr(ad_data_fileno(ad), AD_EA_META, ad->ad_data, AD_DATASZ_EA, 0) != 0) {
LOG(log_error, logtype_afpd, "ad_flush: sys_fsetxattr error: %s",
strerror(errno));
return -1;
/*!
* Close a struct adouble freeing all resources
- *
- * This close the whole thing, regardless of what you pass in adflags!
*/
-int ad_close( struct adouble *ad, int adflags)
+int ad_close(struct adouble *ad, int adflags)
{
int err = 0;
- if (ad->ad_inited == AD_CLOSED) {
- LOG(log_warning, logtype_default, "ad_close: double close");
- return 0;
- }
-
- LOG(log_debug, logtype_default, "ad_close(\"%s\", %s)",
- cfrombstr(ad->ad_fullpath),
- adflags2logstr(adflags));
+ if (ad == NULL)
+ return err;
- if (ad->ad_refcount) {
- LOG(log_debug, logtype_default, "ad_close(\"%s\"): adouble in use by fork, not closing",
- cfrombstr(ad->ad_fullpath));
- return 0;
- }
+ LOG(log_debug, logtype_default, "ad_close(%s)", adflags2logstr(adflags));
- if (ad_data_fileno(ad) != -1) {
- if ((ad_data_fileno(ad) == -2) && (ad->ad_data_fork.adf_syml != NULL)) {
+ if ((adflags & ADFLAGS_DF)
+ && (ad_data_fileno(ad) >= 0 || ad_data_fileno(ad) == -2) /* -2 means symlink */
+ && --ad->ad_data_fork.adf_refcount == 0) {
+ if (ad->ad_data_fork.adf_syml != NULL) {
free(ad->ad_data_fork.adf_syml);
- ad->ad_data_fork.adf_syml = NULL;
+ ad->ad_data_fork.adf_syml = 0;
} else {
if ( close( ad_data_fileno(ad) ) < 0 )
err = -1;
}
ad_data_fileno(ad) = -1;
adf_lock_free(&ad->ad_data_fork);
- ad->ad_adflags &= ~ADFLAGS_DF;
}
- if (ad_meta_fileno(ad) != -1) {
- if ( close( ad_meta_fileno(ad) ) < 0 )
- err = -1;
- ad_meta_fileno(ad) = -1;
- adf_lock_free(ad->ad_md);
- ad->ad_adflags &= ~ADFLAGS_HF;
- }
+ if ((adflags & ADFLAGS_HF)) {
+ switch (ad->ad_flags) {
+ case AD_VERSION2:
+ if ((ad_meta_fileno(ad) != -1) && !(--ad->ad_mdp->adf_refcount)) {
+ if (close( ad_meta_fileno(ad) ) < 0)
+ err = -1;
+ ad_meta_fileno(ad) = -1;
+ adf_lock_free(ad->ad_mdp);
+ }
+ break;
- if (ad->ad_resforkbuf) {
- free(ad->ad_resforkbuf);
- ad->ad_resforkbuf = NULL;
- ad->ad_adflags &= ~ADFLAGS_RF;
- }
+ case AD_VERSION_EA:
+ if ((ad_data_fileno(ad) >= 0 || ad_data_fileno(ad) == -2) /* -2 means symlink */
+ && !(--ad->ad_data_fork.adf_refcount)) {
+ if (close( ad_data_fileno(ad) ) < 0)
+ err = -1;
+ ad_data_fileno(ad) = -1;
+ adf_lock_free(&ad->ad_data_fork);
+ }
+ break;
- if (ad->ad_fullpath) {
- bdestroy(ad->ad_fullpath);
- ad->ad_fullpath = NULL;
+ default:
+ LOG(log_error, logtype_default, "ad_close: unknown AD version");
+ errno = EIO;
+ return -1;
+ }
}
- ad->ad_inited = AD_CLOSED;
+ if ((adflags & ADFLAGS_RF)) {
+ switch (ad->ad_flags) {
+ case AD_VERSION2:
+ /* Do nothing as ADFLAGS_RF == ADFLAGS_HF */
+ break;
+
+ case AD_VERSION_EA:
+ if ((ad_data_fileno(ad) >= 0 || ad_data_fileno(ad) == -2) /* -2 means symlink */
+ && !(--ad->ad_data_fork.adf_refcount)) {
+ if (close( ad_data_fileno(ad) ) < 0)
+ err = -1;
+ ad_data_fileno(ad) = -1;
+ adf_lock_free(&ad->ad_data_fork);
+ }
+ break;
+
+ default:
+ LOG(log_error, logtype_default, "ad_close: unknown AD version");
+ errno = EIO;
+ return -1;
+ }
+ }
return err;
}