Start of rfork EA stuff

[netatalk.git] / libatalk / adouble / ad_flush.c

diff --git a/libatalk/adouble/ad_flush.c b/libatalk/adouble/ad_flush.c
index 09c663a31adca09d88f01a8565f8c7947b21946c..6dcaf07266e5d809dcaf4e4da442a86eb77abecb 100644 (file)
--- a/libatalk/adouble/ad_flush.c
+++ b/libatalk/adouble/ad_flush.c
@@ -37,6 +37,14 @@
 
 #include "ad_private.h"
 
+static const u_int32_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
+};
+
+#define EID_DISK(a) (set_eid[a])
+
 /*
  * Rebuild any header information that might have changed.
  */
@@ -66,7 +74,7 @@ int  ad_rebuild_adouble_header(struct adouble *ad)
         if ( ad->ad_eid[ eid ].ade_off == 0 ) {
             continue;
         }
-        temp = htonl( DISK_EID(eid) );
+        temp = htonl( EID_DISK(eid) );
         memcpy(buf, &temp, sizeof( temp ));
         buf += sizeof( temp );
 
@@ -177,7 +185,7 @@ int ad_close( struct adouble *ad, int adflags)
 
     if ((adflags & ADFLAGS_DF)
         && (ad_data_fileno(ad) >= 0 || ad_data_fileno(ad) == -2) /* -2 means symlink */
-        && --ad->ad_data_fork.adf_refcount == 0) {
+        && (--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 = 0;
@@ -187,20 +195,33 @@ int ad_close( struct adouble *ad, int adflags)
         }
         ad_data_fileno(ad) = -1;
         adf_lock_free(&ad->ad_data_fork);
+        ad->ad_adflags &= ~ADFLAGS_DF;
     }
 
-    if (!( adflags & ADFLAGS_HF )) {
-        return err;
+    if ((adflags & ADFLAGS_HF)
+        && (ad_meta_fileno(ad) != -1)
+        && (--ad->ad_md->adf_refcount == 0)) {
+        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;
     }
 
-    /* meta/resource fork */
+    if ((adflags & ADFLAGS_RF)
+        && (--ad->ad_resource_fork.adf_refcount == 0)
+        && (ad->ad_resforkbuf)) {
+        free(ad->ad_resforkbuf);
+        ad->ad_resforkbuf = NULL;
+        ad->ad_adflags &= ~ADFLAGS_RF;
+    }
 
-    if ( ad_meta_fileno(ad) != -1 && !(--ad->ad_md->adf_refcount)) {
-        if ( close( ad_meta_fileno(ad) ) < 0 ) {
-            err = -1;
+    /* If both header and ressource are not open anymore, deallocate fullpath */
+    if (!(adflags & (ADFLAGS_HF | ADFLAGS_RF))) {
+        if (ad->ad_fullpath) {
+            bdestroy(ad->ad_fullpath);
+            ad->ad_fullpath = NULL;
         }
-        ad_meta_fileno(ad) = -1;
-        adf_lock_free(ad->ad_md);
     }
 
     return err;