X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.c;h=577a425484db00c3c237eec1ed67f02a1afc5b25;hb=9d78f9b52ea18b442fc91c6a1e8d8b607f2f90e8;hp=63cdbf1118a45fd76783faf171ae7e113765214d;hpb=e21ea25e5f251a9cc9ae58769c1e7293a265d4c5;p=netatalk.git diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c index 63cdbf11..577a4254 100644 --- a/etc/afpd/directory.c +++ b/etc/afpd/directory.c @@ -1,4 +1,6 @@ /* + * $Id: directory.c,v 1.71.2.4.2.15.2.10 2008-11-25 15:16:32 didg Exp $ + * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * @@ -8,47 +10,61 @@ #ifdef HAVE_CONFIG_H #include "config.h" +#endif /* HAVE_CONFIG_H */ + +/* STDC check */ +#if STDC_HEADERS +#include +#else /* STDC_HEADERS */ +#ifndef HAVE_STRCHR +#define strchr index +#define strrchr index +#endif /* HAVE_STRCHR */ +char *strchr (), *strrchr (); +#ifndef HAVE_MEMCPY +#define memcpy(d,s,n) bcopy ((s), (d), (n)) +#define memmove(d,s,n) bcopy ((s), (d), (n)) +#endif /* ! HAVE_MEMCPY */ +#endif /* STDC_HEADERS */ +#ifdef HAVE_STRINGS_H +#include #endif +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include #include -#include +#include +#include #include + #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include "directory.h" #include "desktop.h" #include "volume.h" #include "fork.h" #include "file.h" +#include "filedir.h" #include "globals.h" #include "unix.h" - -#ifdef FORCE_UIDGID -#include "uid.h" -#endif FORCE_UIDGID +#include "mangle.h" struct dir *curdir; +int afp_errno; #define SENTINEL (&sentinel) static struct dir sentinel = { SENTINEL, SENTINEL, NULL, DIRTREE_COLOR_BLACK, - NULL, NULL, NULL, NULL, NULL, 0, 0, NULL }; -static struct dir rootpar = { SENTINEL, SENTINEL, NULL, 0, - NULL, NULL, NULL, NULL, NULL, 0, 0, NULL }; + NULL, NULL, NULL, NULL, NULL, 0, 0, + 0, 0, NULL, NULL}; +static struct dir rootpar = { SENTINEL, SENTINEL, NULL, 0, + NULL, NULL, NULL, NULL, NULL, 0, 0, + 0, 0, NULL, NULL}; /* (from IM: Toolbox Essentials) * dirFinderInfo (DInfo) fields: @@ -71,291 +87,462 @@ static struct dir rootpar = { SENTINEL, SENTINEL, NULL, 0, * redid did assignment for directories. now we use red-black trees. * how exciting. */ - struct dir * -dirsearch( vol, did ) - const struct vol *vol; - u_int32_t did; +struct dir * + dirsearch( vol, did ) + const struct vol *vol; +u_int32_t did; { struct dir *dir; - + /* check for 0 did */ - if (!did) + if (!did) { + afp_errno = AFPERR_PARAM; return NULL; - + } if ( did == DIRDID_ROOT_PARENT ) { if (!rootpar.d_did) - rootpar.d_did = DIRDID_ROOT_PARENT; - rootpar.d_child = vol->v_dir; - return( &rootpar ); + rootpar.d_did = DIRDID_ROOT_PARENT; + rootpar.d_child = vol->v_dir; + return( &rootpar ); } dir = vol->v_root; + afp_errno = AFPERR_NOOBJ; while ( dir != SENTINEL ) { - if (dir->d_did == did) - return dir->d_name ? dir : NULL; - dir = (dir->d_did > did) ? dir->d_left : dir->d_right; + if (dir->d_did == did) + return dir->d_m_name ? dir : NULL; + dir = (dir->d_did > did) ? dir->d_left : dir->d_right; } return NULL; } +/* ------------------- */ +#ifdef ATACC +int path_isadir(struct path *o_path) +{ + return o_path->d_dir != NULL; +#if 0 + return o_path->m_name == '\0' || /* we are in a it */ + !o_path->st_valid || /* in cache but we can't chdir in it */ + (!o_path->st_errno && S_ISDIR(o_path->st.st_mode)); /* not in cache an can't chdir */ +#endif +} +#endif + +int get_afp_errno(const int param) +{ + if (afp_errno != AFPERR_DID1) + return afp_errno; + return param; +} + +/* ------------------- */ +struct dir * + dirsearch_byname( cdir, name ) + struct dir *cdir; + const char *name; +{ +struct dir *dir; + + if (!strcmp(name, ".")) + return cdir; + dir = cdir->d_child; + while (dir) { + if ( strcmp( dir->d_u_name, name ) == 0 ) { + break; + } + dir = (dir == cdir->d_child->d_prev) ? NULL : dir->d_next; + } + return dir; +} + +/* ----------------------------------------- + * if did is not in the cache resolve it with cnid + * + * FIXME + * OSX call it with bogus id, ie file ID not folder ID, + * and we are really bad in this case. + */ +struct dir * + dirlookup( vol, did ) + const struct vol *vol; +u_int32_t did; +{ + struct dir *ret; + char *upath; + cnid_t id, cnid; + static char path[MAXPATHLEN + 1]; + size_t len, pathlen; + char *ptr; + static char buffer[12 + MAXPATHLEN + 1]; + int buflen = 12 + MAXPATHLEN + 1; + char *mpath; + int utf8; + size_t maxpath; + + ret = dirsearch(vol, did); + if (ret != NULL || afp_errno == AFPERR_PARAM) + return ret; + + utf8 = utf8_encoding(); + maxpath = (utf8)?MAXPATHLEN -7:255; + id = did; + if (NULL == (upath = cnid_resolve(vol->v_cdb, &id, buffer, buflen)) ) { + afp_errno = AFPERR_NOOBJ; + return NULL; + } + ptr = path + MAXPATHLEN; + if (NULL == ( mpath = utompath(vol, upath, did, utf8) ) ) { + afp_errno = AFPERR_NOOBJ; + return NULL; + } + len = strlen(mpath); + pathlen = len; /* no 0 in the last part */ + len++; + strcpy(ptr - len, mpath); + ptr -= len; + while (1) { + ret = dirsearch(vol,id); + if (ret != NULL) { + break; + } + cnid = id; + if ( NULL == (upath = cnid_resolve(vol->v_cdb, &id, buffer, buflen)) + || + NULL == (mpath = utompath(vol, upath, cnid, utf8)) + ) { + afp_errno = AFPERR_NOOBJ; + return NULL; + } + + len = strlen(mpath) + 1; + pathlen += len; + if (pathlen > maxpath) { + afp_errno = AFPERR_PARAM; + return NULL; + } + strcpy(ptr - len, mpath); + ptr -= len; + } + + /* fill the cache, another place where we know about the path type */ + if (utf8) { + u_int16_t temp16; + u_int32_t temp; + + ptr -= 2; + temp16 = htons(pathlen); + memcpy(ptr, &temp16, sizeof(temp16)); + + temp = htonl(kTextEncodingUTF8); + ptr -= 4; + memcpy(ptr, &temp, sizeof(temp)); + ptr--; + *ptr = 3; + } + else { + ptr--; + *ptr = (unsigned char)pathlen; + ptr--; + *ptr = 2; + } + /* cname is not efficient */ + if (cname( vol, ret, &ptr ) == NULL ) + return NULL; + + return dirsearch(vol, did); +} +/* --------------------------- */ /* rotate the tree to the left */ static void dir_leftrotate(vol, dir) - struct vol *vol; - struct dir *dir; +struct vol *vol; +struct dir *dir; { struct dir *right = dir->d_right; /* whee. move the right's left tree into dir's right tree */ - dir->d_right = right->d_left; + dir->d_right = right->d_left; if (right->d_left != SENTINEL) - right->d_left->d_back = dir; + right->d_left->d_back = dir; if (right != SENTINEL) { - right->d_back = dir->d_back; - right->d_left = dir; + right->d_back = dir->d_back; + right->d_left = dir; } if (!dir->d_back) /* no parent. move the right tree to the top. */ - vol->v_root = right; + vol->v_root = right; else if (dir == dir->d_back->d_left) /* we were on the left */ - dir->d_back->d_left = right; + dir->d_back->d_left = right; else - dir->d_back->d_right = right; /* we were on the right */ - + dir->d_back->d_right = right; /* we were on the right */ + /* re-insert dir on the left tree */ if (dir != SENTINEL) - dir->d_back = right; + dir->d_back = right; } /* rotate the tree to the right */ static void dir_rightrotate(vol, dir) - struct vol *vol; - struct dir *dir; +struct vol *vol; +struct dir *dir; { struct dir *left = dir->d_left; /* whee. move the left's right tree into dir's left tree */ - dir->d_left = left->d_right; + dir->d_left = left->d_right; if (left->d_right != SENTINEL) - left->d_right->d_back = dir; + left->d_right->d_back = dir; if (left != SENTINEL) { - left->d_back = dir->d_back; - left->d_right = dir; + left->d_back = dir->d_back; + left->d_right = dir; } if (!dir->d_back) /* no parent. move the left tree to the top. */ - vol->v_root = left; + vol->v_root = left; else if (dir == dir->d_back->d_right) /* we were on the right */ - dir->d_back->d_right = left; + dir->d_back->d_right = left; else - dir->d_back->d_left = left; /* we were on the left */ - + dir->d_back->d_left = left; /* we were on the left */ + /* re-insert dir on the right tree */ if (dir != SENTINEL) - dir->d_back = left; + dir->d_back = left; } +#if 0 /* recolor after a removal */ static struct dir *dir_rmrecolor(vol, dir) - struct vol *vol; - struct dir *dir; + struct vol *vol; +struct dir *dir; { - struct dir *leaf; - - while ((dir != vol->v_root) && (dir->d_color == DIRTREE_COLOR_BLACK)) { - /* are we on the left tree? */ - if (dir == dir->d_back->d_left) { - leaf = dir->d_back->d_right; /* get right side */ - if (leaf->d_color == DIRTREE_COLOR_RED) { - /* we're red. we need to change to black. */ - leaf->d_color = DIRTREE_COLOR_BLACK; - dir->d_back->d_color = DIRTREE_COLOR_RED; - dir_leftrotate(vol, dir->d_back); - leaf = dir->d_back->d_right; - } - - /* right leaf has black end nodes */ - if ((leaf->d_left->d_color == DIRTREE_COLOR_BLACK) && - (leaf->d_right->d_color = DIRTREE_COLOR_BLACK)) { - leaf->d_color = DIRTREE_COLOR_RED; /* recolor leaf as red */ - dir = dir->d_back; /* ascend */ - } else { - if (leaf->d_right->d_color == DIRTREE_COLOR_BLACK) { - leaf->d_left->d_color = DIRTREE_COLOR_BLACK; - leaf->d_color = DIRTREE_COLOR_RED; - dir_rightrotate(vol, leaf); - leaf = dir->d_back->d_right; - } - leaf->d_color = dir->d_back->d_color; - dir->d_back->d_color = DIRTREE_COLOR_BLACK; - leaf->d_right->d_color = DIRTREE_COLOR_BLACK; - dir_leftrotate(vol, dir->d_back); - dir = vol->v_root; - } - } else { /* right tree */ - leaf = dir->d_back->d_left; /* left tree */ - if (leaf->d_color == DIRTREE_COLOR_RED) { - leaf->d_color = DIRTREE_COLOR_BLACK; - dir->d_back->d_color = DIRTREE_COLOR_RED; - dir_rightrotate(vol, dir->d_back); - leaf = dir->d_back->d_left; - } - - /* left leaf has black end nodes */ - if ((leaf->d_right->d_color == DIRTREE_COLOR_BLACK) && - (leaf->d_left->d_color = DIRTREE_COLOR_BLACK)) { - leaf->d_color = DIRTREE_COLOR_RED; /* recolor leaf as red */ - dir = dir->d_back; /* ascend */ - } else { - if (leaf->d_left->d_color == DIRTREE_COLOR_BLACK) { - leaf->d_right->d_color = DIRTREE_COLOR_BLACK; - leaf->d_color = DIRTREE_COLOR_RED; - dir_leftrotate(vol, leaf); - leaf = dir->d_back->d_left; - } - leaf->d_color = dir->d_back->d_color; - dir->d_back->d_color = DIRTREE_COLOR_BLACK; - leaf->d_left->d_color = DIRTREE_COLOR_BLACK; - dir_rightrotate(vol, dir->d_back); - dir = vol->v_root; - } - } - } - dir->d_color = DIRTREE_COLOR_BLACK; + struct dir *leaf; + + while ((dir != vol->v_root) && (dir->d_color == DIRTREE_COLOR_BLACK)) { + /* are we on the left tree? */ + if (dir == dir->d_back->d_left) { + leaf = dir->d_back->d_right; /* get right side */ + if (leaf->d_color == DIRTREE_COLOR_RED) { + /* we're red. we need to change to black. */ + leaf->d_color = DIRTREE_COLOR_BLACK; + dir->d_back->d_color = DIRTREE_COLOR_RED; + dir_leftrotate(vol, dir->d_back); + leaf = dir->d_back->d_right; + } + + /* right leaf has black end nodes */ + if ((leaf->d_left->d_color == DIRTREE_COLOR_BLACK) && + (leaf->d_right->d_color = DIRTREE_COLOR_BLACK)) { + leaf->d_color = DIRTREE_COLOR_RED; /* recolor leaf as red */ + dir = dir->d_back; /* ascend */ + } else { + if (leaf->d_right->d_color == DIRTREE_COLOR_BLACK) { + leaf->d_left->d_color = DIRTREE_COLOR_BLACK; + leaf->d_color = DIRTREE_COLOR_RED; + dir_rightrotate(vol, leaf); + leaf = dir->d_back->d_right; + } + leaf->d_color = dir->d_back->d_color; + dir->d_back->d_color = DIRTREE_COLOR_BLACK; + leaf->d_right->d_color = DIRTREE_COLOR_BLACK; + dir_leftrotate(vol, dir->d_back); + dir = vol->v_root; + } + } else { /* right tree */ + leaf = dir->d_back->d_left; /* left tree */ + if (leaf->d_color == DIRTREE_COLOR_RED) { + leaf->d_color = DIRTREE_COLOR_BLACK; + dir->d_back->d_color = DIRTREE_COLOR_RED; + dir_rightrotate(vol, dir->d_back); + leaf = dir->d_back->d_left; + } + + /* left leaf has black end nodes */ + if ((leaf->d_right->d_color == DIRTREE_COLOR_BLACK) && + (leaf->d_left->d_color = DIRTREE_COLOR_BLACK)) { + leaf->d_color = DIRTREE_COLOR_RED; /* recolor leaf as red */ + dir = dir->d_back; /* ascend */ + } else { + if (leaf->d_left->d_color == DIRTREE_COLOR_BLACK) { + leaf->d_right->d_color = DIRTREE_COLOR_BLACK; + leaf->d_color = DIRTREE_COLOR_RED; + dir_leftrotate(vol, leaf); + leaf = dir->d_back->d_left; + } + leaf->d_color = dir->d_back->d_color; + dir->d_back->d_color = DIRTREE_COLOR_BLACK; + leaf->d_left->d_color = DIRTREE_COLOR_BLACK; + dir_rightrotate(vol, dir->d_back); + dir = vol->v_root; + } + } + } + dir->d_color = DIRTREE_COLOR_BLACK; + + return dir; } +#endif /* 0 */ /* remove the node from the tree. this is just like insertion, but * different. actually, it has to worry about a bunch of things that * insertion doesn't care about. */ -static void dir_remove( vol, dir ) - struct vol *vol; - struct dir *dir; +static void dir_remove( const struct vol *vol _U_, struct dir *dir) { #ifdef REMOVE_NODES struct ofork *of, *last; struct dir *node, *leaf; -#endif +#endif /* REMOVE_NODES */ if (!dir || (dir == SENTINEL)) return; -/* i'm not sure if it really helps to delete stuff. */ + /* i'm not sure if it really helps to delete stuff. */ #ifndef REMOVE_NODES - free(dir->d_name); - dir->d_name = NULL; -#else + dirfreename(dir); + dir->d_m_name = NULL; + dir->d_u_name = NULL; +#else /* ! REMOVE_NODES */ /* go searching for a node with at most one child */ if ((dir->d_left == SENTINEL) || (dir->d_right == SENTINEL)) { - node = dir; + node = dir; } else { - node = dir->d_right; - while (node->d_left != SENTINEL) - node = node->d_left; + node = dir->d_right; + while (node->d_left != SENTINEL) + node = node->d_left; } - + /* get that child */ leaf = (node->d_left != SENTINEL) ? node->d_left : node->d_right; /* detach node */ leaf->d_back = node->d_back; if (!node->d_back) { - vol->v_root = leaf; + vol->v_root = leaf; } else if (node == node->d_back->d_left) { /* left tree */ - node->d_back->d_left = leaf; + node->d_back->d_left = leaf; } else { - node->d_back->d_right = leaf; + node->d_back->d_right = leaf; } /* we want to free node, but we also want to free the data in dir. - * currently, that's d_name and the directory traversal bits. - * we just copy the necessary bits and then fix up all the - * various pointers to the directory. needless to say, there are - * a bunch of places that store the directory struct. */ + * currently, that's d_name and the directory traversal bits. + * we just copy the necessary bits and then fix up all the + * various pointers to the directory. needless to say, there are + * a bunch of places that store the directory struct. */ if (node != dir) { - struct dir save, *tmp; - - memcpy(&save, dir, sizeof(save)); - memcpy(dir, node, sizeof(struct dir)); - - /* restore the red-black bits */ - dir->d_left = save.d_left; - dir->d_right = save.d_right; - dir->d_back = save.d_back; - dir->d_color = save.d_color; - - if (node == vol->v_dir) {/* we may need to fix up this pointer */ - vol->v_dir = dir; - rootpar.d_child = vol->v_dir; - } else { - /* if we aren't the root directory, we have parents and - * siblings to worry about */ - if (dir->d_parent->d_child == node) - dir->d_parent->d_child = dir; - dir->d_next->d_prev = dir; - dir->d_prev->d_next = dir; - } - - /* fix up children. */ - tmp = dir->d_child; - while (tmp) { - tmp->d_parent = dir; - tmp = (tmp == dir->d_child->d_prev) ? NULL : tmp->d_next; - } - - if (node == curdir) /* another pointer to fixup */ - curdir = dir; - - /* we also need to fix up oforks. bleah */ - if ((of = dir->d_ofork)) { - last = of->of_d_prev; - while (of) { - of->of_dir = dir; - of = (last == of) ? NULL : of->of_d_next; - } - } - - /* set the node's d_name */ - node->d_name = save.d_name; + struct dir save, *tmp; + + memcpy(&save, dir, sizeof(save)); + memcpy(dir, node, sizeof(struct dir)); + + /* restore the red-black bits */ + dir->d_left = save.d_left; + dir->d_right = save.d_right; + dir->d_back = save.d_back; + dir->d_color = save.d_color; + + if (node == vol->v_dir) {/* we may need to fix up this pointer */ + vol->v_dir = dir; + rootpar.d_child = vol->v_dir; + } else { + /* if we aren't the root directory, we have parents and + * siblings to worry about */ + if (dir->d_parent->d_child == node) + dir->d_parent->d_child = dir; + dir->d_next->d_prev = dir; + dir->d_prev->d_next = dir; + } + + /* fix up children. */ + tmp = dir->d_child; + while (tmp) { + tmp->d_parent = dir; + tmp = (tmp == dir->d_child->d_prev) ? NULL : tmp->d_next; + } + + if (node == curdir) /* another pointer to fixup */ + curdir = dir; + + /* we also need to fix up oforks. bleah */ + if ((of = dir->d_ofork)) { + last = of->of_d_prev; + while (of) { + of->of_dir = dir; + of = (last == of) ? NULL : of->of_d_next; + } + } + + /* set the node's d_name */ + node->d_m_name = save.d_m_name; + node->d_u_name = save.d_u_name; } if (node->d_color == DIRTREE_COLOR_BLACK) - dir_rmrecolor(vol, leaf); - free(node->d_name); + dir_rmrecolor(vol, leaf); + + if (node->d_u_name != node->d_m_name) { + free(node->d_u_name); + } + free(node->d_m_name); free(node); -#endif +#endif /* ! REMOVE_NODES */ } +/* --------------------------------------- + * remove the node and its childs from the tree + * + * FIXME what about opened forks with refs to it? + * it's an afp specs violation because you can't delete + * an opened forks. Now afpd doesn't care about forks opened by other + * process. It's fixable within afpd if fnctl_lock, doable with smb and + * next to impossible for nfs and local filesystem access. + */ +static void dir_invalidate( vol, dir ) +const struct vol *vol; +struct dir *dir; +{ + if (curdir == dir) { + /* v_root can't be deleted */ + if (movecwd(vol, vol->v_root) < 0) { + LOG(log_error, logtype_afpd, "cname can't chdir to : %s", vol->v_root); + } + } + /* FIXME */ + dirchildremove(dir->d_parent, dir); + dir_remove( vol, dir ); +} +/* ------------------------------------ */ static struct dir *dir_insert(vol, dir) - const struct vol *vol; - struct dir *dir; + const struct vol *vol; +struct dir *dir; { struct dir *pdir; pdir = vol->v_root; while (pdir->d_did != dir->d_did ) { - if ( pdir->d_did > dir->d_did ) { - if ( pdir->d_left == SENTINEL ) { - pdir->d_left = dir; - dir->d_back = pdir; - return NULL; - } - pdir = pdir->d_left; - } else { - if ( pdir->d_right == SENTINEL ) { - pdir->d_right = dir; - dir->d_back = pdir; - return NULL; - } - pdir = pdir->d_right; - } + if ( pdir->d_did > dir->d_did ) { + if ( pdir->d_left == SENTINEL ) { + pdir->d_left = dir; + dir->d_back = pdir; + return NULL; + } + pdir = pdir->d_left; + } else { + if ( pdir->d_right == SENTINEL ) { + pdir->d_right = dir; + dir->d_back = pdir; + return NULL; + } + pdir = pdir->d_right; + } } return pdir; } @@ -365,182 +552,258 @@ static struct dir *dir_insert(vol, dir) * attempt to extend the current dir. tree to include path * as a side-effect, movecwd to that point and return the new dir */ - static struct dir * -extenddir( vol, dir, path ) - struct vol *vol; - struct dir *dir; - char *path; + extenddir( vol, dir, path ) +struct vol *vol; +struct dir *dir; +struct path *path; { - char *p; - struct stat st; + char *save_m_name; - p = mtoupath(vol, path ); - if ( stat( p, &st ) != 0 ) { - return( NULL ); + if ( path->u_name == NULL) { + path->u_name = mtoupath(vol, path->m_name, dir->d_did, (path->m_type==3) ); } - if (!S_ISDIR(st.st_mode)) { - return( NULL ); + path->d_dir = NULL; + + if ( path->u_name == NULL) { + afp_errno = AFPERR_PARAM; + return NULL; + } + if (of_stat( path ) != 0 ) { + return( NULL ); } - if (( dir = adddir( vol, dir, path, strlen( path ), p, strlen(p), - &st)) == NULL ) { - return( NULL ); + if (!S_ISDIR(path->st.st_mode)) { + return( NULL ); + } + + /* FIXME: if this is an AFP3 connection and path->m_type != 3 we might screw dircache here */ + if ( utf8_encoding() && path->m_type != 3) + { + save_m_name = path->m_name; + path->m_name = NULL; + if (( dir = adddir( vol, dir, path)) == NULL ) { + free(save_m_name); + return( NULL ); + } + path->m_name = save_m_name; + LOG(log_debug, logtype_afpd, "AFP3 connection, mismatch in mtype: %u, unix: %s, mac: %s", + path->m_type, path->u_name, path->m_name); + } + else { + if (( dir = adddir( vol, dir, path)) == NULL ) { + return( NULL ); + } } + path->d_dir = dir; if ( movecwd( vol, dir ) < 0 ) { - return( NULL ); + return( NULL ); } return( dir ); } -static int deletedir(char *dir) +/* ------------------- + system rmdir with afp error code. + ENOENT is not an error. + */ +static int netatalk_rmdir(const char *name) { - char path[MAXPATHLEN + 1]; - DIR *dp; - struct dirent *de; - struct stat st; - int len, err; - - if ((len = strlen(dir)) > sizeof(path)) - return AFPERR_PARAM; + if (rmdir(name) < 0) { + switch ( errno ) { + case ENOENT : + break; + case ENOTEMPTY : + return AFPERR_DIRNEMPT; + case EPERM: + case EACCES : + return AFPERR_ACCESS; + case EROFS: + return AFPERR_VLOCK; + default : + return AFPERR_PARAM; + } + } + return AFP_OK; +} + +/* ------------------------- + appledouble mkdir afp error code. +*/ +static int netatalk_mkdir(const char *name) +{ + if (ad_mkdir(name, DIRBITS | 0777) < 0) { + switch ( errno ) { + case ENOENT : + return( AFPERR_NOOBJ ); + case EROFS : + return( AFPERR_VLOCK ); + case EPERM: + case EACCES : + return( AFPERR_ACCESS ); + case EEXIST : + return( AFPERR_EXIST ); + case ENOSPC : + case EDQUOT : + return( AFPERR_DFULL ); + default : + return( AFPERR_PARAM ); + } + } + return AFP_OK; +} - /* already gone */ - if ((dp = opendir(dir)) == NULL) +/* ------------------- + system unlink with afp error code. + ENOENT is not an error. + */ +int netatalk_unlink(const char *name) +{ + if (unlink(name) < 0) { + switch (errno) { + case ENOENT : + break; + case EROFS: + return AFPERR_VLOCK; + case EPERM: + case EACCES : + return AFPERR_ACCESS; + default : + return AFPERR_PARAM; + } + } return AFP_OK; +} - strcpy(path, dir); - strcat(path, "/"); - len++; - while ((de = readdir(dp))) { - /* skip this and previous directory */ - if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) - continue; - - strncpy(path + len, de->d_name, sizeof(path) - len); - if (stat(path, &st) == 0) { - if (S_ISDIR(st.st_mode)) { - if ((err = deletedir(path)) < 0) { - closedir(dp); - return err; - } - } else if (unlink(path) < 0) { - switch (errno) { - case ENOENT : - continue; /* somebody went and deleted it behind our backs. */ - case EROFS: - err = AFPERR_VLOCK; - case EPERM: - case EACCES : - err = AFPERR_ACCESS; - default : - err = AFPERR_PARAM; - } - closedir(dp); - return err; - } - } - } - closedir(dp); - - /* okay. the directory is empty. delete it. note: we already got rid - of .AppleDouble. */ - if (rmdir(dir) < 0) { - switch ( errno ) { - case ENOENT : - break; - case ENOTEMPTY : /* should never happen */ - return( AFPERR_DIRNEMPT ); - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - default : - return( AFPERR_PARAM ); +/* ------------------- */ +static int deletedir(char *dir) +{ + char path[MAXPATHLEN + 1]; + DIR *dp; + struct dirent *de; + struct stat st; + size_t len; + int err = AFP_OK; + size_t remain; + + if ((len = strlen(dir)) +2 > sizeof(path)) + return AFPERR_PARAM; + + /* already gone */ + if ((dp = opendir(dir)) == NULL) + return AFP_OK; + + strcpy(path, dir); + strcat(path, "/"); + len++; + remain = sizeof(path) -len -1; + while ((de = readdir(dp)) && err == AFP_OK) { + /* skip this and previous directory */ + if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) + continue; + + if (strlen(de->d_name) > remain) { + err = AFPERR_PARAM; + break; + } + strcpy(path + len, de->d_name); + if (stat(path, &st)) { + continue; + } + if (S_ISDIR(st.st_mode)) { + err = deletedir(path); + } else { + err = netatalk_unlink(path); + } + } + closedir(dp); + + /* okay. the directory is empty. delete it. note: we already got rid + of .AppleDouble. */ + if (err == AFP_OK) { + err = netatalk_rmdir(dir); } - } - return AFP_OK; + return err; } /* do a recursive copy. */ -static int copydir(char *src, char *dst, int noadouble) +static int copydir(const struct vol *vol, char *src, char *dst) { - char spath[MAXPATHLEN + 1], dpath[MAXPATHLEN + 1]; - DIR *dp; - struct dirent *de; - struct stat st; - struct utimbuf ut; - int slen, dlen, err; - - /* doesn't exist or the path is too long. */ - if (((slen = strlen(src)) > sizeof(spath) - 2) || - ((dlen = strlen(dst)) > sizeof(dpath) - 2) || - ((dp = opendir(src)) == NULL)) - return AFPERR_PARAM; + char spath[MAXPATHLEN + 1], dpath[MAXPATHLEN + 1]; + DIR *dp; + struct dirent *de; + struct stat st; + struct utimbuf ut; + size_t slen, dlen; + size_t srem, drem; + int err; + + /* doesn't exist or the path is too long. */ + if (((slen = strlen(src)) > sizeof(spath) - 2) || + ((dlen = strlen(dst)) > sizeof(dpath) - 2) || + ((dp = opendir(src)) == NULL)) + return AFPERR_PARAM; - /* try to create the destination directory */ - if (ad_mkdir(dst, DIRBITS | 0777) < 0) { - closedir(dp); - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EROFS : - return( AFPERR_VLOCK ); - case EPERM: - case EACCES : - return( AFPERR_ACCESS ); - case EEXIST : - return( AFPERR_EXIST ); - case ENOSPC : - case EDQUOT : - return( AFPERR_DFULL ); - default : - return( AFPERR_PARAM ); - } - } - - /* set things up to copy */ - strcpy(spath, src); - strcat(spath, "/"); - slen++; - strcpy(dpath, dst); - strcat(dpath, "/"); - dlen++; - err = AFP_OK; - while ((de = readdir(dp))) { - /* skip this and previous directory */ - if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) - continue; - - strncpy(spath + slen, de->d_name, sizeof(spath) - slen); - if (stat(spath, &st) == 0) { - strncpy(dpath + dlen, de->d_name, sizeof(dpath) - dlen); - - if (S_ISDIR(st.st_mode)) { - if ((err = copydir(spath, dpath, noadouble)) < 0) - goto copydir_done; - } else if ((err = copyfile(spath, dpath, NULL, noadouble)) < 0) { - goto copydir_done; - - } else { - /* keep the same time stamp. */ - ut.actime = ut.modtime = st.st_mtime; - utime(dpath, &ut); - } - } - } - - /* keep the same time stamp. */ - if (stat(src, &st) == 0) { - ut.actime = ut.modtime = st.st_mtime; - utime(dst, &ut); - } + /* try to create the destination directory */ + if (AFP_OK != (err = netatalk_mkdir(dst)) ) { + closedir(dp); + return err; + } + + /* set things up to copy */ + strcpy(spath, src); + strcat(spath, "/"); + slen++; + srem = sizeof(spath) - slen -1; + + strcpy(dpath, dst); + strcat(dpath, "/"); + dlen++; + drem = sizeof(dpath) - dlen -1; + + err = AFP_OK; + while ((de = readdir(dp))) { + /* skip this and previous directory */ + if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) + continue; + + if (strlen(de->d_name) > srem) { + err = AFPERR_PARAM; + break; + } + strcpy(spath + slen, de->d_name); + + if (stat(spath, &st) == 0) { + if (strlen(de->d_name) > drem) { + err = AFPERR_PARAM; + break; + } + strcpy(dpath + dlen, de->d_name); + + if (S_ISDIR(st.st_mode)) { + if (AFP_OK != (err = copydir(vol, spath, dpath))) + goto copydir_done; + } else if (AFP_OK != (err = copyfile(vol, vol, spath, dpath, NULL, NULL))) { + goto copydir_done; + + } else { + /* keep the same time stamp. */ + ut.actime = ut.modtime = st.st_mtime; + utime(dpath, &ut); + } + } + } + + /* keep the same time stamp. */ + if (stat(src, &st) == 0) { + ut.actime = ut.modtime = st.st_mtime; + utime(dst, &ut); + } copydir_done: - closedir(dp); - return err; + closedir(dp); + return err; } @@ -548,57 +811,57 @@ copydir_done: /* NOTE: we start off with at least one node (the root directory). */ struct dir *dirinsert( vol, dir ) - struct vol *vol; - struct dir *dir; + struct vol *vol; +struct dir *dir; { struct dir *node; if ((node = dir_insert(vol, dir))) - return node; + return node; /* recolor the tree. the current node is red. */ dir->d_color = DIRTREE_COLOR_RED; /* parent of this node has to be black. if the parent node * is red, then we have a grandparent. */ - while ((dir != vol->v_root) && - (dir->d_back->d_color == DIRTREE_COLOR_RED)) { - /* are we on the left tree? */ - if (dir->d_back == dir->d_back->d_back->d_left) { - node = dir->d_back->d_back->d_right; /* get the right node */ - if (node->d_color == DIRTREE_COLOR_RED) { - /* we're red. we need to change to black. */ - dir->d_back->d_color = DIRTREE_COLOR_BLACK; - node->d_color = DIRTREE_COLOR_BLACK; - dir->d_back->d_back->d_color = DIRTREE_COLOR_RED; - dir = dir->d_back->d_back; /* finished. go up. */ - } else { - if (dir == dir->d_back->d_right) { - dir = dir->d_back; - dir_leftrotate(vol, dir); - } - dir->d_back->d_color = DIRTREE_COLOR_BLACK; - dir->d_back->d_back->d_color = DIRTREE_COLOR_RED; - dir_rightrotate(vol, dir->d_back->d_back); - } - } else { - node = dir->d_back->d_back->d_left; - if (node->d_color == DIRTREE_COLOR_RED) { - /* we're red. we need to change to black. */ - dir->d_back->d_color = DIRTREE_COLOR_BLACK; - node->d_color = DIRTREE_COLOR_BLACK; - dir->d_back->d_back->d_color = DIRTREE_COLOR_RED; - dir = dir->d_back->d_back; /* finished. ascend */ - } else { - if (dir == dir->d_back->d_left) { - dir = dir->d_back; - dir_rightrotate(vol, dir); - } - dir->d_back->d_color = DIRTREE_COLOR_BLACK; - dir->d_back->d_back->d_color = DIRTREE_COLOR_RED; - dir_leftrotate(vol, dir->d_back->d_back); - } - } + while ((dir != vol->v_root) && + (dir->d_back->d_color == DIRTREE_COLOR_RED)) { + /* are we on the left tree? */ + if (dir->d_back == dir->d_back->d_back->d_left) { + node = dir->d_back->d_back->d_right; /* get the right node */ + if (node->d_color == DIRTREE_COLOR_RED) { + /* we're red. we need to change to black. */ + dir->d_back->d_color = DIRTREE_COLOR_BLACK; + node->d_color = DIRTREE_COLOR_BLACK; + dir->d_back->d_back->d_color = DIRTREE_COLOR_RED; + dir = dir->d_back->d_back; /* finished. go up. */ + } else { + if (dir == dir->d_back->d_right) { + dir = dir->d_back; + dir_leftrotate(vol, dir); + } + dir->d_back->d_color = DIRTREE_COLOR_BLACK; + dir->d_back->d_back->d_color = DIRTREE_COLOR_RED; + dir_rightrotate(vol, dir->d_back->d_back); + } + } else { + node = dir->d_back->d_back->d_left; + if (node->d_color == DIRTREE_COLOR_RED) { + /* we're red. we need to change to black. */ + dir->d_back->d_color = DIRTREE_COLOR_BLACK; + node->d_color = DIRTREE_COLOR_BLACK; + dir->d_back->d_back->d_color = DIRTREE_COLOR_RED; + dir = dir->d_back->d_back; /* finished. ascend */ + } else { + if (dir == dir->d_back->d_left) { + dir = dir->d_back; + dir_rightrotate(vol, dir); + } + dir->d_back->d_color = DIRTREE_COLOR_BLACK; + dir->d_back->d_back->d_color = DIRTREE_COLOR_RED; + dir_leftrotate(vol, dir->d_back->d_back); + } + } } vol->v_root->d_color = DIRTREE_COLOR_BLACK; @@ -607,158 +870,325 @@ struct dir *dirinsert( vol, dir ) /* free everything down. we don't bother to recolor as this is only * called to free the entire tree */ +void dirfreename(struct dir *dir) +{ + if (dir->d_u_name != dir->d_m_name) { + free(dir->d_u_name); + } + free(dir->d_m_name); +} + void dirfree( dir ) - struct dir *dir; +struct dir *dir; { if (!dir || (dir == SENTINEL)) - return; + return; if ( dir->d_left != SENTINEL ) { - dirfree( dir->d_left ); + dirfree( dir->d_left ); } if ( dir->d_right != SENTINEL ) { - dirfree( dir->d_right ); + dirfree( dir->d_right ); } if (dir != SENTINEL) { - free( dir->d_name ); - free( dir ); + dirfreename(dir); + free( dir ); } } - -struct dir *dirnew(const int len) +/* -------------------------------------------- + * most of the time mac name and unix name are the same +*/ +struct dir *dirnew(const char *m_name, const char *u_name) { - struct dir *dir; - - dir = (struct dir *) calloc(1, sizeof( struct dir )); - if (!dir) - return NULL; - - if ((dir->d_name = (char *) malloc(sizeof(char)*len)) == NULL) { - free(dir); - return NULL; - } - - dir->d_left = dir->d_right = SENTINEL; - dir->d_next = dir->d_prev = dir; - return dir; -} + struct dir *dir; + + dir = (struct dir *) calloc(1, sizeof( struct dir )); + if (!dir) + return NULL; + + if ((dir->d_m_name = strdup(m_name)) == NULL) { + free(dir); + return NULL; + } + + if (m_name == u_name) { + dir->d_u_name = dir->d_m_name; + } + else if ((dir->d_u_name = strdup(u_name)) == NULL) { + free(dir->d_m_name); + free(dir); + return NULL; + } + dir->d_left = dir->d_right = SENTINEL; + dir->d_next = dir->d_prev = dir; + return dir; +} -/* XXX: this needs to be changed to handle path types */ - char * +/* -------------------------------------------------- */ +/* cname + return + if it's a filename: + in extenddir: + compute unix name + stat the file or errno + return + filename + curdir: filename parent directory + + if it's a dirname: + not in the cache + in extenddir + compute unix name + stat the dir or errno + return + if chdir error + dirname + curdir: dir parent directory + sinon + dirname: "" + curdir: dir + in the cache + return + if chdir error + dirname + curdir: dir parent directory + else + dirname: "" + curdir: dir + +*/ +struct path * cname( vol, dir, cpath ) - const struct vol *vol; - struct dir *dir; - char **cpath; +const struct vol *vol; +struct dir *dir; +char **cpath; { - struct dir *cdir; - static char path[ MAXPATHLEN + 1]; + struct dir *cdir; + static char path[ MAXPATHLEN + 1]; + static struct path ret; + char *data, *p; int extend = 0; int len; - + u_int32_t hint; + u_int16_t len16; + int size = 0; + char sep; + int toUTF8 = 0; + data = *cpath; - if ( *data++ != 2 ) { /* path type */ - return( NULL ); - } - len = (unsigned char) *data++; - *cpath += len + 2; + afp_errno = AFPERR_NOOBJ; + switch (ret.m_type = *data) { /* path type */ + case 2: + data++; + len = (unsigned char) *data++; + size = 2; + sep = 0; + if (afp_version >= 30) { + ret.m_type = 3; + toUTF8 = 1; + } + break; + case 3: + if (afp_version >= 30) { + data++; + memcpy(&hint, data, sizeof(hint)); + hint = ntohl(hint); + data += sizeof(hint); + + memcpy(&len16, data, sizeof(len16)); + len = ntohs(len16); + data += 2; + size = 7; + sep = 0; /* '/';*/ + break; + } + /* else it's an error */ + default: + afp_errno = AFPERR_PARAM; + return( NULL ); + } + *cpath += len + size; *path = '\0'; - + ret.m_name = path; + ret.st_errno = 0; + ret.st_valid = 0; + ret.d_dir = NULL; for ( ;; ) { - if ( len == 0 ) { - if ( !extend && movecwd( vol, dir ) < 0 ) { - return( NULL ); - } - return( path ); - } - - if ( *data == '\0' ) { - data++; - len--; - } - - while ( *data == '\0' && len > 0 ) { - if ( dir->d_parent == NULL ) { - return( NULL ); - } - dir = dir->d_parent; - data++; - len--; - } - - /* would this be faster with strlen + strncpy? */ - p = path; - while ( *data != '\0' && len > 0 ) { - *p++ = *data++; - len--; - } - - /* short cut bits by chopping off a trailing \0. this also - makes the traversal happy w/ filenames at the end of the - cname. */ - if (len == 1) - len--; - -#ifdef notdef - /* - * Dung Nguyen - * - * AFPD cannot handle paths with "::" if the "::" notation is - * not at the beginning of the path. The following path will not - * be interpreted correctly: - * - * :a:b:::c: (directory c at the same level as directory a) */ - if ( len > 0 ) { - data++; - len--; - } -#endif notdef - *p = '\0'; - - if ( p != path ) { /* we got something */ - if ( !extend ) { - cdir = dir->d_child; - while (cdir) { - if ( strcasecmp( cdir->d_name, path ) == 0 ) { - break; - } - cdir = (cdir == dir->d_child->d_prev) ? NULL : - cdir->d_next; - } - if ( cdir == NULL ) { - ++extend; - if ( movecwd( vol, dir ) < 0 ) { - return( NULL ); - } - cdir = extenddir( vol, dir, path ); - } - - } else { - cdir = extenddir( vol, dir, path ); - } - - if ( cdir == NULL ) { - if ( len > 0 ) { - return( NULL ); - } - - } else { - dir = cdir; - *path = '\0'; - } - } - } + if ( len == 0 ) { + if (movecwd( vol, dir ) < 0 ) { + /* it's tricky: + movecwd failed some of dir path are not there anymore. + FIXME Is it true with other errors? + so we remove dir from the cache + */ + if (dir->d_did == DIRDID_ROOT_PARENT) + return NULL; + if (afp_errno == AFPERR_ACCESS) { + if ( movecwd( vol, dir->d_parent ) < 0 ) { + return NULL; + } + /* FIXME should we set, don't need to call stat() after: + ret.st_valid = 1; + ret.st_errno = EACCES; + */ + ret.m_name = dir->d_m_name; + ret.u_name = dir->d_u_name; + ret.d_dir = dir; + return &ret; + } else if (afp_errno == AFPERR_NOOBJ) { + if ( movecwd( vol, dir->d_parent ) < 0 ) { + return NULL; + } + strcpy(path, dir->d_m_name); + if (dir->d_m_name == dir->d_u_name) { + ret.u_name = path; + } + else { + size_t tp = strlen(path)+1; + + strcpy(path +tp, dir->d_u_name); + ret.u_name = path +tp; + + } + /* FIXME should we set : + ret.st_valid = 1; + ret.st_errno = ENOENT; + */ + + dir_invalidate(vol, dir); + return &ret; + } + dir_invalidate(vol, dir); + return NULL; + } + if (*path == '\0') { + ret.u_name = "."; + ret.d_dir = dir; + } + return &ret; + } /* if (len == 0) */ + + if (*data == sep ) { + data++; + len--; + } + while (*data == sep && len > 0 ) { + if ( dir->d_parent == NULL ) { + return NULL; + } + dir = dir->d_parent; + data++; + len--; + } + + /* would this be faster with strlen + strncpy? */ + p = path; + while ( *data != sep && len > 0 ) { + *p++ = *data++; + if (p > &path[ MAXPATHLEN]) { + afp_errno = AFPERR_PARAM; + return( NULL ); + } + len--; + } + + /* short cut bits by chopping off a trailing \0. this also + makes the traversal happy w/ filenames at the end of the + cname. */ + if (len == 1) + len--; + + *p = '\0'; + + if ( p != path ) { /* we got something */ + ret.u_name = NULL; + if (afp_version >= 30) { + char *t; + cnid_t fileid; + + if (toUTF8) { + static char temp[ MAXPATHLEN + 1]; + + /* not an UTF8 name */ + if (mtoUTF8(vol, path, strlen(path), temp, MAXPATHLEN) == (size_t)-1) { + afp_errno = AFPERR_PARAM; + return( NULL ); + } + strcpy(path, temp); + } + /* check for OS X mangled filename :( */ + + t = demangle_osx(vol, path, dir->d_did, &fileid); + if (t != path) { + ret.u_name = t; + /* duplicate work but we can't reuse all convert_char we did in demagnle_osx + * flags weren't the same + */ + if ( (t = utompath(vol, ret.u_name, fileid, utf8_encoding())) ) { + /* at last got our view of mac name */ + strcpy(path,t); + } + } + } + if ( !extend ) { + cdir = dir->d_child; + while (cdir) { + if ( strcmp( cdir->d_m_name, path ) == 0 ) { + break; + } + cdir = (cdir == dir->d_child->d_prev) ? NULL : + cdir->d_next; + } + if ( cdir == NULL ) { + ++extend; + /* if dir == curdir it always succeed, + even if curdir is deleted. + it's not a pb because it will fail in extenddir + */ + if ( movecwd( vol, dir ) < 0 ) { + /* dir is not valid anymore + we delete dir from the cache and abort. + */ + if ( dir->d_did == DIRDID_ROOT_PARENT) { + afp_errno = AFPERR_NOOBJ; + return NULL; + } + if (afp_errno == AFPERR_ACCESS) + return NULL; + dir_invalidate(vol, dir); + return NULL; + } + cdir = extenddir( vol, dir, &ret ); + } + + } else { + cdir = extenddir( vol, dir, &ret ); + } /* if (!extend) */ + + if ( cdir == NULL ) { + + if ( len > 0 || !ret.u_name) { + return NULL; + } + + } else { + dir = cdir; + *path = '\0'; + } + } /* if (p != path) */ + } /* for (;;) */ } /* * Move curdir to dir, with a possible chdir() */ int movecwd( vol, dir) - const struct vol *vol; - struct dir *dir; +const struct vol *vol; +struct dir *dir; { char path[MAXPATHLEN + 1]; struct dir *d; @@ -766,243 +1196,329 @@ int movecwd( vol, dir) int n; if ( dir == curdir ) { - return( 0 ); + return( 0 ); } if ( dir->d_did == DIRDID_ROOT_PARENT) { - return( -1 ); + afp_errno = AFPERR_DID1; /* AFPERR_PARAM;*/ + return( -1 ); } p = path + sizeof(path) - 1; *p-- = '\0'; *p = '.'; for ( d = dir; d->d_parent != NULL && d != curdir; d = d->d_parent ) { - *--p = '/'; - u = mtoupath(vol, d->d_name ); - n = strlen( u ); - p -= n; - strncpy( p, u, n ); + u = d->d_u_name; + if (!u) { + /* parent directory is deleted */ + afp_errno = AFPERR_NOOBJ; + return -1; + } + n = strlen( u ); + if (p -n -1 < path) { + afp_errno = AFPERR_PARAM; + return -1; + } + *--p = '/'; + p -= n; + memcpy( p, u, n ); } if ( d != curdir ) { - *--p = '/'; - n = strlen( vol->v_path ); - p -= n; - strncpy( p, vol->v_path, n ); + n = strlen( vol->v_path ); + if (p -n -1 < path) { + afp_errno = AFPERR_PARAM; + return -1; + } + *--p = '/'; + p -= n; + memcpy( p, vol->v_path, n ); } if ( chdir( p ) < 0 ) { - return( -1 ); + switch (errno) { + case EACCES: + case EPERM: + afp_errno = AFPERR_ACCESS; + break; + default: + afp_errno = AFPERR_NOOBJ; + + } + return( -1 ); } curdir = dir; return( 0 ); } -int getdirparams(vol, bitmap, upath, dir, st, buf, buflen ) - const struct vol *vol; - u_int16_t bitmap; - char *upath; - struct dir *dir; - struct stat *st; - char *buf; - int *buflen; +/* + * We can't use unix file's perm to support Apple's inherited protection modes. + * If we aren't the file's owner we can't change its perms when moving it and smb + * nfs,... don't even try. +*/ +#define AFP_CHECK_ACCESS + +int check_access(char *path, int mode) +{ +#ifdef AFP_CHECK_ACCESS +struct maccess ma; +char *p; + + p = ad_dir(path); + if (!p) + return -1; + + accessmode(p, &ma, curdir, NULL); + if ((mode & OPENACC_WR) && !(ma.ma_user & AR_UWRITE)) + return -1; + if ((mode & OPENACC_RD) && !(ma.ma_user & AR_UREAD)) + return -1; +#endif + return 0; +} + +/* --------------------- */ +int file_access(struct path *path, int mode) +{ +struct maccess ma; + + accessmode(path->u_name, &ma, curdir, &path->st); + if ((mode & OPENACC_WR) && !(ma.ma_user & AR_UWRITE)) + return -1; + if ((mode & OPENACC_RD) && !(ma.ma_user & AR_UREAD)) + return -1; + return 0; + +} + +/* --------------------- */ +static int invisible_dots(const struct vol *vol, const char *name) +{ + return vol_inv_dots(vol) && *name == '.' && strcmp(name, ".") && strcmp(name, ".."); +} + +/* ------------------------------ + (".", curdir) + (name, dir) with curdir:name == dir, from afp_enumerate +*/ + +int getdirparams(const struct vol *vol, + u_int16_t bitmap, struct path *s_path, + struct dir *dir, + char *buf, int *buflen ) { struct maccess ma; struct adouble ad; - char *data, *nameoff = NULL; - DIR *dp; - struct dirent *de; - int bit = 0, isad = 1; + char *data, *l_nameoff = NULL, *utf_nameoff = NULL; + int bit = 0, isad = 0; u_int32_t aint; u_int16_t ashort; -#ifdef FORCE_UIDGID - uidgidset *uidgid; -#endif FORCE_UIDGID + int ret; + u_int32_t utf8 = 0; + cnid_t pdid; + struct stat *st = &s_path->st; + char *upath = s_path->u_name; + + if ((bitmap & ((1 << DIRPBIT_ATTR) | + (1 << DIRPBIT_CDATE) | + (1 << DIRPBIT_MDATE) | + (1 << DIRPBIT_BDATE) | + (1 << DIRPBIT_FINFO)))) { - memset(&ad, 0, sizeof(ad)); + ad_init(&ad, vol->v_adouble, vol->v_ad_options); + if ( !ad_metadata( upath, ADFLAGS_DIR, &ad) ) { + isad = 1; + } + } + + if ( dir->d_did == DIRDID_ROOT) { + pdid = DIRDID_ROOT_PARENT; + } else if (dir->d_did == DIRDID_ROOT_PARENT) { + pdid = 0; + } else { + pdid = dir->d_parent->d_did; + } + + data = buf; + while ( bitmap != 0 ) { + while (( bitmap & 1 ) == 0 ) { + bitmap = bitmap>>1; + bit++; + } + + switch ( bit ) { + case DIRPBIT_ATTR : + if ( isad ) { + ad_getattr(&ad, &ashort); + } else if (invisible_dots(vol, dir->d_u_name)) { + ashort = htons(ATTRBIT_INVISIBLE); + } else + ashort = 0; + ashort |= htons(ATTRBIT_SHARED); + memcpy( data, &ashort, sizeof( ashort )); + data += sizeof( ashort ); + break; -#ifdef FORCE_UIDGID - save_uidgid ( uidgid ); - set_uidgid ( vol ); -#endif FORCE_UIDGID + case DIRPBIT_PDID : + memcpy( data, &pdid, sizeof( pdid )); + data += sizeof( pdid ); + break; - if ( ad_open( upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY, - DIRBITS | 0777, &ad) < 0 ) { - isad = 0; - } + case DIRPBIT_CDATE : + if (!isad || (ad_getdate(&ad, AD_DATE_CREATE, &aint) < 0)) + aint = AD_DATE_FROM_UNIX(st->st_mtime); + memcpy( data, &aint, sizeof( aint )); + data += sizeof( aint ); + break; - data = buf; - while ( bitmap != 0 ) { - while (( bitmap & 1 ) == 0 ) { - bitmap = bitmap>>1; - bit++; - } - - switch ( bit ) { - case DIRPBIT_ATTR : - if ( isad ) { - ad_getattr(&ad, &ashort); - } else if (*upath == '.' && strcmp(upath, ".") && - strcmp(upath, "..")) { - ashort = htons(ATTRBIT_INVISIBLE); - } else - ashort = 0; - memcpy( data, &ashort, sizeof( ashort )); - data += sizeof( ashort ); - break; - - case DIRPBIT_PDID : - if ( dir->d_did == DIRDID_ROOT) { - aint = DIRDID_ROOT_PARENT; - } else if (dir->d_did == DIRDID_ROOT_PARENT) { - aint = 0; - } else { - aint = dir->d_parent->d_did; - } - memcpy( data, &aint, sizeof( aint )); - data += sizeof( aint ); - break; + case DIRPBIT_MDATE : + aint = AD_DATE_FROM_UNIX(st->st_mtime); + memcpy( data, &aint, sizeof( aint )); + data += sizeof( aint ); + break; - case DIRPBIT_CDATE : - if (!isad || (ad_getdate(&ad, AD_DATE_CREATE, &aint) < 0)) - aint = AD_DATE_FROM_UNIX(st->st_mtime); - memcpy( data, &aint, sizeof( aint )); - data += sizeof( aint ); - break; + case DIRPBIT_BDATE : + if (!isad || (ad_getdate(&ad, AD_DATE_BACKUP, &aint) < 0)) + aint = AD_DATE_START; + memcpy( data, &aint, sizeof( aint )); + data += sizeof( aint ); + break; - case DIRPBIT_MDATE : - aint = AD_DATE_FROM_UNIX(st->st_mtime); - memcpy( data, &aint, sizeof( aint )); - data += sizeof( aint ); - break; + case DIRPBIT_FINFO : + if ( isad ) { + memcpy( data, ad_entry( &ad, ADEID_FINDERI ), 32 ); + } else { /* no appledouble */ + memset( data, 0, 32 ); + /* set default view -- this also gets done in ad_open() */ + ashort = htons(FINDERINFO_CLOSEDVIEW); + memcpy(data + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort)); + + /* dot files are by default visible */ + if (invisible_dots(vol, dir->d_u_name)) { + ashort = htons(FINDERINFO_INVISIBLE); + memcpy(data + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); + } + } + data += 32; + break; - case DIRPBIT_BDATE : - if (!isad || (ad_getdate(&ad, AD_DATE_BACKUP, &aint) < 0)) - aint = AD_DATE_START; - memcpy( data, &aint, sizeof( aint )); - data += sizeof( aint ); - break; - - case DIRPBIT_FINFO : - if ( isad ) { - memcpy( data, ad_entry( &ad, ADEID_FINDERI ), 32 ); - } else { /* no appledouble */ - memset( data, 0, 32 ); - /* set default view -- this also gets done in ad_open() */ - ashort = htons(FINDERINFO_CLOSEDVIEW); - memcpy(data + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort)); - - /* dot files are by default invisible */ - if (*upath == '.' && strcmp(upath, ".") && - strcmp(upath, "..")) { - ashort = htons(FINDERINFO_INVISIBLE); - memcpy(data + FINDERINFO_FRFLAGOFF, - &ashort, sizeof(ashort)); - } - } - data += 32; - break; - - case DIRPBIT_LNAME : - if (dir->d_name) /* root of parent can have a null name */ - nameoff = data; - else - memset(data, 0, sizeof(u_int16_t)); - data += sizeof( u_int16_t ); - break; - - case DIRPBIT_SNAME : - memset(data, 0, sizeof(u_int16_t)); - data += sizeof( u_int16_t ); - break; - - case DIRPBIT_DID : - memcpy( data, &dir->d_did, sizeof( aint )); - data += sizeof( aint ); - break; - - case DIRPBIT_OFFCNT : - ashort = 0; - /* this needs to handle current directory access rights */ - if ((dp = opendir( upath ))) { - while (( de = readdir( dp )) != NULL ) { - if (!strcmp(de->d_name, "..") || !strcmp(de->d_name, ".")) - continue; - - if (!validupath(vol, de->d_name)) - continue; - - /* now check against too long a filename */ - if (strlen(utompath(vol, de->d_name)) > MACFILELEN) - continue; - - ashort++; - } - closedir( dp ); - } - ashort = htons( ashort ); - memcpy( data, &ashort, sizeof( ashort )); - data += sizeof( ashort ); - break; - - case DIRPBIT_UID : - aint = st->st_uid; - memcpy( data, &aint, sizeof( aint )); - data += sizeof( aint ); - break; + case DIRPBIT_LNAME : + if (dir->d_m_name) /* root of parent can have a null name */ + l_nameoff = data; + else + memset(data, 0, sizeof(u_int16_t)); + data += sizeof( u_int16_t ); + break; + + case DIRPBIT_SNAME : + memset(data, 0, sizeof(u_int16_t)); + data += sizeof( u_int16_t ); + break; + + case DIRPBIT_DID : + memcpy( data, &dir->d_did, sizeof( aint )); + data += sizeof( aint ); + break; + + case DIRPBIT_OFFCNT : + ashort = 0; + /* this needs to handle current directory access rights */ + if (st->st_ctime == dir->ctime) { + ashort = (dir->offcnt > 0xffff)?0xffff:dir->offcnt; + } + else if ((ret = for_each_dirent(vol, upath, NULL,NULL)) >= 0) { + dir->offcnt = ret; + dir->ctime = st->st_ctime; + ashort = (dir->offcnt > 0xffff)?0xffff:dir->offcnt; + } + ashort = htons( ashort ); + memcpy( data, &ashort, sizeof( ashort )); + data += sizeof( ashort ); + break; + + case DIRPBIT_UID : + aint = htonl(st->st_uid); + memcpy( data, &aint, sizeof( aint )); + data += sizeof( aint ); + break; - case DIRPBIT_GID : - aint = st->st_gid; + case DIRPBIT_GID : + aint = htonl(st->st_gid); + memcpy( data, &aint, sizeof( aint )); + data += sizeof( aint ); + break; + + case DIRPBIT_ACCESS : + accessmode( upath, &ma, dir , st); + + *data++ = ma.ma_user; + *data++ = ma.ma_world; + *data++ = ma.ma_group; + *data++ = ma.ma_owner; + break; + + /* Client has requested the ProDOS information block. + Just pass back the same basic block for all + directories. */ + case DIRPBIT_PDINFO : + if (afp_version >= 30) { /* UTF8 name */ + utf8 = kTextEncodingUTF8; + if (dir->d_m_name) /* root of parent can have a null name */ + utf_nameoff = data; + else + memset(data, 0, sizeof(u_int16_t)); + data += sizeof( u_int16_t ); + aint = 0; + memcpy(data, &aint, sizeof( aint )); + data += sizeof( aint ); + } + else { /* ProDOS Info Block */ + *data++ = 0x0f; + *data++ = 0; + ashort = htons( 0x0200 ); + memcpy( data, &ashort, sizeof( ashort )); + data += sizeof( ashort ); + memset( data, 0, sizeof( ashort )); + data += sizeof( ashort ); + } + break; + + case DIRPBIT_UNIXPR : + aint = htonl(st->st_uid); + memcpy( data, &aint, sizeof( aint )); + data += sizeof( aint ); + aint = htonl(st->st_gid); + memcpy( data, &aint, sizeof( aint )); + data += sizeof( aint ); + + aint = st->st_mode; + aint = htonl ( aint & ~S_ISGID ); /* Remove SGID, OSX doesn't like it ... */ memcpy( data, &aint, sizeof( aint )); data += sizeof( aint ); - break; - - case DIRPBIT_ACCESS : - utommode( st, &ma ); -/* #ifdef HAVE_ACCESS - accessmode( upath, &ma, dir ); -#endif HAVE_ACCESS */ -#ifdef AFS /* If only AFS defined, access() works only for AFS filesystems */ - afsmode( upath, &ma, dir ); -#endif AFS - *data++ = ma.ma_user; - *data++ = ma.ma_world; - *data++ = ma.ma_group; - *data++ = ma.ma_owner; - break; - - /* Client has requested the ProDOS information block. - Just pass back the same basic block for all - directories. */ - case DIRPBIT_PDINFO : /* ProDOS Info Block */ - *data++ = 0x0f; - *data++ = 0; - ashort = htons( 0x0200 ); - memcpy( data, &ashort, sizeof( ashort )); - data += sizeof( ashort ); - memset( data, 0, sizeof( ashort )); - data += sizeof( ashort ); - break; - - default : - if ( isad ) { - ad_close( &ad, ADFLAGS_HF ); - } -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_BITMAP ); - } - bitmap = bitmap>>1; - bit++; - } - if ( nameoff ) { - ashort = htons( data - buf ); - memcpy( nameoff, &ashort, sizeof( ashort )); - if ((aint = strlen( dir->d_name )) > MACFILELEN) - aint = MACFILELEN; - - *data++ = aint; - memcpy( data, dir->d_name, aint ); - data += aint; + accessmode( upath, &ma, dir , st); + + *data++ = ma.ma_user; + *data++ = ma.ma_world; + *data++ = ma.ma_group; + *data++ = ma.ma_owner; + break; + + default : + if ( isad ) { + ad_close( &ad, ADFLAGS_HF ); + } + return( AFPERR_BITMAP ); + } + bitmap = bitmap>>1; + bit++; + } + if ( l_nameoff ) { + ashort = htons( data - buf ); + memcpy( l_nameoff, &ashort, sizeof( ashort )); + data = set_name(vol, data, pdid, dir->d_m_name, dir->d_did, 0); + } + if ( utf_nameoff ) { + ashort = htons( data - buf ); + memcpy( utf_nameoff, &ashort, sizeof( ashort )); + data = set_name(vol, data, pdid, dir->d_m_name, dir->d_did, utf8); } if ( isad ) { ad_close( &ad, ADFLAGS_HF ); @@ -1011,14 +1527,29 @@ int getdirparams(vol, bitmap, upath, dir, st, buf, buflen ) return( AFP_OK ); } +/* ----------------------------- */ +int path_error(struct path *path, int error) +{ +/* - a dir with access error + * - no error it's a file + * - file not found + */ + if (path_isadir(path)) + return afp_errno; + if (path->st_valid && path->st_errno) + return error; + return AFPERR_BADTYPE ; +} + +/* ----------------------------- */ int afp_setdirparams(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf _U_; +int ibuflen _U_, *rbuflen; { struct vol *vol; struct dir *dir; - char *path; + struct path *path; u_int16_t vid, bitmap; u_int32_t did; int rc; @@ -1028,8 +1559,8 @@ int afp_setdirparams(obj, ibuf, ibuflen, rbuf, rbuflen ) memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM ); + if (NULL == ( vol = getvolbyvid( vid )) ) { + return( AFPERR_PARAM ); } if (vol->v_flags & AFPVOL_RO) @@ -1038,333 +1569,418 @@ int afp_setdirparams(obj, ibuf, ibuflen, rbuf, rbuflen ) memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); - if (( dir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; } memcpy( &bitmap, ibuf, sizeof( bitmap )); bitmap = ntohs( bitmap ); ibuf += sizeof( bitmap ); - if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, dir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); + } + + if ( *path->m_name != '\0' ) { + rc = path_error(path, AFPERR_NOOBJ); + /* maybe we are trying to set perms back */ + if (rc != AFPERR_ACCESS) + return rc; } /* * If ibuf is odd, make it even. */ if ((u_long)ibuf & 1 ) { - ibuf++; + ibuf++; } - if (( rc = setdirparams(vol, path, bitmap, ibuf )) == AFP_OK ) { - setvoltime(obj, vol ); + if (AFP_OK == ( rc = setdirparams(vol, path, bitmap, ibuf )) ) { + setvoltime(obj, vol ); } return( rc ); } -int setdirparams(vol, path, bitmap, buf ) - const struct vol *vol; - char *path, *buf; - u_int16_t bitmap; +/* + * cf AFP3.0.pdf page 244 for change_mdate and change_parent_mdate logic + * + * assume path == '\0' eg. it's a directory in canonical form +*/ + +struct path Cur_Path = { + 0, + "", /* mac name */ + ".", /* unix name */ + NULL, + 0, /* stat is not set */ + 0 /* errno */ +}; + +/* ------------------ */ +static int set_dir_errors(struct path *path, const char *where, int err) +{ + switch ( err ) { + case EPERM : + case EACCES : + return AFPERR_ACCESS; + case EROFS : + return AFPERR_VLOCK; + } + LOG(log_error, logtype_afpd, "setdirparam(%s): %s: %s", fullpathname(path->u_name), where, strerror(err) ); + return AFPERR_PARAM; +} + +/* ------------------ */ +int setdirparams(const struct vol *vol, + struct path *path, u_int16_t d_bitmap, char *buf ) { struct maccess ma; struct adouble ad; struct utimbuf ut; + struct timeval tv; + char *upath; - int bit = 0, aint, isad = 1; + struct dir *dir; + int bit, isad = 1; + int cdate, bdate; + int owner, group; u_int16_t ashort, bshort; int err = AFP_OK; -#ifdef FORCE_UIDGID - uidgidset *uidgid; -#endif FORCE_UIDGID - - upath = mtoupath(vol, path); - memset(&ad, 0, sizeof(ad)); -#ifdef FORCE_UIDGID - save_uidgid ( uidgid ); -#endif FORCE_UIDGID - if (ad_open( upath, vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, - O_RDWR|O_CREAT, 0666, &ad) < 0) { - /* - * Check to see what we're trying to set. If it's anything - * but ACCESS, UID, or GID, give an error. If it's any of those - * three, we don't need the ad to be open, so just continue. - * - * note: we also don't need to worry about mdate. also, be quiet - * if we're using the noadouble option. - */ - if (!vol_noadouble(vol) && (bitmap & - ~((1<u_name; + dir = path->d_dir; + while ( bitmap != 0 ) { + while (( bitmap & 1 ) == 0 ) { + bitmap = bitmap>>1; + bit++; + } + + switch( bit ) { + case DIRPBIT_ATTR : + change_mdate = 1; + memcpy( &ashort, buf, sizeof( ashort )); + buf += sizeof( ashort ); + break; + case DIRPBIT_CDATE : + change_mdate = 1; + memcpy(&cdate, buf, sizeof(cdate)); + buf += sizeof( cdate ); + break; + case DIRPBIT_MDATE : + memcpy(&newdate, buf, sizeof(newdate)); + buf += sizeof( newdate ); + break; + case DIRPBIT_BDATE : + change_mdate = 1; + memcpy(&bdate, buf, sizeof(bdate)); + buf += sizeof( bdate ); + break; + case DIRPBIT_FINFO : + change_mdate = 1; + memcpy( finder_buf, buf, 32 ); + buf += 32; + break; + case DIRPBIT_UID : /* What kind of loser mounts as root? */ + change_parent_mdate = 1; + memcpy( &owner, buf, sizeof(owner)); + buf += sizeof( owner ); + break; + case DIRPBIT_GID : + change_parent_mdate = 1; + memcpy( &group, buf, sizeof( group )); + buf += sizeof( group ); + break; + case DIRPBIT_ACCESS : + change_mdate = 1; + change_parent_mdate = 1; + ma.ma_user = *buf++; + ma.ma_world = *buf++; + ma.ma_group = *buf++; + ma.ma_owner = *buf++; + mpriv = mtoumode( &ma ) | vol->v_perm; + if (dir_rx_set(mpriv) && setdirmode( vol, upath, mpriv) < 0 ) { + err = set_dir_errors(path, "setdirmode", errno); + bitmap = 0; + } + break; + /* Ignore what the client thinks we should do to the + ProDOS information block. Skip over the data and + report nothing amiss. */ + case DIRPBIT_PDINFO : + if (afp_version < 30) { + buf += 6; + } + else { + err = AFPERR_BITMAP; + bitmap = 0; + } + break; + case DIRPBIT_UNIXPR : + if (vol_unix_priv(vol)) { + memcpy( &owner, buf, sizeof(owner)); /* FIXME need to change owner too? */ + buf += sizeof( owner ); + memcpy( &group, buf, sizeof( group )); + buf += sizeof( group ); + + change_mdate = 1; + change_parent_mdate = 1; + memcpy( &upriv, buf, sizeof( upriv )); + buf += sizeof( upriv ); + upriv = ntohl (upriv) | vol->v_perm; + if (dir_rx_set(upriv)) { + /* maybe we are trying to set perms back */ + if ( setdirunixmode(vol, upath, upriv) < 0 ) { + bitmap = 0; + err = set_dir_errors(path, "setdirunixmode", errno); + } + } + else { + /* do it later */ + upriv_bit = 1; + } + break; + } + /* fall through */ + default : + err = AFPERR_BITMAP; + bitmap = 0; + break; + } + + bitmap = bitmap>>1; + bit++; + } + ad_init(&ad, vol->v_adouble, vol->v_ad_options); + + if (ad_open( upath, vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, + O_RDWR|O_CREAT, 0666, &ad) < 0) { + /* + * Check to see what we're trying to set. If it's anything + * but ACCESS, UID, or GID, give an error. If it's any of those + * three, we don't need the ad to be open, so just continue. + * + * note: we also don't need to worry about mdate. also, be quiet + * if we're using the noadouble option. + */ + if (!vol_noadouble(vol) && (d_bitmap & + ~((1<d_name )); - memcpy( ad_entry( &ad, ADEID_NAME ), curdir->d_name, - ad_getentrylen( &ad, ADEID_NAME )); - } + /* + * Check to see if a create was necessary. If it was, we'll want + * to set our name, etc. + */ + if ( (ad_get_HF_flags( &ad ) & O_CREAT)) { + ad_setname(&ad, curdir->d_m_name); + } } + bit = 0; + bitmap = d_bitmap; while ( bitmap != 0 ) { - while (( bitmap & 1 ) == 0 ) { - bitmap = bitmap>>1; - bit++; - } - - switch( bit ) { - case DIRPBIT_ATTR : - if (isad) { - memcpy( &ashort, buf, sizeof( ashort )); - ad_getattr(&ad, &bshort); - if ( ntohs( ashort ) & ATTRBIT_SETCLR ) { - bshort |= htons( ntohs( ashort ) & ~ATTRBIT_SETCLR ); - } else { - bshort &= ~ashort; - } - ad_setattr(&ad, bshort); - } - buf += sizeof( ashort ); - break; - - case DIRPBIT_CDATE : - if (isad) { - memcpy(&aint, buf, sizeof(aint)); - ad_setdate(&ad, AD_DATE_CREATE, aint); - } - buf += sizeof( aint ); - break; - - case DIRPBIT_MDATE : - memcpy(&aint, buf, sizeof(aint)); - if (isad) - ad_setdate(&ad, AD_DATE_MODIFY, aint); - ut.actime = ut.modtime = AD_DATE_TO_UNIX(aint); - utime(upath, &ut); - buf += sizeof( aint ); - break; - - case DIRPBIT_BDATE : - if (isad) { - memcpy(&aint, buf, sizeof(aint)); - ad_setdate(&ad, AD_DATE_BACKUP, aint); - } - buf += sizeof( aint ); - break; - - case DIRPBIT_FINFO : - /* - * Alright, we admit it, this is *really* sick! - * The 4 bytes that we don't copy, when we're dealing - * with the root of a volume, are the directory's - * location information. This eliminates that annoying - * behavior one sees when mounting above another mount - * point. - */ - if (isad) { - if ( curdir->d_did == DIRDID_ROOT ) { - memcpy( ad_entry( &ad, ADEID_FINDERI ), buf, 10 ); - memcpy( ad_entry( &ad, ADEID_FINDERI ) + 14, buf + 14, 18 ); - } else { - memcpy( ad_entry( &ad, ADEID_FINDERI ), buf, 32 ); - } - } - buf += 32; - break; - - case DIRPBIT_UID : /* What kind of loser mounts as root? */ - memcpy( &aint, buf, sizeof(aint)); - buf += sizeof( aint ); - if ( (curdir->d_did == DIRDID_ROOT) && - (setdeskowner( aint, -1 ) < 0)) { - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; - goto setdirparam_done; - break; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - break; - default : - syslog( LOG_ERR, "setdirparam: setdeskowner: %m" ); - if (!isad) { - err = AFPERR_PARAM; - goto setdirparam_done; - } - break; - } - } - if ( setdirowner( aint, -1, vol_noadouble(vol) ) < 0 ) { - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; - goto setdirparam_done; - break; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - break; - default : - syslog( LOG_ERR, "setdirparam: setdirowner: %m" ); - break; - } - } - break; - - case DIRPBIT_GID : - memcpy( &aint, buf, sizeof( aint )); - buf += sizeof( aint ); - if (curdir->d_did == DIRDID_ROOT) - setdeskowner( -1, aint ); - -#if 0 /* don't error if we can't set the desktop owner. */ - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; - goto setdirparam_done; - break; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - break; - default : - syslog( LOG_ERR, "setdirparam: setdeskowner: %m" ); - if (!isad) { - err = AFPERR_PARAM; - goto setdirparam_done; - } - break; - } -#endif - - if ( setdirowner( -1, aint, vol_noadouble(vol) ) < 0 ) { - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; - goto setdirparam_done; - break; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - break; - default : - syslog( LOG_ERR, "setdirparam: setdirowner: %m" ); - break; - } - } - break; - - case DIRPBIT_ACCESS : - ma.ma_user = *buf++; - ma.ma_world = *buf++; - ma.ma_group = *buf++; - ma.ma_owner = *buf++; - - if (curdir->d_did == DIRDID_ROOT) - setdeskmode(mtoumode( &ma )); -#if 0 /* don't error if we can't set the desktop mode */ - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; - goto setdirparam_done; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - default : - syslog( LOG_ERR, "setdirparam: setdeskmode: %m" ); - break; - err = AFPERR_PARAM; - goto setdirparam_done; - } - } -#endif + while (( bitmap & 1 ) == 0 ) { + bitmap = bitmap>>1; + bit++; + } + + switch( bit ) { + case DIRPBIT_ATTR : + if (isad) { + ad_getattr(&ad, &bshort); + if ((bshort & htons(ATTRBIT_INVISIBLE)) != + (ashort & htons(ATTRBIT_INVISIBLE) & htons(ATTRBIT_SETCLR)) ) + change_parent_mdate = 1; + if ( ntohs( ashort ) & ATTRBIT_SETCLR ) { + bshort |= htons( ntohs( ashort ) & ~ATTRBIT_SETCLR ); + } else { + bshort &= ~ashort; + } + ad_setattr(&ad, bshort); + } + break; + case DIRPBIT_CDATE : + if (isad) { + ad_setdate(&ad, AD_DATE_CREATE, cdate); + } + break; + case DIRPBIT_MDATE : + break; + case DIRPBIT_BDATE : + if (isad) { + ad_setdate(&ad, AD_DATE_BACKUP, bdate); + } + break; + case DIRPBIT_FINFO : + if (isad) { + if ( dir->d_did == DIRDID_ROOT ) { + /* + * Alright, we admit it, this is *really* sick! + * The 4 bytes that we don't copy, when we're dealing + * with the root of a volume, are the directory's + * location information. This eliminates that annoying + * behavior one sees when mounting above another mount + * point. + */ + memcpy( ad_entry( &ad, ADEID_FINDERI ), finder_buf, 10 ); + memcpy( ad_entry( &ad, ADEID_FINDERI ) + 14, finder_buf + 14, 18 ); + } else { + memcpy( ad_entry( &ad, ADEID_FINDERI ), finder_buf, 32 ); + } + } + break; + case DIRPBIT_UID : /* What kind of loser mounts as root? */ + if ( (dir->d_did == DIRDID_ROOT) && + (setdeskowner( ntohl(owner), -1 ) < 0)) { + err = set_dir_errors(path, "setdeskowner", errno); + if (isad && err == AFPERR_PARAM) { + err = AFP_OK; /* ???*/ + } + else { + goto setdirparam_done; + } + } + if ( setdirowner(vol, upath, ntohl(owner), -1 ) < 0 ) { + err = set_dir_errors(path, "setdirowner", errno); + goto setdirparam_done; + } + break; + case DIRPBIT_GID : + if (dir->d_did == DIRDID_ROOT) + setdeskowner( -1, ntohl(group) ); + if ( setdirowner(vol, upath, -1, ntohl(group) ) < 0 ) { + err = set_dir_errors(path, "setdirowner", errno); + goto setdirparam_done; + } + break; + case DIRPBIT_ACCESS : + if (dir->d_did == DIRDID_ROOT) { + setdeskmode(mpriv); + if (!dir_rx_set(mpriv)) { + /* we can't remove read and search for owner on volume root */ + err = AFPERR_ACCESS; + goto setdirparam_done; + } + } + + if (!dir_rx_set(mpriv) && setdirmode( vol, upath, mpriv) < 0 ) { + err = set_dir_errors(path, "setdirmode", errno); + goto setdirparam_done; + } + break; + case DIRPBIT_PDINFO : + if (afp_version >= 30) { + err = AFPERR_BITMAP; + goto setdirparam_done; + } + break; + case DIRPBIT_UNIXPR : + if (vol_unix_priv(vol)) { + if (dir->d_did == DIRDID_ROOT) { + if (!dir_rx_set(upriv)) { + /* we can't remove read and search for owner on volume root */ + err = AFPERR_ACCESS; + goto setdirparam_done; + } + setdeskowner( -1, ntohl(group) ); + setdeskmode( upriv ); + } + if ( setdirowner(vol, upath, -1, ntohl(group) ) < 0 ) { + err = set_dir_errors(path, "setdirowner", errno); + goto setdirparam_done; + } + + if ( upriv_bit && setdirunixmode(vol, upath, upriv) < 0 ) { + err = set_dir_errors(path, "setdirunixmode", errno); + goto setdirparam_done; + } + } + else { + err = AFPERR_BITMAP; + goto setdirparam_done; + } + break; + default : + err = AFPERR_BITMAP; + goto setdirparam_done; + break; + } - if ( setdirmode( mtoumode( &ma ), vol_noadouble(vol)) < 0 ) { - switch ( errno ) { - case EPERM : - case EACCES : - err = AFPERR_ACCESS; - goto setdirparam_done; - case EROFS : - err = AFPERR_VLOCK; - goto setdirparam_done; - default : - syslog( LOG_ERR, "setdirparam: setdirmode: %m" ); - err = AFPERR_PARAM; - goto setdirparam_done; - } - } - break; - - /* Ignore what the client thinks we should do to the - ProDOS information block. Skip over the data and - report nothing amiss. */ - case DIRPBIT_PDINFO : - buf += 6; - break; - - default : - err = AFPERR_BITMAP; - goto setdirparam_done; - break; - } - - bitmap = bitmap>>1; - bit++; + bitmap = bitmap>>1; + bit++; } - setdirparam_done: + if (change_mdate && newdate == 0 && gettimeofday(&tv, NULL) == 0) { + newdate = AD_DATE_FROM_UNIX(tv.tv_sec); + } + if (newdate) { + if (isad) + ad_setdate(&ad, AD_DATE_MODIFY, newdate); + ut.actime = ut.modtime = AD_DATE_TO_UNIX(newdate); + utime(upath, &ut); + } + if ( isad ) { - ad_flush( &ad, ADFLAGS_HF ); - ad_close( &ad, ADFLAGS_HF ); + if (path->st_valid && !path->st_errno) { + struct stat *st = &path->st; + + if (dir && dir->d_parent) { + ad_setid(&ad, st->st_dev, st->st_ino, dir->d_did, dir->d_parent->d_did, vol->v_stamp); + } + } + ad_flush( &ad, ADFLAGS_HF ); + ad_close( &ad, ADFLAGS_HF ); + } + + if (change_parent_mdate && dir->d_did != DIRDID_ROOT + && gettimeofday(&tv, NULL) == 0) { + if (!movecwd(vol, dir->d_parent)) { + newdate = AD_DATE_FROM_UNIX(tv.tv_sec); + /* be careful with bitmap because now dir is null */ + bitmap = 1<v_flags & AFPVOL_RO) @@ -1372,89 +1988,52 @@ int afp_createdir(obj, ibuf, ibuflen, rbuf, rbuflen ) memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( did ); - if (( dir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; /* was AFPERR_NOOBJ */ + } + /* for concurrent access we need to be sure we are not in the + * folder we want to create... + */ + movecwd(vol, dir); + + if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) { + return get_afp_errno(AFPERR_PARAM); } + /* cname was able to move curdir to it! */ + if (*s_path->m_name == '\0') + return AFPERR_EXIST; - if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + upath = s_path->u_name; + if (0 != (err = check_name(vol, upath))) { + return err; } - /* check for illegal bits */ - if ((vol->v_flags & AFPVOL_MSWINDOWS) && - strpbrk(path, MSWINDOWS_BADCHARS)) - return AFPERR_PARAM; + if (AFP_OK != (err = netatalk_mkdir( upath))) { + return err; + } - upath = mtoupath(vol, path); - - if ((vol->v_flags & AFPVOL_NOHEX) && strchr(upath, '/')) - return AFPERR_PARAM; - - if (!validupath(vol, upath)) - return AFPERR_EXIST; - -#ifdef FORCE_UIDGID - save_uidgid ( uidgid ); - set_uidgid ( vol ); -#endif FORCE_UIDGID - - if ( ad_mkdir( upath, DIRBITS | 0777 ) < 0 ) { -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EROFS : - return( AFPERR_VLOCK ); - case EACCES : - return( AFPERR_ACCESS ); - case EEXIST : - return( AFPERR_EXIST ); - case ENOSPC : - case EDQUOT : - return( AFPERR_DFULL ); - default : - return( AFPERR_PARAM ); - } - } - - if (stat(upath, &st) < 0) { -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return AFPERR_MISC; - } - - if ((dir = adddir( vol, curdir, path, strlen( path ), upath, - strlen(upath), &st)) == NULL) { -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return AFPERR_MISC; - } + if (of_stat(s_path) < 0) { + return AFPERR_MISC; + } + curdir->offcnt++; + if ((dir = adddir( vol, curdir, s_path)) == NULL) { + return AFPERR_MISC; + } if ( movecwd( vol, dir ) < 0 ) { -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_PARAM ); - } - - memset(&ad, 0, sizeof(ad)); - if (ad_open( "", vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, - O_RDWR|O_CREAT, 0666, &ad ) < 0) { - if (vol_noadouble(vol)) - goto createdir_done; -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_ACCESS ); + return( AFPERR_PARAM ); } - - ad_setentrylen( &ad, ADEID_NAME, strlen( path )); - memcpy( ad_entry( &ad, ADEID_NAME ), path, - ad_getentrylen( &ad, ADEID_NAME )); + + ad_init(&ad, vol->v_adouble, vol->v_ad_options); + if (ad_open( ".", vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR, + O_RDWR|O_CREAT, 0666, &ad ) < 0) { + if (vol_noadouble(vol)) + goto createdir_done; + return( AFPERR_ACCESS ); + } + ad_setname(&ad, s_path->m_name); + ad_setid( &ad, s_path->st.st_dev, s_path->st.st_ino, dir->d_did, did, vol->v_stamp); + ad_flush( &ad, ADFLAGS_HF ); ad_close( &ad, ADFLAGS_HF ); @@ -1462,84 +2041,100 @@ createdir_done: memcpy( rbuf, &dir->d_did, sizeof( u_int32_t )); *rbuflen = sizeof( u_int32_t ); setvoltime(obj, vol ); -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID return( AFP_OK ); } - -int renamedir(src, dst, dir, newparent, newname, noadouble) - char *src, *dst, *newname; - struct dir *dir, *newparent; - const int noadouble; +/* + * dst new unix filename (not a pathname) + * newname new mac name + * newparent curdir + * +*/ +int renamedir(vol, src, dst, dir, newparent, newname) +const struct vol *vol; +char *src, *dst, *newname; +struct dir *dir, *newparent; { struct adouble ad; struct dir *parent; char *buf; int len, err; - + /* existence check moved to afp_moveandrename */ - if ( rename( src, dst ) < 0 ) { - switch ( errno ) { - case ENOENT : - return( AFPERR_NOOBJ ); - case EACCES : - return( AFPERR_ACCESS ); - case EROFS: - return AFPERR_VLOCK; - case EINVAL: - /* tried to move directory into a subdirectory of itself */ - return AFPERR_CANTMOVE; - case EXDEV: - /* this needs to copy and delete. bleah. that means we have - * to deal with entire directory hierarchies. */ - if ((err = copydir(src, dst, noadouble)) < 0) { - deletedir(dst); - return err; - } - if ((err = deletedir(src)) < 0) - return err; + if ( unix_rename( src, dst ) < 0 ) { + switch ( errno ) { + case ENOENT : + return( AFPERR_NOOBJ ); + case EACCES : + return( AFPERR_ACCESS ); + case EROFS: + return AFPERR_VLOCK; + case EINVAL: + /* tried to move directory into a subdirectory of itself */ + return AFPERR_CANTMOVE; + case EXDEV: + /* this needs to copy and delete. bleah. that means we have + * to deal with entire directory hierarchies. */ + if ((err = copydir(vol, src, dst)) < 0) { + deletedir(dst); + return err; + } + if ((err = deletedir(src)) < 0) + return err; break; - default : - return( AFPERR_PARAM ); - } - } - - memset(&ad, 0, sizeof(ad)); - if ( ad_open( dst, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR, 0, &ad) < 0 ) { - switch ( errno ) { - case ENOENT : - if (noadouble) { - len = strlen(newname); - goto renamedir_done; - } - return( AFPERR_NOOBJ ); - case EACCES : - return( AFPERR_ACCESS ); - default : - return( AFPERR_PARAM ); - } + default : + return( AFPERR_PARAM ); + } + } + + if (vol->v_adouble == AD_VERSION2_OSX) { + /* We simply move the corresponding ad file as well */ + char tempbuf[258]="._"; + rename(vol->ad_path(src,0),strcat(tempbuf,dst)); } + len = strlen( newname ); - ad_setentrylen( &ad, ADEID_NAME, len ); - memcpy( ad_entry( &ad, ADEID_NAME ), newname, len ); - ad_flush( &ad, ADFLAGS_HF ); - ad_close( &ad, ADFLAGS_HF ); + /* rename() succeeded so we need to update our tree even if we can't open + * .Parent + */ + + ad_init(&ad, vol->v_adouble, vol->v_ad_options); -renamedir_done: - if ((buf = (char *) realloc( dir->d_name, len + 1 )) == NULL ) { - syslog( LOG_ERR, "renamedir: realloc: %m" ); - return AFPERR_MISC; + if (!ad_open( dst, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR, 0, &ad)) { + ad_setname(&ad, newname); + ad_flush( &ad, ADFLAGS_HF ); + ad_close( &ad, ADFLAGS_HF ); + } + + if (dir->d_m_name == dir->d_u_name) + dir->d_u_name = NULL; + + if ((buf = (char *) realloc( dir->d_m_name, len + 1 )) == NULL ) { + LOG(log_error, logtype_afpd, "renamedir: realloc mac name: %s", strerror(errno) ); + /* FIXME : fatal ? */ + return AFPERR_MISC; + } + dir->d_m_name = buf; + strcpy( dir->d_m_name, newname ); + + if (newname == dst) { + free(dir->d_u_name); + dir->d_u_name = dir->d_m_name; + } + else { + if ((buf = (char *) realloc( dir->d_u_name, strlen(dst) + 1 )) == NULL ) { + LOG(log_error, logtype_afpd, "renamedir: realloc unix name: %s", strerror(errno) ); + return AFPERR_MISC; + } + dir->d_u_name = buf; + strcpy( dir->d_u_name, dst ); } - dir->d_name = buf; - strcpy( dir->d_name, newname ); if (( parent = dir->d_parent ) == NULL ) { - return( AFP_OK ); + return( AFP_OK ); } if ( parent == newparent ) { - return( AFP_OK ); + return( AFP_OK ); } /* detach from old parent and add to new one. */ @@ -1551,350 +2146,299 @@ renamedir_done: #define DOT_APPLEDOUBLE_LEN 13 /* delete an empty directory */ -int deletecurdir( vol, path, pathlen ) - const struct vol *vol; - char *path; - int pathlen; +int deletecurdir( vol, path ) +const struct vol *vol; +char *path; { struct dirent *de; struct stat st; struct dir *fdir; DIR *dp; -#ifdef FORCE_UIDGID - uidgidset *uidgid; -#endif FORCE_UIDGID + struct adouble ad; + u_int16_t ashort; + int err; if ( curdir->d_parent == NULL ) { - return( AFPERR_ACCESS ); - } - - if ( curdir->d_child != NULL ) { - return( AFPERR_DIRNEMPT ); + return( AFPERR_ACCESS ); } fdir = curdir; -#ifdef FORCE_UIDGID - save_uidgid ( uidgid ); - set_uidgid ( vol ); -#endif FORCE_UIDGID - - /* delete stray .AppleDouble files. this happens to get .Parent files - as well. */ - if ((dp = opendir(".AppleDouble"))) { - strcpy(path, ".AppleDouble/"); - while ((de = readdir(dp))) { - /* skip this and previous directory */ - if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) - continue; - - /* bail if the file exists in the current directory. - * note: this will not fail with dangling symlinks */ - if (stat(de->d_name, &st) == 0) { - closedir(dp); -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return AFPERR_DIRNEMPT; - } - - strcpy(path + DOT_APPLEDOUBLE_LEN, de->d_name); - if (unlink(path) < 0) { - closedir(dp); - switch (errno) { - case EPERM: - case EACCES : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_ACCESS ); - case EROFS: -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return AFPERR_VLOCK; - case ENOENT : - continue; - default : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_PARAM ); - } - } - } - closedir(dp); - } - - if ( rmdir( ".AppleDouble" ) < 0 ) { - switch ( errno ) { - case ENOENT : - break; - case ENOTEMPTY : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_DIRNEMPT ); - case EROFS: -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return AFPERR_VLOCK; - case EPERM: - case EACCES : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_ACCESS ); - default : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_PARAM ); - } + ad_init(&ad, vol->v_adouble, vol->v_ad_options); + if ( ad_metadata( ".", ADFLAGS_DIR, &ad) == 0 ) { + + ad_getattr(&ad, &ashort); + ad_close( &ad, ADFLAGS_HF ); + if ((ashort & htons(ATTRBIT_NODELETE))) { + return AFPERR_OLOCK; + } + } + + if (vol->v_adouble == AD_VERSION2_OSX) { + + if ((err = netatalk_unlink(vol->ad_path(".",0) )) ) { + return err; + } + } + else { + /* delete stray .AppleDouble files. this happens to get .Parent files + as well. */ + if ((dp = opendir(".AppleDouble"))) { + strcpy(path, ".AppleDouble/"); + while ((de = readdir(dp))) { + /* skip this and previous directory */ + if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) + continue; + + /* bail if the file exists in the current directory. + * note: this will not fail with dangling symlinks */ + if (stat(de->d_name, &st) == 0) { + closedir(dp); + return AFPERR_DIRNEMPT; + } + + strcpy(path + DOT_APPLEDOUBLE_LEN, de->d_name); + if ((err = netatalk_unlink(path))) { + closedir(dp); + return err; + } + } + closedir(dp); + } + + if ( (err = netatalk_rmdir( ".AppleDouble" )) ) { + return err; + } } /* now get rid of dangling symlinks */ if ((dp = opendir("."))) { - while ((de = readdir(dp))) { - /* skip this and previous directory */ - if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) - continue; - - /* bail if it's not a symlink */ - if ((lstat(de->d_name, &st) == 0) && !S_ISLNK(st.st_mode)) { -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return AFPERR_DIRNEMPT; - } - - if (unlink(de->d_name) < 0) { - switch (errno) { - case EPERM: - case EACCES : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_ACCESS ); - case EROFS: -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return AFPERR_VLOCK; - case ENOENT : - continue; - default : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_PARAM ); - } - } - } - closedir(dp); + while ((de = readdir(dp))) { + /* skip this and previous directory */ + if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) + continue; + + /* bail if it's not a symlink */ + if ((lstat(de->d_name, &st) == 0) && !S_ISLNK(st.st_mode)) { + closedir(dp); + return AFPERR_DIRNEMPT; + } + + if ((err = netatalk_unlink(de->d_name))) { + closedir(dp); + return err; + } + } } if ( movecwd( vol, curdir->d_parent ) < 0 ) { -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_NOOBJ ); - } - - if ( rmdir(mtoupath(vol, fdir->d_name)) < 0 ) { - switch ( errno ) { - case ENOENT : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_NOOBJ ); - case ENOTEMPTY : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_DIRNEMPT ); - case EPERM: - case EACCES : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_ACCESS ); - case EROFS: -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return AFPERR_VLOCK; - default : -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFPERR_PARAM ); - } - } - - dirchildremove(curdir, fdir); -#if AD_VERSION > AD_VERSION1 - cnid_delete(vol->v_db, fdir->d_did); -#endif - dir_remove( vol, fdir ); + err = afp_errno; + goto delete_done; + } -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return( AFP_OK ); + if ( !(err = netatalk_rmdir(fdir->d_u_name))) { + dirchildremove(curdir, fdir); + cnid_delete(vol->v_cdb, fdir->d_did); + dir_remove( vol, fdir ); + err = AFP_OK; + } +delete_done: + if (dp) { + /* inode is used as key for cnid. + * Close the descriptor only after cnid_delete + * has been called. + */ + closedir(dp); + } + return err; } int afp_mapid(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj; +char *ibuf, *rbuf; +int ibuflen _U_, *rbuflen; { struct passwd *pw; struct group *gr; char *name; u_int32_t id; int len, sfunc; - + int utf8 = 0; + ibuf++; sfunc = (unsigned char) *ibuf++; memcpy( &id, ibuf, sizeof( id )); + id = ntohl(id); + *rbuflen = 0; + + if (sfunc == 3 || sfunc == 4) { + if (afp_version < 30) { + return( AFPERR_PARAM ); + } + utf8 = 1; + } if ( id != 0 ) { - switch ( sfunc ) { - case 1 : - if (( pw = getpwuid( id )) == NULL ) { - *rbuflen = 0; - return( AFPERR_NOITEM ); - } - name = pw->pw_name; - break; - - case 2 : - if (( gr = (struct group *)getgrgid( id )) == NULL ) { - *rbuflen = 0; - return( AFPERR_NOITEM ); - } - name = gr->gr_name; - break; - - default : - *rbuflen = 0; - return( AFPERR_PARAM ); - } - - len = strlen( name ); + switch ( sfunc ) { + case 1 : + case 3 :/* unicode */ + if (( pw = getpwuid( id )) == NULL ) { + return( AFPERR_NOITEM ); + } + len = convert_string_allocate( obj->options.unixcharset, ((!utf8)?obj->options.maccharset:CH_UTF8_MAC), + pw->pw_name, strlen(pw->pw_name), &name); + break; + + case 2 : + case 4 : /* unicode */ + if (NULL == ( gr = (struct group *)getgrgid( id ))) { + return( AFPERR_NOITEM ); + } + len = convert_string_allocate( obj->options.unixcharset, (!utf8)?obj->options.maccharset:CH_UTF8_MAC, + gr->gr_name, strlen(gr->gr_name), &name); + break; + + default : + return( AFPERR_PARAM ); + } + len = strlen( name ); } else { - len = 0; - name = NULL; + len = 0; + name = NULL; + } + if (utf8) { + u_int16_t tp = htons(len); + memcpy(rbuf, &tp, sizeof(tp)); + rbuf += sizeof(tp); + *rbuflen += 2; + } + else { + *rbuf++ = len; + *rbuflen += 1; } - - *rbuf++ = len; if ( len > 0 ) { - memcpy( rbuf, name, len ); + memcpy( rbuf, name, len ); } - *rbuflen = len + 1; + *rbuflen += len; + if (name) + free(name); return( AFP_OK ); } int afp_mapname(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj _U_; +char *ibuf, *rbuf; +int ibuflen _U_, *rbuflen; { struct passwd *pw; struct group *gr; - int len, sfunc; - u_int32_t id; + int len, sfunc; + u_int32_t id; + u_int16_t ulen; ibuf++; sfunc = (unsigned char) *ibuf++; - len = (unsigned char) *ibuf++; + *rbuflen = 0; + switch ( sfunc ) { + case 1 : + case 2 : /* unicode */ + if (afp_version < 30) { + return( AFPERR_PARAM ); + } + memcpy(&ulen, ibuf, sizeof(ulen)); + len = ntohs(ulen); + ibuf += 2; + break; + case 3 : + case 4 : + len = (unsigned char) *ibuf++; + break; + default : + return( AFPERR_PARAM ); + } + ibuf[ len ] = '\0'; if ( len != 0 ) { - switch ( sfunc ) { - case 3 : - if (( pw = (struct passwd *)getpwnam( ibuf )) == NULL ) { - *rbuflen = 0; - return( AFPERR_NOITEM ); - } - id = pw->pw_uid; - break; - - case 4 : - if (( gr = (struct group *)getgrnam( ibuf )) == NULL ) { - *rbuflen = 0; - return( AFPERR_NOITEM ); - } - id = gr->gr_gid; - break; - default : - *rbuflen = 0; - return( AFPERR_PARAM ); - } + switch ( sfunc ) { + case 1 : /* unicode */ + case 3 : + if (NULL == ( pw = (struct passwd *)getpwnam( ibuf )) ) { + return( AFPERR_NOITEM ); + } + id = pw->pw_uid; + break; + + case 2 : /* unicode */ + case 4 : + if (NULL == ( gr = (struct group *)getgrnam( ibuf ))) { + return( AFPERR_NOITEM ); + } + id = gr->gr_gid; + break; + } } else { - id = 0; + id = 0; } - + id = htonl(id); memcpy( rbuf, &id, sizeof( id )); *rbuflen = sizeof( id ); return( AFP_OK ); } -/* variable DID support */ +/* ------------------------------------ + variable DID support +*/ int afp_closedir(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj _U_; +char *ibuf _U_, *rbuf _U_; +int ibuflen _U_, *rbuflen; { #if 0 struct vol *vol; struct dir *dir; u_int16_t vid; u_int32_t did; -#endif +#endif /* 0 */ - *rbuflen = 0; + *rbuflen = 0; - /* do nothing as dids are static for the life of the process. */ + /* do nothing as dids are static for the life of the process. */ #if 0 ibuf += 2; memcpy(&vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM ); + return( AFPERR_PARAM ); } memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( did ); - if (( dir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_PARAM ); + if (( dir = dirlookup( vol, did )) == NULL ) { + return( AFPERR_PARAM ); } /* dir_remove -- deletedid */ -#endif +#endif /* 0 */ return AFP_OK; } -/* did creation gets done automatically */ +/* did creation gets done automatically + * there's a pb again with case but move it to cname +*/ int afp_opendir(obj, ibuf, ibuflen, rbuf, rbuflen ) - AFPObj *obj; - char *ibuf, *rbuf; - int ibuflen, *rbuflen; +AFPObj *obj _U_; +char *ibuf, *rbuf; +int ibuflen _U_, *rbuflen; { struct vol *vol; - struct dir *dir, *parentdir; - struct stat st; - char *path, *upath; + struct dir *parentdir; + struct path *path; u_int32_t did; u_int16_t vid; -#ifdef FORCE_UIDGID - uidgidset *uidgid; -#endif FORCE_UIDGID *rbuflen = 0; ibuf += 2; @@ -1902,55 +2446,33 @@ int afp_opendir(obj, ibuf, ibuflen, rbuf, rbuflen ) memcpy(&vid, ibuf, sizeof(vid)); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { - return( AFPERR_PARAM ); + if (NULL == ( vol = getvolbyvid( vid )) ) { + return( AFPERR_PARAM ); } memcpy(&did, ibuf, sizeof(did)); ibuf += sizeof(did); - if (( parentdir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( parentdir = dirlookup( vol, did )) ) { + return afp_errno; } - if (( path = cname( vol, parentdir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, parentdir, &ibuf )) ) { + return get_afp_errno(AFPERR_PARAM); } - /* see if we already have the directory. */ - upath = mtoupath(vol, path); - if ( stat( upath, &st ) < 0 ) { - return( AFPERR_NOOBJ ); + if ( *path->m_name != '\0' ) { + return path_error(path, AFPERR_NOOBJ); } - dir = parentdir->d_child; - while (dir) { - if (strdiacasecmp(dir->d_name, path) == 0) { - memcpy(rbuf, &dir->d_did, sizeof(dir->d_did)); - *rbuflen = sizeof(dir->d_did); - return AFP_OK; - } - dir = (dir == parentdir->d_child->d_prev) ? NULL : dir->d_next; - } - -#ifdef FORCE_UIDGID - save_uidgid ( uidgid ); - set_uidgid ( vol ); -#endif FORCE_UIDGID - - /* we don't already have a did. add one in. */ - if ((dir = adddir(vol, parentdir, path, strlen(path), - upath, strlen(upath), &st)) == NULL) { -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID - return AFPERR_MISC; - } - - memcpy(rbuf, &dir->d_did, sizeof(dir->d_did)); - *rbuflen = sizeof(dir->d_did); -#ifdef FORCE_UIDGID - restore_uidgid ( uidgid ); -#endif FORCE_UIDGID + if ( !path->st_valid && of_stat(path ) < 0 ) { + return( AFPERR_NOOBJ ); + } + if ( path->st_errno ) { + return( AFPERR_NOOBJ ); + } + + memcpy(rbuf, &curdir->d_did, sizeof(curdir->d_did)); + *rbuflen = sizeof(curdir->d_did); return AFP_OK; }