/* initialize to zero. This is important to ensure that
ad_open really does reinitialize the structure. */
- ad_init(ad, vol->v_adouble, vol->v_ad_options);
+ ad_init(ad, vol);
ad->ad_m_namelen = UTF8FILELEN_EARLY +1;
/* here's the deal: we allocate enough for the standard mac file length.
return NULL;
}
strlcpy( ad->ad_m_name, path, ad->ad_m_namelen);
+ } else {
+ /* Increase the refcount on this struct adouble. This is
+ decremented again in oforc_dealloc. */
+ ad_ref(ad);
}
- ad_ref(ad);
of->of_ad = ad;
of->of_vol = vol;
of->of_did = dir->d_did;
of_unhash(of);
oforks[ of->of_refnum % nforks ] = NULL;
+
+ /* decrease refcount */
+ of->of_ad->ad_refcount--;
+
+ if ( of->of_ad->ad_refcount <= 0) {
+ free( of->of_ad->ad_m_name );
+ free( of->of_ad);
+ } else {/* someone's still using it. just free this user's locks */
+ ad_unlock(of->of_ad, of->of_refnum);
+ }
+
free( of );
}
int of_closefork(struct ofork *ofork)
{
struct timeval tv;
- int doflush = 0;
+ int adflags, doflush = 0;
int ret;
+ adflags = 0;
+ if ((ofork->of_flags & AFPFORK_DATA) && (ad_data_fileno( ofork->of_ad ) != -1)) {
+ adflags |= ADFLAGS_DF;
+ }
if ( (ofork->of_flags & AFPFORK_OPEN) && ad_reso_fileno( ofork->of_ad ) != -1 ) {
+ adflags |= ADFLAGS_HF;
/*
* Only set the rfork's length if we're closing the rfork.
*/
}
ret = 0;
-
- ad_unlock(ofork->of_ad, ofork->of_refnum);
-
- if (ad_unref(ofork->of_ad) == 0) {
- if ( ad_close( ofork->of_ad, 0 ) < 0 ) {
- ret = -1;
- }
+ if ( ad_close( ofork->of_ad, adflags ) < 0 ) {
+ ret = -1;
}
of_dealloc( ofork );
if ((of = of_findname(path))) {
adp = of->of_ad;
} else {
- ad_init(ad, vol->v_adouble, vol->v_ad_options);
+ ad_init(ad, vol);
adp = ad;
}
return adp;