/*
- $Id: extattrs.c,v 1.5 2009-10-14 15:04:00 franklahm Exp $
+ $Id: extattrs.c,v 1.10 2009-10-22 13:40:11 franklahm Exp $
Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
This program is free software; you can redistribute it and/or modify
/* This should be big enough to consecutively store the names of all attributes */
static char attrnamebuf[ATTRNAMEBUFSIZ];
+#ifdef DEBUG
static void hexdump(void *m, size_t l) {
char *p = m;
int count = 0, len;
}
}
}
+#endif
/***************************************
* AFP funcs
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;
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?",
}
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 */
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;
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;
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;