X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fofork.c;h=75f89eba038646a86f822f2248b7930fe01896e8;hp=2925977c2705d266c4a36a583571ad615f29cd56;hb=1b20936596f89b2706f1122ca2fabad6ffe00c98;hpb=b379fad7481bf63c88619334a45e88611a4d08fa diff --git a/etc/afpd/ofork.c b/etc/afpd/ofork.c index 2925977c..75f89eba 100644 --- a/etc/afpd/ofork.c +++ b/etc/afpd/ofork.c @@ -1,5 +1,5 @@ /* - * $Id: ofork.c,v 1.19 2002-09-06 02:57:49 didg Exp $ + * $Id: ofork.c,v 1.30.2.1 2010-01-02 10:22:32 franklahm Exp $ * * Copyright (c) 1996 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -11,13 +11,16 @@ #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" @@ -35,7 +38,7 @@ static u_short lastrefnum = 0; /* OR some of each character for the hash*/ -static __inline__ unsigned long hashfn(const struct file_key *key) +static unsigned long hashfn(const struct file_key *key) { #if 0 unsigned long i = 0; @@ -46,7 +49,7 @@ static __inline__ unsigned long hashfn(const struct file_key *key) return key->inode & (OFORK_HASHSIZE - 1); } -static __inline__ void of_hash(struct ofork *of) +static void of_hash(struct ofork *of) { struct ofork **table; @@ -57,7 +60,7 @@ static __inline__ void of_hash(struct ofork *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) @@ -66,8 +69,8 @@ static __inline__ void of_unhash(struct ofork *of) } } -void of_pforkdesc( f ) -FILE *f; +#ifdef DEBUG1 +void of_pforkdesc( FILE *f) { int ofrefnum; @@ -76,10 +79,11 @@ FILE *f; 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) { @@ -97,13 +101,14 @@ int of_flush(const struct vol *vol) return( 0 ); } -int of_rename(vol, s_of, olddir, oldpath, newdir, newpath) -const struct vol *vol; -struct ofork *s_of; -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; if (!s_of) return AFP_OK; @@ -115,7 +120,10 @@ const char *oldpath, *newpath; if (vol == of->of_vol && olddir == of->of_dir && s_of->key.dev == of->key.dev && s_of->key.inode == of->key.inode ) { - strncpy( 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; @@ -142,14 +150,13 @@ const char *oldpath, *newpath; #define min(a,b) ((a)<(b)?(a):(b)) struct ofork * - of_alloc(vol, dir, path, ofrefnum, eid, ad, st) -struct vol *vol; -struct dir *dir; -char *path; -u_int16_t *ofrefnum; -const int eid; -struct adouble *ad; -struct stat *st; +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; @@ -157,7 +164,7 @@ struct stat *st; 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 *)); @@ -210,12 +217,27 @@ struct stat *st; 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. */ @@ -223,7 +245,6 @@ struct stat *st; } of->of_ad = ad; - of->of_vol = vol; of->of_dir = dir; @@ -237,18 +258,6 @@ struct stat *st; 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; - } - strncpy( of->of_name, path, of->of_namelen = 255 + 1); *ofrefnum = refnum; of->of_refnum = refnum; of->key.dev = st->st_dev; @@ -270,23 +279,67 @@ struct ofork *of_find(const u_int16_t ofrefnum ) return( oforks[ ofrefnum % nforks ] ); } -/* -------------------------- +/* -------------------------- */ +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; +} + +/* -------------------------- + 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(const char *name, struct stat *st) + of_findname(struct path *path) { struct ofork *of; struct file_key key; - struct stat buffer; - char *p; - if (st == NULL) { - st = &buffer; - if (stat(name, st) < 0) - return NULL; + if (!path->st_valid) { + of_stat(path); } - key.dev = st->st_dev; - key.inode = st->st_ino; + + 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 ) { @@ -297,8 +350,7 @@ struct ofork * return NULL; } -void of_dealloc( of ) -struct ofork *of; +void of_dealloc( struct ofork *of) { if (!oforks) return; @@ -313,12 +365,12 @@ struct ofork *of; } 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); @@ -326,3 +378,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; +} +