X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fofork.c;h=49c014ccef9befec7be7f15068e5c7039e757139;hb=refs%2Ftags%2Fafter-renameat;hp=3060120177173f5042f2ac08033dce867c809c24;hpb=f291e1ee2d32891f4f451e946b5894a038ed8c48;p=netatalk.git diff --git a/etc/afpd/ofork.c b/etc/afpd/ofork.c index 30601201..49c014cc 100644 --- a/etc/afpd/ofork.c +++ b/etc/afpd/ofork.c @@ -1,5 +1,5 @@ /* - * $Id: ofork.c,v 1.11 2002-03-24 01:23:41 sibaz Exp $ + * $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. @@ -11,20 +11,23 @@ #include #include +#ifdef HAVE_UNISTD_H +#include +#endif #include #include /* works around a bug */ #include #include #include -#include +#include #include "globals.h" #include "volume.h" #include "directory.h" #include "fork.h" -/* we need to have a hashed list of oforks (by name). just hash +/* we need to have a hashed list of oforks (by dev inode). just hash * by first letter. */ #define OFORK_HASHSIZE 64 static struct ofork *ofork_table[OFORK_HASHSIZE]; @@ -35,28 +38,29 @@ static u_short lastrefnum = 0; /* OR some of each character for the hash*/ -static __inline__ unsigned long hashfn(const char *name) +static unsigned long hashfn(const struct file_key *key) { +#if 0 unsigned long i = 0; - while (*name) { i = ((i << 4) | (8*sizeof(i) - 4)) ^ *name++; } - return i & (OFORK_HASHSIZE - 1); +#endif + return key->inode & (OFORK_HASHSIZE - 1); } -static __inline__ void of_hash(struct ofork *of) +static void of_hash(struct ofork *of) { struct ofork **table; - table = &ofork_table[hashfn(of->of_name)]; + table = &ofork_table[hashfn(&of->key)]; if ((of->next = *table) != NULL) (*table)->prevp = &of->next; *table = of; of->prevp = table; } -static __inline__ void of_unhash(struct ofork *of) +static void of_unhash(struct ofork *of) { if (of->prevp) { if (of->next) @@ -65,24 +69,25 @@ static __inline__ void of_unhash(struct ofork *of) } } -void of_pforkdesc( f ) -FILE *f; +#ifdef DEBUG1 +void of_pforkdesc( FILE *f) { - u_short ofrefnum; + int ofrefnum; if (!oforks) return; 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 ])); } } } +#endif int of_flush(const struct vol *vol) { - u_int16_t refnum; + int refnum; if (!oforks) return 0; @@ -96,49 +101,61 @@ int of_flush(const struct vol *vol) return( 0 ); } - -int of_rename(vol, olddir, oldpath, newdir, newpath) -const struct vol *vol; -struct dir *olddir, *newdir; -const char *oldpath, *newpath; +int of_rename(const struct vol *vol, + struct ofork *s_of, + struct dir *olddir, const char *oldpath _U_, + struct dir *newdir, const char *newpath) { struct ofork *of, *next, *d_ofork; + int done = 0; - next = ofork_table[hashfn(oldpath)]; + if (!s_of) + return AFP_OK; + + next = ofork_table[hashfn(&s_of->key)]; while ((of = next)) { next = next->next; /* so we can unhash and still be all right. */ - if ((vol == of->of_vol) && (olddir == of->of_dir) && - (strcmp(of->of_name, oldpath) == 0)) { - of_unhash(of); - strncpy( of->of_name, newpath, of->of_namelen); - of->of_d_prev->of_d_next = of->of_d_prev; - of->of_d_next->of_d_prev = 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 (vol == of->of_vol && olddir == of->of_dir && + 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; + } } - of_hash(of); } } return AFP_OK; } +#define min(a,b) ((a)<(b)?(a):(b)) + struct ofork * - of_alloc(vol, dir, path, ofrefnum, eid, ad) - struct vol *vol; -struct dir *dir; -char *path; -u_int16_t *ofrefnum; -const int eid; -struct adouble *ad; +of_alloc(struct vol *vol, + struct dir *dir, + char *path, + u_int16_t *ofrefnum, + const int eid, + struct adouble *ad, + struct stat *st) { struct ofork *of, *d_ofork; u_int16_t refnum, of_refnum; @@ -146,7 +163,9 @@ struct adouble *ad; 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 *)); if (!oforks) return NULL; @@ -197,12 +216,27 @@ struct adouble *ad; 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. */ - memset( ad, 0, sizeof( struct adouble ) ); + 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. */ @@ -210,7 +244,6 @@ struct adouble *ad; } of->of_ad = ad; - of->of_vol = vol; of->of_dir = dir; @@ -224,28 +257,16 @@ struct adouble *ad; 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(MACFILELEN + 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; - } - strncpy( of->of_name, path, of->of_namelen = MACFILELEN + 1); *ofrefnum = refnum; - of->of_refnum = of_refnum; - of_hash(of); - + of->of_refnum = refnum; + of->key.dev = st->st_dev; + of->key.inode = st->st_ino; if (eid == ADEID_DFORK) of->of_flags = AFPFORK_DATA; else of->of_flags = AFPFORK_RSRC; + of_hash(of); return( of ); } @@ -257,23 +278,127 @@ struct ofork *of_find(const u_int16_t ofrefnum ) return( oforks[ ofrefnum % nforks ] ); } -struct ofork * - of_findname(const struct vol *vol, const struct dir *dir, const char *name) +/* -------------------------- */ +int of_stat (struct path *path) +{ +int ret; + path->st_errno = 0; + path->st_valid = 1; + if ((ret = lstat(path->u_name, &path->st)) < 0) + path->st_errno = errno; + return ret; +} + +#ifdef HAVE_RENAMEAT +int of_fstatat(int dirfd, struct path *path) +{ + int ret; + + path->st_errno = 0; + path->st_valid = 1; + + if ((ret = fstatat(dirfd, path->u_name, &path->st, AT_SYMLINK_NOFOLLOW)) < 0) + path->st_errno = errno; + + return ret; +} +#endif /* HAVE_RENAMEAT */ + +/* -------------------------- + stat the current directory. + stat(".") works even if "." is deleted thus + we have to stat ../name because we want to know if it's there +*/ +int of_statdir (struct vol *vol, struct path *path) +{ +static char pathname[ MAXPATHLEN + 1] = "../"; +int ret; + + if (*path->m_name) { + /* not curdir */ + return of_stat (path); + } + path->st_errno = 0; + path->st_valid = 1; + /* FIXME, what about: we don't have r-x perm anymore ? */ + strlcpy(pathname +3, path->d_dir->d_u_name, sizeof (pathname) -3); + + if (!(ret = lstat(pathname, &path->st))) + return 0; + + path->st_errno = errno; + /* hmm, can't stat curdir anymore */ + if (errno == EACCES && curdir->d_parent ) { + if (movecwd(vol, curdir->d_parent)) + return -1; + path->st_errno = 0; + if ((ret = lstat(path->d_dir->d_u_name, &path->st)) < 0) + path->st_errno = errno; + } + return ret; +} + +/* -------------------------- */ +struct ofork *of_findname(struct path *path) { struct ofork *of; + struct file_key key; + + if (!path->st_valid) { + of_stat(path); + } + + if (path->st_errno) + return NULL; - for (of = ofork_table[hashfn(name)]; of; of = of->next) { - if ((vol == of->of_vol) && (dir == of->of_dir) && - (strcmp(of->of_name, name) == 0)) + key.dev = path->st.st_dev; + key.inode = path->st.st_ino; + + for (of = ofork_table[hashfn(&key)]; of; of = of->next) { + if (key.dev == of->key.dev && key.inode == of->key.inode ) { return of; + } } return NULL; } +/*! + * @brief Search for open fork by dirfd/name + * + * Function call of_fstatat with dirfd and path and uses dev and ino + * to search the open fork table. + * + * @param dirfd (r) directory fd + * @param path (rw) pointer to struct path + */ +#ifdef HAVE_RENAMEAT +struct ofork *of_findnameat(int dirfd, struct path *path) +{ + struct ofork *of; + struct file_key key; + + if ( ! path->st_valid) { + of_fstatat(dirfd, path); + } + + if (path->st_errno) + return NULL; + + key.dev = path->st.st_dev; + key.inode = path->st.st_ino; + + for (of = ofork_table[hashfn(&key)]; of; of = of->next) { + if (key.dev == of->key.dev && key.inode == of->key.inode ) { + return of; + } + } + + return NULL; +} +#endif -void of_dealloc( of ) -struct ofork *of; +void of_dealloc( struct ofork *of) { if (!oforks) return; @@ -287,13 +412,13 @@ struct ofork *of; of->of_dir->d_ofork = (of == of->of_d_next) ? NULL : of->of_d_next; } - oforks[ of->of_refnum ] = NULL; - free( of->of_name ); + 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); @@ -301,3 +426,77 @@ struct ofork *of; free( of ); } + +/* --------------------------- */ +int of_closefork(struct ofork *ofork) +{ + struct timeval tv; + 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. + */ + if ((ofork->of_flags & AFPFORK_RSRC)) { + ad_refresh( ofork->of_ad ); + if ((ofork->of_flags & AFPFORK_DIRTY) && !gettimeofday(&tv, NULL)) { + ad_setdate(ofork->of_ad, AD_DATE_MODIFY | AD_DATE_UNIX,tv.tv_sec); + doflush++; + } + if ( doflush ) { + ad_flush( ofork->of_ad ); + } + } + } + ret = 0; + if ( ad_close( ofork->of_ad, adflags ) < 0 ) { + ret = -1; + } + + of_dealloc( ofork ); + return ret; +} + +/* ---------------------- + +*/ +struct adouble *of_ad(const struct vol *vol, struct path *path, struct adouble *ad) +{ + struct ofork *of; + struct adouble *adp; + + if ((of = of_findname(path))) { + adp = of->of_ad; + } else { + ad_init(ad, vol->v_adouble, vol->v_ad_options); + adp = ad; + } + return adp; +} + +/* ---------------------- + close all forks for a volume +*/ +void of_closevol(const struct vol *vol) +{ + int refnum; + + if (!oforks) + return; + + for ( refnum = 0; refnum < nforks; refnum++ ) { + if (oforks[ refnum ] != NULL && oforks[refnum]->of_vol == vol) { + if (of_closefork( oforks[ refnum ]) < 0 ) { + LOG(log_error, logtype_afpd, "of_closevol: %s", strerror(errno) ); + } + } + } + return; +} +