X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fextattrs.c;h=a26c801a230c2163f22118595fa8688a115b8894;hb=f758a8c097b044293fa2fe58f8a7fcc2d8909b55;hp=7748480aa3686801a2c4858453ba5cfd8c41161d;hpb=6dcaba1d633e3cfa96243c62ad8399f7e5558c48;p=netatalk.git diff --git a/etc/afpd/extattrs.c b/etc/afpd/extattrs.c index 7748480a..a26c801a 100644 --- a/etc/afpd/extattrs.c +++ b/etc/afpd/extattrs.c @@ -1,5 +1,5 @@ /* - $Id: extattrs.c,v 1.4 2009-10-02 09:32:40 franklahm Exp $ + $Id: extattrs.c,v 1.9 2009-10-22 12:35:38 franklahm Exp $ Copyright (c) 2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -72,18 +72,22 @@ static void hexdump(void *m, size_t l) { EA names, secondly it wants these names. In order to avoid scanning EAs twice we cache them in a static buffer. */ -int afp_listextattr(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf, int *rbuflen) +int afp_listextattr(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { - int count, ret, oflag = 0; - uint16_t vid, bitmap; + int ret, oflag = 0, adflags = 0; + uint16_t vid, bitmap, uint16; uint32_t did, maxreply, tmpattr; struct vol *vol; struct dir *dir; struct path *s_path; + struct stat st; struct adouble ad, *adp = NULL; struct ofork *of; char *uname, *FinderInfo; - static int buf_valid = 0, attrbuflen = 0; + char emptyFinderInfo[32] = { 0 }; + + static int buf_valid = 0; + static size_t attrbuflen = 0; *rbuflen = 0; ibuf += 2; @@ -145,7 +149,11 @@ int afp_listextattr(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf, int *r adp = &ad; } - if ( ad_metadata( uname, 0, adp) < 0 ) { + stat(uname, &st); + if (S_ISDIR(st.st_mode)) + adflags = ADFLAGS_DIR; + + if ( ad_metadata( uname, adflags, adp) < 0 ) { switch (errno) { case EACCES: LOG(log_error, logtype_afpd, "afp_listextattr(%s): %s: check resource fork permission?", @@ -158,21 +166,24 @@ int afp_listextattr(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf, int *r } FinderInfo = ad_entry(adp, ADEID_FINDERI); + #ifdef DEBUG - LOG(log_debug9, logtype_afpd, "afp_listextattr(%s): FinderInfo:", uname); + LOG(log_maxdebug, logtype_afpd, "afp_listextattr(%s): FinderInfo:", uname); hexdump( FinderInfo, 32); #endif - /* Now scan FinderInfo if its all 0 */ - count = 32; - while (count--) { - if (*FinderInfo++) { - /* FinderInfo contains some non 0 bytes -> include "com.apple.FinderInfo" */ - strcpy(attrnamebuf, ea_finderinfo); - attrbuflen += strlen(ea_finderinfo) + 1; - LOG(log_debug7, logtype_afpd, "afp_listextattr(%s): sending com.apple.FinderInfo", uname); - break; - } + if ((adflags & ADFLAGS_DIR)) { + /* set default view */ + uint16 = htons(FINDERINFO_CLOSEDVIEW); + memcpy(emptyFinderInfo + FINDERINFO_FRVIEWOFF, &uint16, 2); + } + + /* Check if FinderInfo equals default and empty FinderInfo*/ + if ((memcmp(FinderInfo, emptyFinderInfo, 32)) != 0) { + /* FinderInfo contains some non 0 bytes -> include "com.apple.FinderInfo" */ + strcpy(attrnamebuf, ea_finderinfo); + attrbuflen += strlen(ea_finderinfo) + 1; + LOG(log_debug7, logtype_afpd, "afp_listextattr(%s): sending com.apple.FinderInfo", uname); } /* Now check for Ressource fork and add virtual EA "com.apple.ResourceFork" if size > 0 */ @@ -183,7 +194,7 @@ int afp_listextattr(AFPObj *obj, char *ibuf, int ibuflen _U_, char *rbuf, int *r attrbuflen += strlen(ea_resourcefork) + 1; } - ret = vol->vfs->list_eas(vol, attrnamebuf, &attrbuflen, uname, oflag); + ret = vol->vfs->vfs_ea_list(vol, attrnamebuf, &attrbuflen, uname, oflag); switch (ret) { case AFPERR_BADTYPE: @@ -231,7 +242,7 @@ exit: return ret; } -int afp_getextattr(AFPObj *obj _U_, char *ibuf, int ibuflen _U_, char *rbuf, int *rbuflen) +int afp_getextattr(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { int ret, oflag = 0; uint16_t vid, bitmap; @@ -319,14 +330,14 @@ int afp_getextattr(AFPObj *obj _U_, char *ibuf, int ibuflen _U_, char *rbuf, int if its non 0 we must return the attribute. */ if (maxreply == 0) - ret = vol->vfs->get_easize(vol, rbuf, rbuflen, s_path->u_name, oflag, attruname); + ret = vol->vfs->vfs_ea_getsize(vol, rbuf, rbuflen, s_path->u_name, oflag, attruname); else - ret = vol->vfs->get_eacontent(vol, rbuf, rbuflen, s_path->u_name, oflag, attruname, maxreply); + ret = vol->vfs->vfs_ea_getcontent(vol, rbuf, rbuflen, s_path->u_name, oflag, attruname, maxreply); return ret; } -int afp_setextattr(AFPObj *obj _U_, char *ibuf, int ibuflen _U_, char *rbuf, int *rbuflen) +int afp_setextattr(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { int oflag = O_CREAT | O_WRONLY, ret; uint16_t vid, bitmap; @@ -409,12 +420,12 @@ int afp_setextattr(AFPObj *obj _U_, char *ibuf, int ibuflen _U_, char *rbuf, int LOG(log_debug, logtype_afpd, "afp_setextattr(%s): EA: %s, size: %u", s_path->u_name, attrmname, attrsize); - ret = vol->vfs->set_ea(vol, s_path->u_name, attruname, ibuf, attrsize, oflag); + ret = vol->vfs->vfs_ea_set(vol, s_path->u_name, attruname, ibuf, attrsize, oflag); return ret; } -int afp_remextattr(AFPObj *obj _U_, char *ibuf, int ibuflen _U_, char *rbuf, int *rbuflen) +int afp_remextattr(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { int oflag = O_RDONLY, ret; uint16_t vid, bitmap; @@ -481,7 +492,7 @@ int afp_remextattr(AFPObj *obj _U_, char *ibuf, int ibuflen _U_, char *rbuf, int LOG(log_debug, logtype_afpd, "afp_remextattr(%s): EA: %s", s_path->u_name, attrmname); - ret = vol->vfs->remove_ea(vol, s_path->u_name, attruname, oflag); + ret = vol->vfs->vfs_ea_remove(vol, s_path->u_name, attruname, oflag); return ret; }