/*
- * $Id: directory.c,v 1.38 2002-08-29 18:57:26 didg Exp $
+ * $Id: directory.c,v 1.83 2006-09-19 23:00:49 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include "config.h"
#endif /* HAVE_CONFIG_H */
-#include <atalk/logger.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/param.h>
-#include <netatalk/endian.h>
-#include <atalk/adouble.h>
-#include <atalk/afp.h>
-#include <atalk/util.h>
-#ifdef CNID_DB
-#include <atalk/cnid.h>
-#endif /* CNID_DB */
-#include <utime.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <dirent.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#include <grp.h>
-#include <pwd.h>
-
/* STDC check */
#if STDC_HEADERS
#include <string.h>
#define memmove(d,s,n) bcopy ((s), (d), (n))
#endif /* ! HAVE_MEMCPY */
#endif /* STDC_HEADERS */
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <dirent.h>
+
+#include <grp.h>
+#include <pwd.h>
+#include <sys/param.h>
+#include <errno.h>
+#include <utime.h>
+#include <atalk/adouble.h>
+
+#include <atalk/afp.h>
+#include <atalk/util.h>
+#include <atalk/cnid.h>
+#include <atalk/logger.h>
#include "directory.h"
#include "desktop.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, NULL};
+static struct dir rootpar = { SENTINEL, SENTINEL, NULL, 0,
+ NULL, NULL, NULL, NULL, NULL, 0, 0,
+ 0, 0, NULL, NULL, NULL};
/* (from IM: Toolbox Essentials)
* dirFinderInfo (DInfo) fields:
/* 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 );
}
-
+#if 0
+ /* XXX would be nice to check against curdir but we need to keep its volume */
+ if (vol->curdir && curdir->d_did == did) {
+ dir = curdir;
+ }
+ else {
+ dir = vol->v_root;
+ }
+#endif
dir = vol->v_root;
+
+ afp_errno = AFPERR_NOOBJ;
while ( dir != SENTINEL ) {
if (dir->d_did == did)
- return dir->d_name ? dir : NULL;
+ 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( const struct vol *vol, struct dir *cdir, char *name)
+{
+struct dir *dir = NULL;
+
+ if ((cdir->d_did != DIRDID_ROOT_PARENT) && (cdir->d_child)) {
+ struct dir key;
+ hnode_t *hn;
+
+ key.d_parent = cdir;
+ key.d_u_name = name;
+ hn = hash_lookup(vol->v_hash, &key);
+ if (hn) {
+ dir = hnode_get(hn);
+ }
+ }
+ 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;
{
-#ifdef CNID_DB
- struct dir *ret;
- char *upath;
- u_int32_t id;
- static char path[MAXPATHLEN + 1];
- int len;
- int pathlen;
- char *ptr;
- static char buffer[12 + MAXPATHLEN + 1];
- int buflen = 12 + MAXPATHLEN + 1;
-
+ 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)
+ if (ret != NULL || afp_errno == AFPERR_PARAM)
return ret;
+ utf8 = utf8_encoding();
+ maxpath = (utf8)?MAXPATHLEN -7:255;
id = did;
- if ((upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) == NULL) {
+ if (NULL == (upath = cnid_resolve(vol->v_cdb, &id, buffer, buflen)) ) {
+ afp_errno = AFPERR_NOOBJ;
return NULL;
}
ptr = path + MAXPATHLEN;
- len = strlen(upath);
+ 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, upath);
+ strcpy(ptr - len, mpath);
ptr -= len;
while (1) {
ret = dirsearch(vol,id);
if (ret != NULL) {
break;
}
- if ((upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) == NULL)
+ 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(upath) + 1;
+ }
+
+ len = strlen(mpath) + 1;
pathlen += len;
- if (pathlen > 255)
+ if (pathlen > maxpath) {
+ afp_errno = AFPERR_PARAM;
return NULL;
- strcpy(ptr - len, upath);
+ }
+ strcpy(ptr - len, mpath);
ptr -= len;
}
- /* fill the cache */
- ptr--;
- *ptr = (unsigned char)pathlen;
- ptr--;
- *ptr = 2;
+
+ /* 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;
-#endif
+
return dirsearch(vol, did);
}
+/* child addition/removal */
+static void dirchildadd(const struct vol *vol, struct dir *a, struct dir *b)
+{
+ if (!a->d_child)
+ a->d_child = b;
+ else {
+ b->d_next = a->d_child;
+ b->d_prev = b->d_next->d_prev;
+ b->d_next->d_prev = b;
+ b->d_prev->d_next = b;
+ }
+ if (!hash_alloc_insert(vol->v_hash, b, b)) {
+ LOG(log_error, logtype_afpd, "dirchildadd: can't hash %s", b->d_u_name);
+ }
+}
+
+static void dirchildremove(struct dir *a,struct dir *b)
+{
+ if (a->d_child == b)
+ a->d_child = (b == b->d_next) ? NULL : b->d_next;
+ b->d_next->d_prev = b->d_prev;
+ b->d_prev->d_next = b->d_next;
+ b->d_next = b->d_prev = b;
+}
+
/* --------------------------- */
/* rotate the tree to the left */
static void dir_leftrotate(vol, dir)
}
#endif /* 0 */
+/* --------------------- */
+static void dir_hash_del(const struct vol *vol, struct dir *dir)
+{
+ hnode_t *hn;
+
+ hn = hash_lookup(vol->v_hash, dir);
+ if (!hn) {
+ LOG(log_error, logtype_afpd, "dir_hash_del: %s not hashed", dir->d_u_name);
+ }
+ else {
+ hash_delete(vol->v_hash, hn);
+ }
+}
/* remove the node from the tree. this is just like insertion, but
* different. actually, it has to worry about a bunch of things that
struct ofork *of, *last;
struct dir *node, *leaf;
#endif /* REMOVE_NODES */
-
+
if (!dir || (dir == SENTINEL))
return;
-
+
/* i'm not sure if it really helps to delete stuff. */
+ dir_hash_del(vol, dir);
#ifndef REMOVE_NODES
- free(dir->d_name);
- dir->d_name = NULL;
+ dirfreename(dir);
+ dir->d_m_name = NULL;
+ dir->d_u_name = NULL;
+ dir->d_m_name_ucs2 = NULL;
#else /* ! REMOVE_NODES */
/* go searching for a node with at most one child */
}
/* set the node's d_name */
- node->d_name = save.d_name;
+ node->d_m_name = save.d_m_name;
+ node->d_u_name = save.d_u_name;
+ node->d_m_name_ucs2 = save.d_m_name_ucs2;
}
if (node->d_color == DIRTREE_COLOR_BLACK)
dir_rmrecolor(vol, leaf);
- free(node->d_name);
+
+ if (node->d_m_name_ucs2)
+ free(node->d_u_name_ucs2);
+ if (node->d_u_name != node->d_m_name) {
+ free(node->d_u_name);
+ }
+ free(node->d_m_name);
free(node);
#endif /* ! REMOVE_NODES */
}
* 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)
- printf("Yuup cant change dir to v_root\n");
- }
- /* FIXME */
+ 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 );
+ dir_remove( vol, dir );
}
/* ------------------------------------ */
return pdir;
}
+#define ENUMVETO "./../Network Trash Folder/TheVolumeSettingsFolder/TheFindByContentFolder/:2eDS_Store/Contents/Desktop Folder/Trash/Benutzer/"
+
+int
+caseenumerate(const struct vol *vol, struct path *path, struct dir *dir)
+{
+ DIR *dp;
+ struct dirent *de;
+ int ret;
+ static u_int32_t did = 0;
+ static char cname[MAXPATHLEN];
+ static char lname[MAXPATHLEN];
+ ucs2_t u2_path[MAXPATHLEN];
+ ucs2_t u2_dename[MAXPATHLEN];
+ char *tmp, *savepath;
+
+ if (veto_file(ENUMVETO, path->u_name))
+ return -1;
+
+ savepath = path->u_name;
+
+ /* very simple cache */
+ if ( dir->d_did == did && strcmp(lname, path->u_name) == 0) {
+ path->u_name = cname;
+ path->d_dir = NULL;
+ if (of_stat( path ) == 0 ) {
+ return 0;
+ }
+ /* something changed, we cannot stat ... */
+ did = 0;
+ }
+
+ if (NULL == ( dp = opendir( "." )) ) {
+ LOG(log_debug, logtype_afpd, "caseenumerate: opendir failed: %s", dir->d_u_name);
+ return -1;
+ }
+
+
+ /* LOG(log_debug, logtype_afpd, "caseenumerate: for %s", path->u_name); */
+ if ((size_t) -1 == convert_string(vol->v_volcharset, CH_UCS2, path->u_name, strlen(path->u_name), u2_path, sizeof(u2_path)) )
+ LOG(log_debug, logtype_afpd, "caseenumerate: conversion failed for %s", path->u_name);
+
+ /*LOG(log_debug, logtype_afpd, "caseenumerate: dir: %s, path: %s", dir->d_u_name, path->u_name); */
+ ret = -1;
+ for ( de = readdir( dp ); de != NULL; de = readdir( dp )) {
+ if (NULL == check_dirent(vol, de->d_name))
+ continue;
+
+ if ((size_t) -1 == convert_string(vol->v_volcharset, CH_UCS2, de->d_name, strlen(de->d_name), u2_dename, sizeof(u2_dename)) )
+ continue;
+
+ if (strcasecmp_w( u2_path, u2_dename) == 0) {
+ tmp = path->u_name;
+ strlcpy(cname, de->d_name, sizeof(cname));
+ path->u_name = cname;
+ path->d_dir = NULL;
+ if (of_stat( path ) == 0 ) {
+ LOG(log_debug, logtype_afpd, "caseenumerate: using dir: %s, path: %s", de->d_name, path->u_name);
+ strlcpy(lname, tmp, sizeof(lname));
+ did = dir->d_did;
+ ret = 0;
+ break;
+ }
+ else
+ path->u_name = tmp;
+ }
+
+ }
+ closedir(dp);
+
+ if (ret) {
+ /* invalidate cache */
+ memset(cname, 0, sizeof(cname));
+ did = 0;
+ path->u_name = savepath;
+ }
+ /* LOG(log_debug, logtype_afpd, "caseenumerate: path on ret: %s", path->u_name); */
+ return ret;
+}
+
/*
* 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 vol *vol;
struct dir *dir;
-char *path;
+struct path *path;
{
- char *p;
- struct stat st;
+ path->d_dir = NULL;
- p = mtoupath(vol, path );
- if ( stat( p, &st ) != 0 ) {
- return( NULL );
+ if ( path->u_name == NULL) {
+ afp_errno = AFPERR_PARAM;
+ return NULL;
}
- if (!S_ISDIR(st.st_mode)) {
+ if (of_stat( path ) != 0 ) {
+ if (!(vol->v_flags & AFPVOL_CASEINSEN))
+ return NULL;
+ else if(caseenumerate(vol, path, dir) != 0)
+ return(NULL);
+ }
+
+ if (!S_ISDIR(path->st.st_mode)) {
return( NULL );
}
- if (( dir = adddir( vol, dir, path, strlen( path ), p, strlen(p),
- &st)) == NULL ) {
+ /* mac name is always with the right encoding (from cname()) */
+ if (( dir = adddir( vol, dir, path)) == NULL ) {
return( NULL );
}
+ path->d_dir = dir;
if ( movecwd( vol, dir ) < 0 ) {
return( NULL );
}
return( dir );
}
+/* -------------------
+ system rmdir with afp error code.
+ ENOENT is not an error.
+ */
+int netatalk_rmdir(const char *name)
+{
+ 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;
+}
+
+/* -------------------
+ 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;
+}
+
+/* ------------------- */
static int deletedir(char *dir)
{
char path[MAXPATHLEN + 1];
DIR *dp;
struct dirent *de;
struct stat st;
- int len, err;
+ size_t len;
+ int err = AFP_OK;
+ size_t remain;
- if ((len = strlen(dir)) > sizeof(path))
+ if ((len = strlen(dir)) +2 > sizeof(path))
return AFPERR_PARAM;
/* already gone */
strcpy(path, dir);
strcat(path, "/");
len++;
- while ((de = readdir(dp))) {
+ 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;
- 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;
- break;
- case EPERM:
- case EACCES :
- err = AFPERR_ACCESS;
- break;
- default :
- err = AFPERR_PARAM;
- }
- closedir(dp);
- return err;
- }
+ 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 (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 );
- }
+ 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;
+ 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) ||
return AFPERR_PARAM;
/* try to create the destination directory */
- if (ad_mkdir(dst, DIRBITS | 0777) < 0) {
+ if (AFP_OK != (err = netatalk_mkdir(dst)) ) {
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 );
- }
+ 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;
- strncpy(spath + slen, de->d_name, sizeof(spath) - slen);
+ if (strlen(de->d_name) > srem) {
+ err = AFPERR_PARAM;
+ break;
+ }
+ strcpy(spath + slen, de->d_name);
+
if (stat(spath, &st) == 0) {
- strncpy(dpath + dlen, de->d_name, sizeof(dpath) - dlen);
+ if (strlen(de->d_name) > drem) {
+ err = AFPERR_PARAM;
+ break;
+ }
+ strcpy(dpath + dlen, de->d_name);
if (S_ISDIR(st.st_mode)) {
- if ((err = copydir(spath, dpath, noadouble)) < 0)
+ if (AFP_OK != (err = copydir(vol, spath, dpath)))
goto copydir_done;
- } else if ((err = copyfile(spath, dpath, NULL, noadouble)) < 0) {
+ } else if (AFP_OK != (err = copyfile(vol, vol, spath, dpath, NULL, NULL))) {
goto copydir_done;
} else {
/* --- public functions follow --- */
/* NOTE: we start off with at least one node (the root directory). */
-struct dir *dirinsert( vol, dir )
+static struct dir *dirinsert( vol, dir )
struct vol *vol;
struct dir *dir;
{
return NULL;
}
+/* ---------------------------- */
+struct dir *
+ adddir( vol, dir, path)
+struct vol *vol;
+struct dir *dir;
+struct path *path;
+{
+ struct dir *cdir, *edir;
+ int upathlen;
+ char *name;
+ char *upath;
+ struct stat *st;
+ int deleted;
+ cnid_t id;
+
+ upath = path->u_name;
+ st = &path->st;
+ upathlen = strlen(upath);
+
+ id = get_id(vol, NULL, st, dir->d_did, upath, upathlen);
+ if (id == 0) {
+ return NULL;
+ }
+ if (!path->m_name && !(path->m_name = utompath(vol, upath, id , utf8_encoding()))) {
+ return NULL;
+ }
+ name = path->m_name;
+ if ((cdir = dirnew(name, upath)) == NULL) {
+ LOG(log_error, logtype_afpd, "adddir: malloc: %s", strerror(errno) );
+ return NULL;
+ }
+ if ((size_t)-1 == convert_string_allocate((utf8_encoding())?CH_UTF8_MAC:vol->v_maccharset, CH_UCS2, path->m_name, strlen(path->m_name), &cdir->d_m_name_ucs2)) {
+ LOG(log_error, logtype_afpd, "Couldn't set UCS2 name for %s", name);
+ cdir->d_m_name_ucs2 = NULL;
+ }
+
+ cdir->d_did = id;
+
+ if ((edir = dirinsert( vol, cdir ))) {
+ /* it's not possible with LASTDID
+ for CNID:
+ - someone else have moved the directory.
+ - it's a symlink inside the share.
+ - it's an ID reused, the old directory was deleted but not
+ the cnid record and the server've reused the inode for
+ the new dir.
+ for HASH (we should get ride of HASH)
+ - someone else have moved the directory.
+ - it's an ID reused as above
+ - it's a hash duplicate and we are in big trouble
+ */
+ deleted = (edir->d_m_name == NULL);
+ if (!deleted)
+ dir_hash_del(vol, edir);
+ dirfreename(edir);
+ edir->d_m_name = cdir->d_m_name;
+ edir->d_u_name = cdir->d_u_name;
+ edir->d_m_name_ucs2 = cdir->d_m_name_ucs2;
+ free(cdir);
+ cdir = edir;
+ LOG(log_error, logtype_afpd, "adddir: insert %s", edir->d_m_name);
+ if (!cdir->d_parent || (cdir->d_parent == dir && !deleted)) {
+ hash_alloc_insert(vol->v_hash, cdir, cdir);
+ return cdir;
+ }
+ /* the old was not in the same folder */
+ if (!deleted)
+ dirchildremove(cdir->d_parent, cdir);
+ }
+
+ /* parent/child directories */
+ cdir->d_parent = dir;
+ dirchildadd(vol, dir, cdir);
+ return( cdir );
+}
+
+/* --- public functions follow --- */
/* 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);
+ }
+ if (dir->d_m_name_ucs2)
+ free(dir->d_m_name_ucs2);
+ free(dir->d_m_name);
+}
+
void dirfree( dir )
struct dir *dir;
{
}
if (dir != SENTINEL) {
- free( dir->d_name );
+ 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;
if (!dir)
return NULL;
- if ((dir->d_name = (char *) malloc(sizeof(char)*len)) == NULL) {
+ if ((dir->d_m_name = strdup(m_name)) == NULL) {
+ free(dir);
+ return NULL;
+ }
+
+ if (m_name == u_name || !strcmp(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_m_name_ucs2 = NULL;
dir->d_left = dir->d_right = SENTINEL;
dir->d_next = dir->d_prev = dir;
return dir;
}
+/* ------------------ */
+static hash_val_t hash_fun_dir(const void *key)
+{
+const struct dir *k = key;
+
+ static unsigned long randbox[] = {
+ 0x49848f1bU, 0xe6255dbaU, 0x36da5bdcU, 0x47bf94e9U,
+ 0x8cbcce22U, 0x559fc06aU, 0xd268f536U, 0xe10af79aU,
+ 0xc1af4d69U, 0x1d2917b5U, 0xec4c304dU, 0x9ee5016cU,
+ 0x69232f74U, 0xfead7bb3U, 0xe9089ab6U, 0xf012f6aeU,
+ };
+
+ const unsigned char *str = k->d_u_name;
+ hash_val_t acc = 0;
+
+ while (*str) {
+ acc ^= randbox[(*str + acc) & 0xf];
+ acc = (acc << 1) | (acc >> 31);
+ acc &= 0xffffffffU;
+ acc ^= randbox[((*str++ >> 4) + acc) & 0xf];
+ acc = (acc << 2) | (acc >> 30);
+ acc &= 0xffffffffU;
+ }
+ return acc;
+}
-/* XXX: this needs to be changed to handle path types */
-char *
-cname( vol, dir, cpath )
-const struct vol *vol;
-struct dir *dir;
-char **cpath;
+/* ---------------- */
+static int hash_comp_dir(const void *key1, const void *key2)
{
- struct dir *cdir;
- static char path[ MAXPATHLEN + 1];
- char *data, *p;
- char *u;
- int extend = 0;
- int len;
- int olen = 0;
-
- data = *cpath;
- if ( *data++ != 2 ) { /* path type */
- return( NULL );
- }
- len = (unsigned char) *data++;
- *cpath += len + 2;
- *path = '\0';
- u = NULL;
+const struct dir *k1 = key1;
+const struct dir *k2 = key2;
+
+ return !(k1->d_parent->d_did == k2->d_parent->d_did && !strcmp(k1->d_u_name, k2->d_u_name));
+}
+
+/* ---------------- */
+hash_t *
+dirhash(void)
+{
+ return hash_create(HASHCOUNT_T_MAX, hash_comp_dir, hash_fun_dir);
+}
+
+/* ------------------ */
+static struct path *invalidate (const struct vol *vol, struct dir *dir, struct path *ret)
+{
+ /* 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 these?, 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(ret->m_name, dir->d_m_name);
+ if (dir->d_m_name == dir->d_u_name) {
+ ret->u_name = ret->m_name;
+ }
+ else {
+ size_t tp = strlen(ret->m_name)+1;
+
+ ret->u_name = ret->m_name +tp;
+ strcpy(ret->u_name, dir->d_u_name);
+ }
+ /* FIXME should we set :
+ ret->st_valid = 1;
+ ret->st_errno = ENOENT;
+ */
+ dir_invalidate(vol, dir);
+ return ret;
+ }
+ dir_invalidate(vol, dir);
+ return NULL;
+}
+/* -------------------------------------------------- */
+/* 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;
+{
+ struct dir *cdir, *scdir=NULL;
+ 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;
+ afp_errno = AFPERR_NOOBJ;
+ memset(&ret, 0, sizeof(ret));
+ 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;
for ( ;; ) {
if ( len == 0 ) {
- if ( !extend && movecwd( vol, dir ) < 0 ) {
- /* it's tricky:
- movecwd failed so dir is not there anymore.
- FIXME Is it true with other errors?
- if path == '\0' ==> the cpath parameter is that dir,
- and maybe we are trying to recreate it! So we can't
- fail here.
-
- */
- if ( dir->d_did == DIRDID_ROOT_PARENT)
- return NULL;
- cdir = dir->d_parent;
- dir_invalidate(vol, dir);
- if (*path != '\0' || u == NULL) {
- /* FIXME: if path != '\0' then extend != 0 ?
- * u == NUL ==> cpath is something like:
- * toto\0\0\0
- */
- return NULL;
- }
- if (movecwd(vol, cdir) < 0) {
- printf("can't change to parent\n");
- return NULL; /* give up the whole tree is out of synch*/
- }
- /* restore the previous token */
- strncpy(path, u, olen);
- path[olen] = '\0';
+ if (movecwd( vol, dir ) < 0 ) {
+ return invalidate(vol, dir, &ret );
}
- return( path );
+ if (*path == '\0') {
+ ret.u_name = ".";
+ ret.d_dir = dir;
+ }
+ return &ret;
}
- if ( *data == '\0' ) {
+ if (*data == sep ) {
data++;
len--;
}
- u = NULL;
-
- while ( *data == '\0' && len > 0 ) {
+ while (*data == sep && len > 0 ) {
if ( dir->d_parent == NULL ) {
- return( NULL );
+ return NULL;
}
dir = dir->d_parent;
data++;
/* would this be faster with strlen + strncpy? */
p = path;
- if (len > 0) {
- u = data;
- olen = len;
- }
- while ( *data != '\0' && len > 0 ) {
+ while ( *data != sep && len > 0 ) {
*p++ = *data++;
+ if (p > &path[ MAXPATHLEN]) {
+ afp_errno = AFPERR_PARAM;
+ return( NULL );
+ }
len--;
}
if (len == 1)
len--;
-#ifdef notdef
- /*
- * Dung Nguyen <ntd@adb.fr>
- *
- * 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;
+ if ( p == path ) { /* end of the name parameter */
+ continue;
+ }
+ 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 demangle_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 (ret.u_name == NULL) {
+ if (!(ret.u_name = mtoupath(vol, ret.m_name, dir->d_did, utf8_encoding()))) {
+ afp_errno = AFPERR_PARAM;
+ return NULL;
+ }
+ }
+ if ( !extend ) {
+ ucs2_t *tmpname;
+ cdir = dir->d_child;
+ scdir = NULL;
+ if ( cdir && (vol->v_flags & AFPVOL_CASEINSEN) &&
+ (size_t)-1 != convert_string_allocate(((ret.m_type == 3)?CH_UTF8_MAC:vol->v_maccharset),
+ CH_UCS2, path, strlen(path), (char **)&tmpname) )
+ {
while (cdir) {
- if ( strcasecmp( cdir->d_name, path ) == 0 ) {
- break;
+ if (!cdir->d_m_name_ucs2) {
+ LOG(log_error, logtype_afpd, "cname: no UCS2 name for %s (did %u)!!!", cdir->d_m_name, ntohl(cdir->d_did) );
+ /* this shouldn't happen !!!! */
+ goto noucsfallback;
+ }
+
+ if ( strcmp_w( cdir->d_m_name_ucs2, tmpname ) == 0 ) {
+ break;
}
- cdir = (cdir == dir->d_child->d_prev) ? NULL :
- cdir->d_next;
+ if ( strcasecmp_w( cdir->d_m_name_ucs2, tmpname ) == 0 ) {
+ scdir = cdir;
+ }
+ 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 failed in extenddir
+ free(tmpname);
+ }
+ else {
+noucsfallback:
+ if (dir->d_did == DIRDID_ROOT_PARENT) {
+ /* root parent has only one child and d_m_name is *NOT* utm (d_u_name)
+ * d_m_name is the Mac volume name
+ * d_u_name is the volume unix directory name
+ *
*/
- if ( movecwd( vol, dir ) < 0 ) {
- /* dir is not valid anymore
- we delete dir from the cache and abort.
- */
- dir_invalidate(vol, dir);
- return( NULL );
+ cdir = NULL;
+ if (!strcmp(vol->v_dir->d_m_name, ret.m_name)) {
+ cdir = vol->v_dir;
}
- cdir = extenddir( vol, dir, path );
}
+ else {
+ cdir = dirsearch_byname(vol, dir, ret.u_name);
+ }
+ }
- } else {
- cdir = extenddir( vol, dir, path );
+ if (cdir == NULL && scdir != NULL) {
+ cdir = scdir;
+ /* LOG(log_debug, logtype_afpd, "cname: using casediff for %s, (%s = %s)", fullpathname(cdir->d_u_name), cdir->d_m_name, path ); */
}
if ( cdir == NULL ) {
- if ( len > 0 ) {
- return( 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 {
- dir = cdir;
- *path = '\0';
+ } else {
+ cdir = extenddir( vol, dir, &ret );
+ } /* if (!extend) */
+
+ if ( cdir == NULL ) {
+
+ if ( len > 0) {
+ return NULL;
}
+
+ } else {
+ dir = cdir;
+ *path = '\0';
}
- }
+ } /* for (;;) */
}
/*
return( 0 );
}
if ( dir->d_did == DIRDID_ROOT_PARENT) {
+ afp_errno = AFPERR_DID1; /* AFPERR_PARAM;*/
return( -1 );
}
*p-- = '\0';
*p = '.';
for ( d = dir; d->d_parent != NULL && d != curdir; d = d->d_parent ) {
- *--p = '/';
- u = mtoupath(vol, d->d_name );
+ 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;
- strncpy( p, u, n );
+ memcpy( p, u, n );
}
if ( d != curdir ) {
- *--p = '/';
n = strlen( vol->v_path );
+ if (p -n -1 < path) {
+ afp_errno = AFPERR_PARAM;
+ return -1;
+ }
+ *--p = '/';
p -= n;
- strncpy( p, vol->v_path, n );
+ memcpy( p, vol->v_path, n );
}
if ( chdir( p ) < 0 ) {
+ switch (errno) {
+ case EACCES:
+ case EPERM:
+ afp_errno = AFPERR_ACCESS;
+ break;
+ default:
+ afp_errno = AFPERR_NOOBJ;
+
+ }
return( -1 );
}
curdir = dir;
return( 0 );
}
+/*
+ * 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;
+
+}
+
+/* --------------------- */
+void setdiroffcnt(struct dir *dir, struct stat *st, u_int32_t count)
+{
+ dir->offcnt = count;
+ dir->ctime = st->st_ctime;
+ dir->d_flags &= ~DIRF_CNID;
+}
+
+/* ---------------------
+ * is our cached offspring count valid?
+*/
+
+int diroffcnt(struct dir *dir, struct stat *st)
+{
+ return st->st_ctime == dir->ctime;
+}
+
+/* ---------------------
+ * is our cached also for reenumerate id?
+*/
+
+int dirreenumerate(struct dir *dir, struct stat *st)
+{
+ return st->st_ctime == dir->ctime && (dir->d_flags & DIRF_CNID);
+}
+
+/* --------------------- */
+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,
- char *upath, struct dir *dir, struct stat *st,
+ 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;
- memset(&uidgid, 0, sizeof(uidgid));
-#endif /* FORCE_UIDGID */
-
- memset(&ad, 0, sizeof(ad));
-
-#ifdef FORCE_UIDGID
- save_uidgid ( &uidgid );
- set_uidgid ( vol );
-#endif /* FORCE_UIDGID */
-
- if ( ad_open( upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY,
- DIRBITS | 0777, &ad) < 0 ) {
- isad = 0;
+ 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)))) {
+
+ 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 ) {
case DIRPBIT_ATTR :
if ( isad ) {
ad_getattr(&ad, &ashort);
- } else if (*upath == '.' && strcmp(upath, ".") &&
- strcmp(upath, "..")) {
+ } else if (invisible_dots(vol, dir->d_u_name)) {
ashort = htons(ATTRBIT_INVISIBLE);
} else
ashort = 0;
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 );
+ memcpy( data, &pdid, sizeof( pdid ));
+ data += sizeof( pdid );
break;
case DIRPBIT_CDATE :
ashort = htons(FINDERINFO_CLOSEDVIEW);
memcpy(data + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort));
- /* dot files are by default invisible */
- if (*upath == '.' && strcmp(upath, ".") &&
- strcmp(upath, "..")) {
+ /* 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));
+ 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;
+ 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 );
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;
-
- /* check for vetoed filenames */
- if (veto_file(vol->v_veto, de->d_name))
- continue;
-
- /* now check against too long a filename */
- if (strlen(utompath(vol, de->d_name)) > MACFILELEN)
- continue;
-
- ashort++;
- }
- closedir( dp );
+ if (diroffcnt(dir, st)) {
+ ashort = (dir->offcnt > 0xffff)?0xffff:dir->offcnt;
+ }
+ else if ((ret = for_each_dirent(vol, upath, NULL,NULL)) >= 0) {
+ setdiroffcnt(dir, st, ret);
+ ashort = (dir->offcnt > 0xffff)?0xffff:dir->offcnt;
}
ashort = htons( ashort );
memcpy( data, &ashort, sizeof( ashort ));
/* Client has requested the ProDOS information block.
Just pass back the same basic block for all
directories. <shirsch@ibm.net> */
- 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 );
+ 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 );
+
+ 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 );
+ ad_close_metadata( &ad );
}
-#ifdef FORCE_UIDGID
- restore_uidgid ( &uidgid );
-#endif /* FORCE_UIDGID */
return( AFPERR_BITMAP );
}
bitmap = bitmap>>1;
bit++;
}
- if ( nameoff ) {
+ if ( l_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;
+ 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 );
+ ad_close_metadata( &ad );
}
*buflen = data - buf;
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;
memcpy( &vid, ibuf, sizeof( vid ));
ibuf += sizeof( vid );
- if (( vol = getvolbyvid( vid )) == NULL ) {
+ if (NULL == ( vol = getvolbyvid( vid )) ) {
return( AFPERR_PARAM );
}
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 != '\0' ) {
- return( AFPERR_BADTYPE ); /* not a directory */
+ 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;
}
/*
ibuf++;
}
- if (( rc = setdirparams(vol, path, bitmap, ibuf )) == AFP_OK ) {
+ if (AFP_OK == ( rc = setdirparams(vol, path, bitmap, ibuf )) ) {
setvoltime(obj, vol );
}
return( rc );
*
* assume path == '\0' eg. it's a directory in canonical form
*/
+
+struct path Cur_Path = {
+ 0,
+ "", /* mac name */
+ ".", /* unix name */
+ 0, /* id */
+ NULL,/* struct dir */
+ 0, /* stat is not set */
+};
+
+/* ------------------ */
+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,
- char *path, u_int16_t bitmap, char *buf )
+ struct path *path, u_int16_t d_bitmap, char *buf )
{
struct maccess ma;
struct adouble ad;
struct timeval tv;
char *upath;
- int bit = 0, aint, isad = 1;
+ struct dir *dir;
+ int bit, aint, isad = 1;
+ int cdate, bdate;
+ int owner, group;
u_int16_t ashort, bshort;
int err = AFP_OK;
int change_mdate = 0;
int change_parent_mdate = 0;
int newdate = 0;
-#ifdef FORCE_UIDGID
- uidgidset *uidgid;
+ u_int16_t bitmap = d_bitmap;
+ u_char finder_buf[32];
+ u_int32_t upriv;
+ mode_t mpriv = 0;
+ u_int16_t upriv_bit = 0;
+
+ bit = 0;
+ upath = path->u_name;
+ dir = path->d_dir;
+ while ( bitmap != 0 ) {
+ while (( bitmap & 1 ) == 0 ) {
+ bitmap = bitmap>>1;
+ bit++;
+ }
- memset(&uidgid, 0, sizeof(uidgid));
-#endif /* FORCE_UIDGID */
+ 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. <shirsch@ibm.net> */
+ 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;
+ }
- upath = mtoupath(vol, path);
- memset(&ad, 0, sizeof(ad));
-#ifdef FORCE_UIDGID
- save_uidgid ( &uidgid );
-#endif /* FORCE_UIDGID */
+ 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) {
+ if (ad_open_metadata( upath, vol_noadouble(vol)|ADFLAGS_DIR, O_CREAT, &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
* 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<<DIRPBIT_ACCESS)|(1<<DIRPBIT_UID)|(1<<DIRPBIT_GID)|
+ if (!vol_noadouble(vol) && (d_bitmap &
+ ~((1<<DIRPBIT_ACCESS)|(1<<DIRPBIT_UNIXPR)|
+ (1<<DIRPBIT_UID)|(1<<DIRPBIT_GID)|
(1<<DIRPBIT_MDATE)|(1<<DIRPBIT_PDINFO)))) {
-#ifdef FORCE_UIDGID
- restore_uidgid ( &uidgid );
-#endif /* FORCE_UIDGID */
return AFPERR_ACCESS;
}
* Check to see if a create was necessary. If it was, we'll want
* to set our name, etc.
*/
- if ( ad_getoflags( &ad, ADFLAGS_HF ) & O_CREAT ) {
- ad_setentrylen( &ad, ADEID_NAME, strlen( curdir->d_name ));
- memcpy( ad_entry( &ad, ADEID_NAME ), curdir->d_name,
- ad_getentrylen( &ad, ADEID_NAME ));
+ 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;
switch( bit ) {
case DIRPBIT_ATTR :
- change_mdate = 1;
if (isad) {
- memcpy( &ashort, buf, sizeof( ashort ));
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);
- if ((ashort & htons(ATTRBIT_INVISIBLE)))
- change_parent_mdate = 1;
}
- buf += sizeof( ashort );
break;
-
case DIRPBIT_CDATE :
- change_mdate = 1;
if (isad) {
- memcpy(&aint, buf, sizeof(aint));
- ad_setdate(&ad, AD_DATE_CREATE, aint);
+ ad_setdate(&ad, AD_DATE_CREATE, cdate);
}
- buf += sizeof( aint );
break;
-
case DIRPBIT_MDATE :
- memcpy(&newdate, buf, sizeof(newdate));
- buf += sizeof( newdate );
break;
-
case DIRPBIT_BDATE :
- change_mdate = 1;
if (isad) {
- memcpy(&aint, buf, sizeof(aint));
- ad_setdate(&ad, AD_DATE_BACKUP, aint);
+ ad_setdate(&ad, AD_DATE_BACKUP, bdate);
}
- buf += sizeof( aint );
break;
-
case DIRPBIT_FINFO :
- change_mdate = 1;
- /*
- * 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 );
+ 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 ), buf, 32 );
+ memcpy( ad_entry( &ad, ADEID_FINDERI ), finder_buf, 32 );
}
}
- buf += 32;
break;
-
case DIRPBIT_UID : /* What kind of loser mounts as root? */
- change_parent_mdate = 1;
- memcpy( &aint, buf, sizeof(aint));
- buf += sizeof( aint );
- if ( (curdir->d_did == DIRDID_ROOT) &&
- (setdeskowner( ntohl(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 :
- LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %s",
- strerror(errno) );
- if (!isad) {
- err = AFPERR_PARAM;
- goto setdirparam_done;
- }
- break;
+ 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; /* ???*/
}
- }
- if ( setdirowner( ntohl(aint), -1, vol_noadouble(vol) ) < 0 ) {
- switch ( errno ) {
- case EPERM :
- case EACCES :
- err = AFPERR_ACCESS;
- goto setdirparam_done;
- break;
- case EROFS :
- err = AFPERR_VLOCK;
+ else {
goto setdirparam_done;
- break;
- default :
- LOG(log_error, logtype_afpd, "setdirparam: setdirowner: %s",
- strerror(errno) );
- break;
}
}
+ if ( setdirowner(vol, upath, ntohl(owner), -1 ) < 0 ) {
+ err = set_dir_errors(path, "setdirowner", errno);
+ goto setdirparam_done;
+ }
break;
case DIRPBIT_GID :
- change_parent_mdate = 1;
- memcpy( &aint, buf, sizeof( aint ));
- buf += sizeof( aint );
- if (curdir->d_did == DIRDID_ROOT)
- setdeskowner( -1, ntohl(aint) );
-
-#if 0 /* don't error if we can't set the desktop owner. */
- switch ( errno ) {
- case EPERM :
- case EACCES :
- err = AFPERR_ACCESS;
+ 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 EROFS :
- err = AFPERR_VLOCK;
- goto setdirparam_done;
- break;
- default :
- LOG(log_error, logtype_afpd, "setdirparam: setdeskowner: %m" );
- if (!isad) {
- err = AFPERR_PARAM;
- goto setdirparam_done;
- }
- break;
}
-#endif /* 0 */
-
- if ( setdirowner( -1, ntohl(aint), vol_noadouble(vol) ) < 0 ) {
- switch ( errno ) {
- case EPERM :
- case EACCES :
+ 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;
- break;
- case EROFS :
- err = AFPERR_VLOCK;
- goto setdirparam_done;
- break;
- default :
- LOG(log_error, logtype_afpd, "setdirparam: setdirowner: %s",
- strerror(errno) );
- break;
}
}
- 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++;
- 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;
+ if (!dir_rx_set(mpriv) && setdirmode( vol, upath, mpriv) < 0 ) {
+ err = set_dir_errors(path, "setdirmode", errno);
goto setdirparam_done;
- default :
- LOG(log_error, logtype_afpd, "setdirparam: setdeskmode: %s",
- strerror(errno) );
- break;
- err = AFPERR_PARAM;
+ }
+ break;
+ case DIRPBIT_PDINFO :
+ if (afp_version >= 30) {
+ err = AFPERR_BITMAP;
goto setdirparam_done;
}
-#endif /* 0 */
-
- if ( setdirmode( mtoumode( &ma ), vol_noadouble(vol),
- (vol->v_flags & AFPVOL_DROPBOX)) < 0 ) {
- switch ( errno ) {
- case EPERM :
- case EACCES :
- err = AFPERR_ACCESS;
- goto setdirparam_done;
- case EROFS :
- err = AFPERR_VLOCK;
+ 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;
- default :
- LOG(log_error, logtype_afpd, "setdirparam: setdirmode: %s",
- strerror(errno) );
- err = AFPERR_PARAM;
+ }
+
+ 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;
-
- /* Ignore what the client thinks we should do to the
- ProDOS information block. Skip over the data and
- report nothing amiss. <shirsch@ibm.net> */
- case DIRPBIT_PDINFO :
- buf += 6;
- break;
-
default :
err = AFPERR_BITMAP;
goto setdirparam_done;
}
if ( isad ) {
- ad_flush( &ad, ADFLAGS_HF );
- ad_close( &ad, ADFLAGS_HF );
- }
+ if (path->st_valid && !path->st_errno) {
+ struct stat *st = &path->st;
-#ifdef FORCE_UIDGID
- restore_uidgid ( &uidgid );
-#endif /* FORCE_UIDGID */
+ 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_metadata( &ad);
+ ad_close_metadata( &ad);
+ }
- if (change_parent_mdate && curdir->d_did != DIRDID_ROOT
+ if (change_parent_mdate && dir->d_did != DIRDID_ROOT
&& gettimeofday(&tv, NULL) == 0) {
- if (!movecwd(vol, curdir->d_parent)) {
+ 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<<DIRPBIT_MDATE;
- setdirparams(vol, "", bitmap, (char *)&newdate);
+ setdirparams(vol, &Cur_Path, bitmap, (char *)&newdate);
/* should we reset curdir ?*/
}
}
}
int afp_createdir(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
+AFPObj *obj;
char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+int ibuflen _U_, *rbuflen;
{
struct adouble ad;
- struct stat st;
struct vol *vol;
struct dir *dir;
- char *path, *upath;
+ char *upath;
+ struct path *s_path;
u_int32_t did;
u_int16_t vid;
-#ifdef FORCE_UIDGID
- uidgidset *uidgid;
-
- memset(&uidgid, 0, sizeof(uidgid));
-#endif /* FORCE_UIDGID */
-
+ int err;
+
*rbuflen = 0;
ibuf += 2;
memcpy( &vid, ibuf, sizeof( vid ));
ibuf += sizeof( vid );
- if (( vol = getvolbyvid( vid )) == NULL ) {
+ if (NULL == ( vol = getvolbyvid( vid )) ) {
return( AFPERR_PARAM );
}
memcpy( &did, ibuf, sizeof( did ));
ibuf += sizeof( did );
- if (( dir = dirsearch( vol, did )) == NULL ) {
- return( AFPERR_NOOBJ );
- }
-
- if (( path = cname( vol, dir, &ibuf )) == NULL ) {
- switch( errno ) {
- case EACCES:
- return( AFPERR_ACCESS );
- case EEXIST: /* FIXME this on is impossible? */
- return( AFPERR_EXIST );
- default:
- return( AFPERR_NOOBJ );
- }
+ if (NULL == ( dir = dirlookup( vol, did )) ) {
+ return afp_errno; /* was AFPERR_NOOBJ */
}
- /* FIXME check done elswhere? cname was able to move curdir to it! */
- if (*path == '\0')
- return AFPERR_EXIST;
- upath = mtoupath(vol, path);
- {
- int ret;
- if (0 != (ret = check_name(vol, upath))) {
- return ret;
- }
+ /* 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;
-#ifdef FORCE_UIDGID
- save_uidgid ( &uidgid );
- set_uidgid ( vol );
-#endif /* FORCE_UIDGID */
+ upath = s_path->u_name;
+ if (0 != (err = check_name(vol, upath))) {
+ return err;
+ }
- 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 (AFP_OK != (err = netatalk_mkdir( upath))) {
+ return err;
}
- if (stat(upath, &st) < 0) {
-#ifdef FORCE_UIDGID
- restore_uidgid ( &uidgid );
-#endif /* FORCE_UIDGID */
+ if (of_stat(s_path) < 0) {
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 */
+ 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) {
+ ad_init(&ad, vol->v_adouble, vol->v_ad_options);
+ if (ad_open_metadata( ".", vol_noadouble(vol)|ADFLAGS_DIR, O_CREAT, &ad ) < 0) {
if (vol_noadouble(vol))
goto createdir_done;
-#ifdef FORCE_UIDGID
- restore_uidgid ( &uidgid );
-#endif /* FORCE_UIDGID */
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_setentrylen( &ad, ADEID_NAME, strlen( path ));
- memcpy( ad_entry( &ad, ADEID_NAME ), path,
- ad_getentrylen( &ad, ADEID_NAME ));
- ad_flush( &ad, ADFLAGS_HF );
- ad_close( &ad, ADFLAGS_HF );
+ ad_flush_metadata( &ad);
+ ad_close_metadata( &ad);
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)
+/*
+ * 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;
-const int noadouble;
{
struct adouble ad;
struct dir *parent;
char *buf;
int len, err;
-
+
/* existence check moved to afp_moveandrename */
- if ( rename( src, dst ) < 0 ) {
+ if ( unix_rename( src, dst ) < 0 ) {
switch ( errno ) {
case ENOENT :
return( AFPERR_NOOBJ );
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) {
+ if ((err = copydir(vol, src, dst)) < 0) {
deletedir(dst);
return err;
}
}
}
- 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 );
- }
- }
+ vol->vfs->rf_renamedir(vol, src, 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 );
-
-renamedir_done:
- if ((buf = (char *) realloc( dir->d_name, len + 1 )) == NULL ) {
- LOG(log_error, logtype_afpd, "renamedir: realloc: %s", strerror(errno) );
+ /* rename() succeeded so we need to update our tree even if we can't open
+ * metadata
+ */
+
+ ad_init(&ad, vol->v_adouble, vol->v_ad_options);
+
+ if (!ad_open_metadata( dst, ADFLAGS_DIR, 0, &ad)) {
+ ad_setname(&ad, newname);
+ ad_flush_metadata( &ad);
+ ad_close_metadata( &ad);
+ }
+
+ dir_hash_del(vol, dir);
+ 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_name = buf;
- strcpy( dir->d_name, newname );
+ 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 );
+ }
+
+ if (dir->d_m_name_ucs2)
+ free(dir->d_m_name_ucs2);
+
+ dir->d_m_name_ucs2 = NULL;
+ if ((size_t)-1 == convert_string_allocate((utf8_encoding())?CH_UTF8_MAC:vol->v_maccharset, CH_UCS2, dir->d_m_name, strlen(dir->d_m_name), (char**)&dir->d_m_name_ucs2))
+ dir->d_m_name_ucs2 = NULL;
if (( parent = dir->d_parent ) == NULL ) {
return( AFP_OK );
}
if ( parent == newparent ) {
+ hash_alloc_insert(vol->v_hash, dir, dir);
return( AFP_OK );
}
/* detach from old parent and add to new one. */
dirchildremove(parent, dir);
dir->d_parent = newparent;
- dirchildadd(newparent, dir);
+ dirchildadd(vol, newparent, dir);
return( AFP_OK );
}
-#define DOT_APPLEDOUBLE_LEN 13
/* delete an empty directory */
-int deletecurdir( vol, path, pathlen )
+int deletecurdir( vol)
const struct vol *vol;
-char *path;
-int pathlen;
{
struct dirent *de;
struct stat st;
DIR *dp;
struct adouble ad;
u_int16_t ashort;
-#ifdef FORCE_UIDGID
- uidgidset *uidgid;
-
- memset(&uidgid, 0, sizeof(uidgid));
-#endif /* FORCE_UIDGID */
+ int err;
if ( curdir->d_parent == NULL ) {
return( AFPERR_ACCESS );
}
- if ( curdir->d_child != NULL ) {
- return( AFPERR_DIRNEMPT );
- }
-
fdir = curdir;
-#ifdef FORCE_UIDGID
- save_uidgid ( &uidgid );
- set_uidgid ( vol );
-#endif /* FORCE_UIDGID */
-
- memset(&ad, 0, sizeof(ad));
- if ( ad_open( ".", ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY,
- DIRBITS | 0777, &ad) == 0 ) {
+ 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))) {
-#ifdef FORCE_UIDGID
- restore_uidgid ( &uidgid );
-#endif /* FORCE_UIDGID */
return AFPERR_OLOCK;
}
}
-
- /* 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 );
- }
+ err = vol->vfs->rf_deletecurdir(vol);
+ if (err) {
+ return err;
}
/* now get rid of dangling symlinks */
/* 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 */
+ closedir(dp);
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 );
- }
+ if ((err = netatalk_unlink(de->d_name))) {
+ closedir(dp);
+ return err;
}
}
- closedir(dp);
}
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 );
- }
+ err = afp_errno;
+ goto delete_done;
+ }
+
+ 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);
}
-
- dirchildremove(curdir, fdir);
-#ifdef CNID_DB
- cnid_delete(vol->v_db, fdir->d_did);
-#endif /* CNID_DB */
- dir_remove( vol, fdir );
-
-#ifdef FORCE_UIDGID
- restore_uidgid ( &uidgid );
-#endif /* FORCE_UIDGID */
- return( AFP_OK );
+ return err;
}
int afp_mapid(obj, ibuf, ibuflen, rbuf, rbuflen )
-AFPObj *obj;
+AFPObj *obj;
char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+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 :
+ case 3 :/* unicode */
if (( pw = getpwuid( id )) == NULL ) {
- *rbuflen = 0;
return( AFPERR_NOITEM );
}
- name = pw->pw_name;
+ 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 :
- if (( gr = (struct group *)getgrgid( id )) == NULL ) {
- *rbuflen = 0;
+ case 4 : /* unicode */
+ if (NULL == ( gr = (struct group *)getgrgid( id ))) {
return( AFPERR_NOITEM );
}
- name = gr->gr_name;
+ len = convert_string_allocate( obj->options.unixcharset, (!utf8)?obj->options.maccharset:CH_UTF8_MAC,
+ gr->gr_name, strlen(gr->gr_name), &name);
break;
default :
- *rbuflen = 0;
return( AFPERR_PARAM );
}
-
len = strlen( name );
} else {
len = 0;
name = NULL;
}
-
- *rbuf++ = len;
+ if (utf8) {
+ u_int16_t tp = htons(len);
+ memcpy(rbuf, &tp, sizeof(tp));
+ rbuf += sizeof(tp);
+ *rbuflen += 2;
+ }
+ else {
+ *rbuf++ = len;
+ *rbuflen += 1;
+ }
if ( len > 0 ) {
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;
+AFPObj *obj _U_;
char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+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 1 : /* unicode */
case 3 :
- if (( pw = (struct passwd *)getpwnam( ibuf )) == NULL ) {
- *rbuflen = 0;
+ if (NULL == ( pw = (struct passwd *)getpwnam( ibuf )) ) {
return( AFPERR_NOITEM );
}
id = pw->pw_uid;
break;
+ case 2 : /* unicode */
case 4 :
- if (( gr = (struct group *)getgrnam( ibuf )) == NULL ) {
- *rbuflen = 0;
+ if (NULL == ( gr = (struct group *)getgrnam( ibuf ))) {
return( AFPERR_NOITEM );
}
id = gr->gr_gid;
break;
- default :
- *rbuflen = 0;
- return( AFPERR_PARAM );
}
} else {
id = 0;
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;
memcpy( &did, ibuf, sizeof( did ));
ibuf += sizeof( did );
- if (( dir = dirsearch( vol, did )) == NULL ) {
+ if (( dir = dirlookup( vol, did )) == NULL ) {
return( AFPERR_PARAM );
}
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;
+AFPObj *obj _U_;
char *ibuf, *rbuf;
-int ibuflen, *rbuflen;
+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;
-
- memset(&uidgid, 0, sizeof(uidgid));
-#endif /* FORCE_UIDGID */
*rbuflen = 0;
ibuf += 2;
memcpy(&vid, ibuf, sizeof(vid));
ibuf += sizeof( vid );
- if (( vol = getvolbyvid( vid )) == NULL ) {
+ 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 ) {
- switch( errno ) {
- case EACCES:
- return( AFPERR_ACCESS );
- default:
- 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;
+ if ( !path->st_valid && of_stat(path ) < 0 ) {
+ return( AFPERR_NOOBJ );
}
-
-#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;
+ if ( path->st_errno ) {
+ return( AFPERR_NOOBJ );
}
- memcpy(rbuf, &dir->d_did, sizeof(dir->d_did));
- *rbuflen = sizeof(dir->d_did);
-#ifdef FORCE_UIDGID
- restore_uidgid ( &uidgid );
-#endif /* FORCE_UIDGID */
+ memcpy(rbuf, &curdir->d_did, sizeof(curdir->d_did));
+ *rbuflen = sizeof(curdir->d_did);
return AFP_OK;
}
projects / netatalk.git / blobdiff