/*
- * $Id: ofork.c,v 1.32 2010/03/12 15:16:49 franklahm Exp $
- *
* Copyright (c) 1996 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*/
}
}
-#ifdef DEBUG1
-void of_pforkdesc( FILE *f)
-{
- int ofrefnum;
-
- if (!oforks)
- return;
-
- for ( ofrefnum = 0; ofrefnum < nforks; ofrefnum++ ) {
- if ( oforks[ ofrefnum ] != NULL ) {
- fprintf( f, "%hu <%s>\n", ofrefnum, of_name(oforks[ ofrefnum ]));
- }
- }
-}
-#endif
-
int of_flush(const struct vol *vol)
{
int refnum;
struct dir *olddir, const char *oldpath _U_,
struct dir *newdir, const char *newpath)
{
- struct ofork *of, *next, *d_ofork;
+ struct ofork *of, *next;
int done = 0;
if (!s_of)
while ((of = next)) {
next = next->next; /* so we can unhash and still be all right. */
- if (vol == of->of_vol && olddir == of->of_dir &&
- s_of->key.dev == of->key.dev &&
- s_of->key.inode == of->key.inode ) {
+ if (vol == of->of_vol
+ && olddir->d_did == of->of_did
+ && s_of->key.dev == of->key.dev
+ && s_of->key.inode == of->key.inode ) {
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;
- if (of->of_dir->d_ofork == of) {
- of->of_dir->d_ofork = (of == of->of_d_next) ? NULL : of->of_d_next;
- }
- of->of_dir = newdir;
- if (!(d_ofork = newdir->d_ofork)) {
- newdir->d_ofork = of;
- of->of_d_next = of->of_d_prev = of;
- } else {
- of->of_d_next = d_ofork;
- of->of_d_prev = d_ofork->of_d_prev;
- of->of_d_prev->of_d_next = of;
- d_ofork->of_d_prev = of;
- }
- }
+ if (newdir != olddir)
+ of->of_did = newdir->d_did;
}
}
struct adouble *ad,
struct stat *st)
{
- struct ofork *of, *d_ofork;
+ struct ofork *of;
u_int16_t refnum, of_refnum;
int i;
ad_open really does reinitialize the structure. */
ad_init(ad, vol->v_adouble, vol->v_ad_options);
- ad->ad_m_namelen = 255 +1;
+ ad->ad_m_namelen = UTF8FILELEN_EARLY +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 */
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->ad_refcount++;
}
+ ad_ref(ad);
of->of_ad = ad;
of->of_vol = vol;
- of->of_dir = dir;
-
- if (!(d_ofork = dir->d_ofork)) {
- dir->d_ofork = of;
- of->of_d_next = of->of_d_prev = of;
- } else {
- of->of_d_next = d_ofork;
- of->of_d_prev = d_ofork->of_d_prev;
- d_ofork->of_d_prev->of_d_next = of;
- d_ofork->of_d_prev = of;
- }
+ of->of_did = dir->d_did;
*ofrefnum = refnum;
of->of_refnum = refnum;
if ((ret = lstat(path->u_name, &path->st)) < 0) {
LOG(log_debug, logtype_afpd, "of_stat('%s/%s': %s)",
- cfrombstring(curdir->d_fullpath), path->u_name, strerror(errno));
+ cfrombstr(curdir->d_fullpath), path->u_name, strerror(errno));
path->st_errno = errno;
}
}
-#ifdef HAVE_RENAMEAT
+#ifdef HAVE_ATFUNCS
int of_fstatat(int dirfd, struct path *path)
{
int ret;
return ret;
}
-#endif /* HAVE_RENAMEAT */
+#endif /* HAVE_ATFUNCS */
/* --------------------------
stat the current directory.
len = blength(path->d_dir->d_u_name);
if (len > (MAXPATHLEN - 3))
len = MAXPATHLEN - 3;
- strncpy(pathname + 3, cfrombstring(path->d_dir->d_u_name), len + 1);
+ strncpy(pathname + 3, cfrombstr(path->d_dir->d_u_name), len + 1);
LOG(log_debug, logtype_afpd, "of_statdir: stating: '%s'", pathname);
return -1;
path->st_errno = 0;
- if ((ret = lstat(cfrombstring(path->d_dir->d_u_name), &path->st)) < 0)
+ if ((ret = lstat(cfrombstr(path->d_dir->d_u_name), &path->st)) < 0)
path->st_errno = errno;
}
* @param dirfd (r) directory fd
* @param path (rw) pointer to struct path
*/
-#ifdef HAVE_RENAMEAT
+#ifdef HAVE_ATFUNCS
struct ofork *of_findnameat(int dirfd, struct path *path)
{
struct ofork *of;
return;
of_unhash(of);
-
- /* detach ofork */
- of->of_d_prev->of_d_next = of->of_d_next;
- of->of_d_next->of_d_prev = of->of_d_prev;
- if (of->of_dir->d_ofork == of) {
- of->of_dir->d_ofork = (of == of->of_d_next) ? NULL : of->of_d_next;
- }
-
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 adflags, doflush = 0;
+ int 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;
- if ( ad_close( ofork->of_ad, adflags ) < 0 ) {
- ret = -1;
+
+ 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;
+ }
}
of_dealloc( ofork );
return;
}
+/* ----------------------
+ close all forks for a volume
+*/
+void of_close_all_forks(void)
+{
+ int refnum;
+
+ if (!oforks)
+ return;
+
+ for ( refnum = 0; refnum < nforks; refnum++ ) {
+ if (oforks[ refnum ] != NULL) {
+ if (of_closefork( oforks[ refnum ]) < 0 ) {
+ LOG(log_error, logtype_afpd, "of_close_all_forks: %s", strerror(errno) );
+ }
+ }
+ }
+ return;
+}
+
projects / netatalk.git / blobdiff