X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffile.c;h=c24d296b2f1049c76c6407267d6410847e7564cb;hb=edf01c724768d494e522ec84380e8e49b37a2bd6;hp=ce2ab545efd90edb12b869e7c4dfd80a0c3c230c;hpb=3399095adaa5fad2ec2c7fbbed1de9222106da59;p=netatalk.git diff --git a/etc/afpd/file.c b/etc/afpd/file.c index ce2ab545..c24d296b 100644 --- a/etc/afpd/file.c +++ b/etc/afpd/file.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "directory.h" #include "dircache.h" @@ -118,7 +119,7 @@ char *set_name(const struct vol *vol, char *data, cnid_t pid, char *name, cnid_t if (!utf8) { /* want mac name */ - if (utf8_encoding()) { + if (utf8_encoding(vol->v_obj)) { /* but name is an utf8 mac name */ char *u, *m; @@ -274,10 +275,11 @@ exit: } /* -------------------------- */ -int getmetadata(struct vol *vol, - uint16_t bitmap, - struct path *path, struct dir *dir, - char *buf, size_t *buflen, struct adouble *adp) +int getmetadata(const AFPObj *obj, + struct vol *vol, + uint16_t bitmap, + struct path *path, struct dir *dir, + char *buf, size_t *buflen, struct adouble *adp) { char *data, *l_nameoff = NULL, *upath; char *utf_nameoff = NULL; @@ -297,7 +299,7 @@ int getmetadata(struct vol *vol, data = buf; if ( ((bitmap & ( (1 << FILPBIT_FINFO)|(1 << FILPBIT_LNAME)|(1 <m_name) - || (bitmap & ( (1 << FILPBIT_LNAME) ) && utf8_encoding()) /* FIXME should be m_name utf8 filename */ + || (bitmap & ( (1 << FILPBIT_LNAME) ) && utf8_encoding(obj)) /* FIXME should be m_name utf8 filename */ || (bitmap & (1 << FILPBIT_FNUM))) { if (!path->id) { bstring fullpath; @@ -314,7 +316,7 @@ int getmetadata(struct vol *vol, /* Get macname from unixname first */ if (path->m_name == NULL) { - if ((path->m_name = utompath(vol, upath, id, utf8_encoding())) == NULL) { + if ((path->m_name = utompath(vol, upath, id, utf8_encoding(obj))) == NULL) { LOG(log_error, logtype_afpd, "getmetadata: utompath error"); return AFPERR_MISC; } @@ -346,7 +348,7 @@ int getmetadata(struct vol *vol, return afp_errno; if (!path->m_name) { - path->m_name = utompath(vol, upath, id, utf8_encoding()); + path->m_name = utompath(vol, upath, id, utf8_encoding(vol->v_obj)); } } while ( bitmap != 0 ) { @@ -465,7 +467,7 @@ int getmetadata(struct vol *vol, to "pXYZ" when we created it. See IA, Ver 2. */ case FILPBIT_PDINFO : - if (afp_version >= 30) { /* UTF8 name */ + if (obj->afp_version >= 30) { /* UTF8 name */ utf8 = kTextEncodingUTF8; utf_nameoff = data; data += sizeof( uint16_t ); @@ -536,7 +538,7 @@ int getmetadata(struct vol *vol, break; case FILPBIT_UNIXPR : /* accessmode may change st_mode with ACLs */ - accessmode(vol, upath, &ma, dir , st); + accessmode(obj, vol, upath, &ma, dir , st); aint = htonl(st->st_uid); memcpy( data, &aint, sizeof( aint )); @@ -589,7 +591,8 @@ int getmetadata(struct vol *vol, } /* ----------------------- */ -int getfilparams(struct vol *vol, +int getfilparams(const AFPObj *obj, + struct vol *vol, uint16_t bitmap, struct path *path, struct dir *dir, char *buf, size_t *buflen ) @@ -627,7 +630,7 @@ int getfilparams(struct vol *vol, } } } - rc = getmetadata(vol, bitmap, path, dir, buf, buflen, adp); + rc = getmetadata(obj, vol, bitmap, path, dir, buf, buflen, adp); ad_close(adp, ADFLAGS_HF | flags); return( rc ); @@ -784,7 +787,7 @@ int afp_setfilparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ ibuf++; } - if (AFP_OK == ( rc = setfilparams(vol, s_path, bitmap, ibuf )) ) { + if (AFP_OK == ( rc = setfilparams(obj, vol, s_path, bitmap, ibuf )) ) { setvoltime(obj, vol ); } @@ -797,7 +800,7 @@ int afp_setfilparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ */ extern struct path Cur_Path; -int setfilparams(struct vol *vol, +int setfilparams(const AFPObj *obj, struct vol *vol, struct path *path, uint16_t f_bitmap, char *buf ) { struct adouble ad, *adp; @@ -828,7 +831,7 @@ int setfilparams(struct vol *vol, adp = of_ad(vol, path, &ad); upath = path->u_name; - if (!vol_unix_priv(vol) && check_access(upath, OPENACC_WR ) < 0) { + if (!vol_unix_priv(vol) && check_access(obj, vol, upath, OPENACC_WR ) < 0) { return AFPERR_ACCESS; } @@ -916,7 +919,7 @@ int setfilparams(struct vol *vol, } break; case FILPBIT_PDINFO : - if (afp_version < 30) { /* else it's UTF8 name */ + if (obj->afp_version < 30) { /* else it's UTF8 name */ achar = *buf; buf += 2; /* Keep special case to support crlf translations */ @@ -1001,7 +1004,7 @@ int setfilparams(struct vol *vol, } break; case FILPBIT_PDINFO : - if (afp_version < 30) { /* else it's UTF8 name */ + if (obj->afp_version < 30) { /* else it's UTF8 name */ memcpy(ad_entry( adp, ADEID_FINDERI ), fdType, 4 ); memcpy(ad_entry( adp, ADEID_FINDERI ) + 4, "pdos", 4 ); break; @@ -1145,14 +1148,14 @@ size_t plen = 0; uint16_t len16; uint32_t hint; - if ( type != 2 && !(afp_version >= 30 && type == 3) ) { + if ( type != 2 && !(vol->v_obj->afp_version >= 30 && type == 3) ) { return -1; } ibuf++; switch (type) { case 2: if (( plen = (unsigned char)*ibuf++ ) != 0 ) { - if (afp_version >= 30) { + if (vol->v_obj->afp_version >= 30) { /* convert it to UTF8 */ if ((plen = mtoUTF8(vol, ibuf, plen, newname, AFPOBJ_TMPSIZ)) == (size_t)-1) @@ -1296,7 +1299,7 @@ int afp_copyfile(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, si /* newname is always only a filename so curdir *is* its * parent folder */ - if (NULL == (upath = mtoupath(d_vol, newname, curdir->d_did, utf8_encoding()))) { + if (NULL == (upath = mtoupath(d_vol, newname, curdir->d_did, utf8_encoding(d_vol->v_obj)))) { retvalue =AFPERR_PARAM; goto copy_exit; } @@ -1673,7 +1676,7 @@ reenumerate_id(struct vol *vol, char *name, struct dir *dir) /* ------------------------------ resolve a file id */ -int afp_resolveid(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) +int afp_resolveid(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { struct vol *vol; struct dir *dir; @@ -1759,17 +1762,17 @@ retry: /* directories are bad */ if (S_ISDIR(path.st.st_mode)) { /* OS9 and OSX don't return the same error code */ - return (afp_version >=30)?AFPERR_NOID:AFPERR_BADTYPE; + return (obj->afp_version >=30)?AFPERR_NOID:AFPERR_BADTYPE; } memcpy(&bitmap, ibuf, sizeof(bitmap)); bitmap = ntohs( bitmap ); - if (NULL == (path.m_name = utompath(vol, upath, cnid, utf8_encoding()))) { + if (NULL == (path.m_name = utompath(vol, upath, cnid, utf8_encoding(obj)))) { return AFPERR_NOID; } path.id = cnid; - if (AFP_OK != (err = getfilparams(vol, bitmap, &path , curdir, - rbuf + sizeof(bitmap), &buflen))) { + if (AFP_OK != (err = getfilparams(obj, vol, bitmap, &path , curdir, + rbuf + sizeof(bitmap), &buflen))) { return err; } *rbuflen = buflen + sizeof(bitmap); @@ -1862,7 +1865,7 @@ delete: } /* ------------------------------ */ -static struct adouble *find_adouble(struct path *path, struct ofork **of, struct adouble *adp) +static struct adouble *find_adouble(const AFPObj *obj, struct vol *vol, struct path *path, struct ofork **of, struct adouble *adp) { int ret; @@ -1884,7 +1887,7 @@ static struct adouble *find_adouble(struct path *path, struct ofork **of, struct /* we use file_access both for legacy Mac perm and * for unix privilege, rename will take care of folder perms */ - if (file_access(path, OPENACC_WR ) < 0) { + if (file_access(obj, vol, path, OPENACC_WR ) < 0) { afp_errno = AFPERR_ACCESS; return NULL; } @@ -1980,7 +1983,7 @@ int afp_exchangefiles(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U } ad_init(&ads, vol); - if (!(adsp = find_adouble( path, &s_of, &ads))) { + if (!(adsp = find_adouble(obj, vol, path, &s_of, &ads))) { return afp_errno; } @@ -2013,7 +2016,7 @@ int afp_exchangefiles(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U } ad_init(&add, vol); - if (!(addp = find_adouble( path, &d_of, &add))) { + if (!(addp = find_adouble(obj, vol, path, &d_of, &add))) { err = afp_errno; goto err_exchangefile; }