/*
- * $Id: ofork.c,v 1.21 2005-04-28 20:49:44 bfernhomberg Exp $
+ * $Id: ofork.c,v 1.26 2008-08-16 21:11:36 didg Exp $
*
* Copyright (c) 1996 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
for ( ofrefnum = 0; ofrefnum < nforks; ofrefnum++ ) {
if ( oforks[ ofrefnum ] != NULL ) {
- fprintf( f, "%hu <%s>\n", ofrefnum, oforks[ ofrefnum ]->of_name);
+ fprintf( f, "%hu <%s>\n", ofrefnum, of_name(oforks[ ofrefnum ]));
}
}
}
const char *oldpath _U_, *newpath;
{
struct ofork *of, *next, *d_ofork;
+ int done = 0;
if (!s_of)
return AFP_OK;
if (vol == of->of_vol && olddir == of->of_dir &&
s_of->key.dev == of->key.dev &&
s_of->key.inode == of->key.inode ) {
- strlcpy( of->of_name, newpath, of->of_namelen);
+ if (!done) {
+ strlcpy( of_name(of), newpath, of->of_ad->ad_m_namelen);
+ done = 1;
+ }
if (newdir != olddir) {
of->of_d_prev->of_d_next = of->of_d_next;
of->of_d_next->of_d_prev = of->of_d_prev;
int i;
if (!oforks) {
- nforks = (getdtablesize() - 10) / 2;
+ nforks = getdtablesize() - 10;
/* protect against insane ulimit -n */
nforks = min(nforks, 0xffff);
oforks = (struct ofork **) calloc(nforks, sizeof(struct ofork *));
ad = malloc( sizeof( struct adouble ) );
if (!ad) {
LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
+ free(of);
+ oforks[ of_refnum ] = NULL;
return NULL;
}
/* 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->ad_m_namelen = 255 +1;
+ /* here's the deal: we allocate enough for the standard mac file length.
+ * in the future, we'll reallocate in fairly large jumps in case
+ * of long unicode names */
+ if (( ad->ad_m_name =(char *)malloc( ad->ad_m_namelen )) == NULL ) {
+ LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
+ free(ad);
+ free(of);
+ oforks[ of_refnum ] = NULL;
+ 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. */
}
of->of_ad = ad;
-
of->of_vol = vol;
of->of_dir = dir;
d_ofork->of_d_prev = of;
}
- /* here's the deal: we allocate enough for the standard mac file length.
- * in the future, we'll reallocate in fairly large jumps in case
- * of long unicode names */
- if (( of->of_name =(char *)malloc(255 + 1)) == NULL ) {
- LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
- if (!ad)
- free(of->of_ad);
- free(of);
- oforks[ of_refnum ] = NULL;
- return NULL;
- }
- strlcpy( of->of_name, path, of->of_namelen = 255 + 1);
*ofrefnum = refnum;
of->of_refnum = refnum;
of->key.dev = st->st_dev;
}
oforks[ of->of_refnum % nforks ] = NULL;
- free( of->of_name );
/* 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);
{
struct timeval tv;
int adflags, doflush = 0;
+ int ret;
adflags = 0;
- if ((ofork->of_flags & AFPFORK_DATA) && (ad_dfileno( ofork->of_ad ) != -1)) {
+ if ((ofork->of_flags & AFPFORK_DATA) && (ad_data_fileno( ofork->of_ad ) != -1)) {
adflags |= ADFLAGS_DF;
}
- if ( (ofork->of_flags & AFPFORK_OPEN) && ad_hfileno( ofork->of_ad ) != -1 ) {
+ 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.
doflush++;
}
if ( doflush ) {
- ad_flush( ofork->of_ad, adflags );
+ ad_flush( ofork->of_ad );
}
}
}
-
+ ret = 0;
if ( ad_close( ofork->of_ad, adflags ) < 0 ) {
- return -1;
+ ret = -1;
}
of_dealloc( ofork );
- return 0;
+ return ret;
}
/* ----------------------