/*
- * $Id: directory.c,v 1.45 2002-10-12 18:20:48 didg Exp $
+ * $Id: directory.c,v 1.71.2.4.2.15.2.14 2009-09-07 11:35:04 franklahm 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"
+#include "mangle.h"
struct dir *curdir;
+int afp_errno;
#define SENTINEL (&sentinel)
static struct dir sentinel = { SENTINEL, SENTINEL, NULL, DIRTREE_COLOR_BLACK,
/* 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;
}
dir = vol->v_root;
+ afp_errno = AFPERR_NOOBJ;
while ( dir != SENTINEL ) {
if (dir->d_did == did)
return dir->d_m_name ? dir : NULL;
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;
{
-#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;
- char *mpath;
+ 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;
- mpath = utompath(vol, 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++;
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;
- mpath = utompath(vol, upath);
+ }
+
len = strlen(mpath) + 1;
pathlen += len;
- if (pathlen > 255)
+ if (pathlen > maxpath) {
+ afp_errno = AFPERR_PARAM;
return NULL;
+ }
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);
}
/* 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;
/* i'm not sure if it really helps to delete stuff. */
#ifndef REMOVE_NODES
- if (dir->d_u_name != dir->d_m_name) {
- free(dir->d_u_name);
- }
- free(dir->d_m_name);
+ dirfreename(dir);
dir->d_m_name = NULL;
dir->d_u_name = NULL;
#else /* ! 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 );
}
/* ------------------------------------ */
struct dir *dir;
struct path *path;
{
- char *p;
+ char *save_m_name;
+
+ if ( path->u_name == NULL) {
+ path->u_name = mtoupath(vol, path->m_name, dir->d_did, (path->m_type==3) );
+ }
+ path->d_dir = NULL;
+
+ if ( path->u_name == NULL) {
+ afp_errno = AFPERR_PARAM;
+ return NULL;
+ }
+
+ if (check_name(vol, path->u_name)) {
+ /* the name is illegal */
+ LOG(log_info, logtype_afpd, "extenddir: illegal path: '%s'", path->u_name);
+ path->u_name = NULL;
+ afp_errno = AFPERR_PARAM;
+ return NULL;
+ }
- path->u_name = p = mtoupath(vol, path->m_name );
- if ( of_stat( path ) != 0 ) {
+ if (of_stat( path ) != 0 ) {
return( NULL );
}
return( NULL );
}
- if (( dir = adddir( vol, dir, path)) == NULL ) {
- 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( dir );
}
+/* -------------------
+ system rmdir with afp error code.
+ ENOENT is not an error.
+ */
+static 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];
struct dirent *de;
struct stat st;
size_t len;
- int err;
+ 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 stat st;
struct utimbuf ut;
size_t slen, dlen;
+ size_t srem, drem;
int err;
/* doesn't exist or the path is too long. */
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 {
/* 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;
{
}
if (dir != SENTINEL) {
- if (dir->d_u_name != dir->d_m_name) {
- free(dir->d_u_name);
- }
- free(dir->d_m_name);
+ dirfreename(dir);
free( dir );
}
}
}
/* -------------------------------------------------- */
-/* XXX: this needs to be changed to handle path types
+/* cname
return
if it's a filename:
in extenddir:
compute unix name
- stat the file
- return mac 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
+ stat the dir or errno
+ return
+ if chdir error
+ dirname
+ curdir: dir parent directory
+ sinon
+ dirname: ""
+ curdir: dir
in the cache
-
- u_name can be
- XXXX u_name can be an alias on m_name if the m_name is
- a valid unix name.
-
+ return
+ if chdir error
+ dirname
+ curdir: dir parent directory
+ else
+ dirname: ""
+ curdir: dir
+
*/
struct path *
cname( vol, dir, cpath )
static struct path ret;
char *data, *p;
- char *u;
int extend = 0;
int len;
- int olen = 0;
u_int32_t hint;
+ u_int16_t len16;
int size = 0;
char sep;
+ int toUTF8 = 0;
data = *cpath;
- switch (*data) { /* path type */
+ 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++;
- hint = ntohl(*data);
- data += 4;
- len = ntohs(*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 = '/';
+ sep = 0; /* '/';*/
break;
}
/* else it's an error */
default:
+ afp_errno = AFPERR_PARAM;
return( NULL );
-
}
*cpath += len + size;
*path = '\0';
- u = NULL;
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 ) {
+ if (movecwd( vol, dir ) < 0 ) {
/* it's tricky:
- movecwd failed so dir is not there anymore.
+ movecwd failed some of dir path are 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.
-
+ so we remove dir from the cache
*/
- 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*/
+ 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;
}
- /* restore the previous token */
- strncpy(path, u, olen);
- path[olen] = '\0';
+ dir_invalidate(vol, dir);
+ return NULL;
}
- if (!ret.st_valid || *path == '\0') {
+ if (*path == '\0') {
ret.u_name = ".";
+ ret.d_dir = dir;
}
return &ret;
- }
+ } /* if (len == 0) */
- if ( *data == '\0' ) {
+ if (*data == sep ) {
data++;
len--;
}
- u = NULL;
-
- while ( *data && *data == sep && len > 0 ) {
+ while (*data == sep && len > 0 ) {
if ( dir->d_parent == NULL ) {
return NULL;
}
/* would this be faster with strlen + strncpy? */
p = path;
- if (len > 0) {
- u = data;
- olen = len;
- }
- while ( *data && *data != sep && len > 0 ) {
+ while ( *data != sep && len > 0 ) {
*p++ = *data++;
+ if (p > &path[ MAXPATHLEN]) {
+ afp_errno = AFPERR_PARAM;
+ return( NULL );
+ }
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 ( strcasecmp( cdir->d_m_name, path ) == 0 ) {
+ if ( strcmp( cdir->d_m_name, path ) == 0 ) {
break;
}
cdir = (cdir == dir->d_child->d_prev) ? NULL :
/* 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;
}
} else {
cdir = extenddir( vol, dir, &ret );
- }
+ } /* if (!extend) */
if ( cdir == NULL ) {
- if ( len > 0 ) {
+
+ if ( len > 0 || !ret.u_name) {
return NULL;
}
dir = cdir;
*path = '\0';
}
- }
- }
+ } /* if (p != path) */
+ } /* 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 = 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;
}
+/* --------------------- */
+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
{
struct maccess ma;
struct adouble ad;
- char *data, *nameoff = NULL;
+ char *data, *l_nameoff = NULL, *utf_nameoff = NULL;
int bit = 0, isad = 0;
u_int32_t aint;
u_int16_t ashort;
int ret;
u_int32_t utf8 = 0;
+ cnid_t pdid;
struct stat *st = &s_path->st;
char *upath = s_path->u_name;
(1 << DIRPBIT_MDATE) |
(1 << DIRPBIT_BDATE) |
(1 << DIRPBIT_FINFO)))) {
- memset(&ad, 0, sizeof(ad));
- if ( !ad_open( upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY,
- DIRBITS | 0777, &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 ) {
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;
case DIRPBIT_LNAME :
if (dir->d_m_name) /* root of parent can have a null name */
- nameoff = data;
+ l_nameoff = data;
else
memset(data, 0, sizeof(u_int16_t));
data += sizeof( u_int16_t );
ashort = 0;
/* this needs to handle current directory access rights */
if (st->st_ctime == dir->ctime) {
- ashort = dir->offcnt;
+ ashort = (dir->offcnt > 0xffff)?0xffff:dir->offcnt;
}
else if ((ret = for_each_dirent(vol, upath, NULL,NULL)) >= 0) {
- ashort = ret;
- dir->offcnt = ashort;
+ dir->offcnt = ret;
dir->ctime = st->st_ctime;
+ ashort = (dir->offcnt > 0xffff)?0xffff:dir->offcnt;
}
ashort = htons( ashort );
memcpy( data, &ashort, sizeof( ashort ));
if (afp_version >= 30) { /* UTF8 name */
utf8 = kTextEncodingUTF8;
if (dir->d_m_name) /* root of parent can have a null name */
- nameoff = data;
+ 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;
}
break;
- default :
+ 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 );
}
bitmap = bitmap>>1;
bit++;
}
- if ( nameoff ) {
+ 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( nameoff, &ashort, sizeof( ashort ));
- data = set_name(data, dir->d_m_name, utf8);
+ 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 );
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;
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 = dirlookup( 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' ) {
- return( AFPERR_BADTYPE ); /* not a directory */
+ 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 );
*/
struct path Cur_Path = {
+ 0,
"", /* mac name */
".", /* unix name */
+ NULL,
0, /* stat is not set */
- 0, /* */
+ 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 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, 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;
+ 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;
- memset(&ad, 0, sizeof(ad));
+ 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_dperm;
+ 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_dperm;
+ 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) {
* 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)))) {
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_m_name ));
- memcpy( ad_entry( &ad, ADEID_NAME ), curdir->d_m_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;
- goto setdirparam_done;
- break;
- case EROFS :
- err = AFPERR_VLOCK;
+ 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;
- 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;
}
}
- 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;
- break;
+ else {
+ err = AFPERR_BITMAP;
+ goto setdirparam_done;
}
+ break;
default :
err = AFPERR_BITMAP;
goto setdirparam_done;
}
if ( isad ) {
+ 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 && 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, &Cur_Path, bitmap, (char *)&newdate);
/* should we reset curdir ?*/
return err;
}
+int afp_syncdir(obj, ibuf, ibuflen, rbuf, rbuflen )
+AFPObj *obj _U_;
+char *ibuf, *rbuf _U_;
+int ibuflen _U_, *rbuflen;
+{
+#ifdef HAVE_DIRFD
+ DIR *dp;
+#endif
+ int dfd;
+ struct vol *vol;
+ struct dir *dir;
+ u_int32_t did;
+ u_int16_t vid;
+
+ *rbuflen = 0;
+ ibuf += 2;
+
+ memcpy( &vid, ibuf, sizeof( vid ));
+ ibuf += sizeof( vid );
+ if (NULL == (vol = getvolbyvid( vid )) ) {
+ return( AFPERR_PARAM );
+ }
+
+ memcpy( &did, ibuf, sizeof( did ));
+ ibuf += sizeof( did );
+
+ /*
+ * Here's the deal:
+ * if it's CNID 2 our only choice to meet the specs is call sync.
+ * For any other CNID just sync that dir. To my knowledge the
+ * intended use of FPSyncDir is to sync the volume so all we're
+ * ever going to see here is probably CNID 2. Anyway, we' prepared.
+ */
+
+ if ( ntohl(did) == 2 ) {
+ sync();
+ } else {
+ if (NULL == ( dir = dirlookup( vol, did )) ) {
+ return afp_errno; /* was AFPERR_NOOBJ */
+ }
+
+ if (movecwd( vol, dir ) < 0 )
+ return ( AFPERR_NOOBJ );
+
+ /*
+ * Assuming only OSens that have dirfd also may require fsyncing directories
+ * in order to flush metadata e.g. Linux.
+ */
+
+#ifdef HAVE_DIRFD
+ if (NULL == ( dp = opendir( "." )) ) {
+ switch( errno ) {
+ case ENOENT :
+ return( AFPERR_NOOBJ );
+ case EACCES :
+ return( AFPERR_ACCESS );
+ default :
+ return( AFPERR_PARAM );
+ }
+ }
+
+ LOG(log_debug, logtype_afpd, "afp_syncdir: dir: '%s'", dir->d_u_name);
+
+ dfd = dirfd( dp );
+ if ( fsync ( dfd ) < 0 )
+ LOG(log_error, logtype_afpd, "afp_syncdir(%s): %s",
+ dir->d_u_name, strerror(errno) );
+ closedir(dp); /* closes dfd too */
+#endif
+
+ if ( -1 == (dfd = open(vol->ad_path(".", ADFLAGS_DIR), O_RDWR))) {
+ switch( errno ) {
+ case ENOENT:
+ return( AFPERR_NOOBJ );
+ case EACCES:
+ return( AFPERR_ACCESS );
+ default:
+ return( AFPERR_PARAM );
+ }
+ }
+
+ LOG(log_debug, logtype_afpd, "afp_syncdir: ad-file: '%s'",
+ vol->ad_path(".", ADFLAGS_DIR) );
+
+ if ( fsync(dfd) < 0 )
+ LOG(log_error, logtype_afpd, "afp_syncdir(%s): %s",
+ vol->ad_path(dir->d_u_name, ADFLAGS_DIR), strerror(errno) );
+ close(dfd);
+ }
+
+ return ( AFP_OK );
+}
+
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 vol *vol;
struct path *s_path;
u_int32_t did;
u_int16_t vid;
-
+ 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 = dirlookup( vol, did )) == NULL ) {
- return( AFPERR_NOOBJ );
+ if (NULL == ( dir = dirlookup( vol, did )) ) {
+ return afp_errno; /* was AFPERR_NOOBJ */
}
-
- if (( s_path = cname( vol, dir, &ibuf )) == NULL ) {
- switch( errno ) {
- case EACCES:
- return( AFPERR_ACCESS );
- case EEXIST: /* FIXME this one is impossible? */
- return( AFPERR_EXIST );
- default:
- return( 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);
}
- /* FIXME check done elswhere? cname was able to move curdir to it! */
+ /* cname was able to move curdir to it! */
if (*s_path->m_name == '\0')
return AFPERR_EXIST;
upath = s_path->u_name;
- {
- int ret;
- if (0 != (ret = check_name(vol, upath))) {
- return ret;
- }
- }
- if ( ad_mkdir( upath, DIRBITS | 0777 ) < 0 ) {
- 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 (of_stat(s_path) < 0) {
return AFPERR_MISC;
}
+ curdir->offcnt++;
if ((dir = adddir( vol, curdir, s_path)) == NULL) {
return AFPERR_MISC;
}
return( AFPERR_PARAM );
}
- memset(&ad, 0, sizeof(ad));
- if (ad_open( "", vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR,
+ 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_setentrylen( &ad, ADEID_NAME, strlen( s_path->m_name ));
- memcpy( ad_entry( &ad, ADEID_NAME ), s_path->m_name,
- ad_getentrylen( &ad, ADEID_NAME ));
ad_flush( &ad, ADFLAGS_HF );
ad_close( &ad, ADFLAGS_HF );
* newparent curdir
*
*/
-int renamedir(src, dst, dir, newparent, newname, noadouble)
+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 );
- }
+ 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);
+
+ 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 );
+ }
-renamedir_done:
if (dir->d_m_name == dir->d_u_name)
dir->d_u_name = NULL;
#define DOT_APPLEDOUBLE_LEN 13
/* delete an empty directory */
-int deletecurdir( vol, path, pathlen )
+int deletecurdir( vol, path )
const struct vol *vol;
char *path;
-int pathlen;
{
struct dirent *de;
struct stat st;
DIR *dp;
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 );
- }
-
fdir = curdir;
- 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 );
}
}
- /* 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;
+ 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;
- }
+ /* 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 (unlink(path) < 0) {
- closedir(dp);
- switch (errno) {
- case EPERM:
- case EACCES :
- return( AFPERR_ACCESS );
- case EROFS:
- return AFPERR_VLOCK;
- case ENOENT :
- continue;
- default :
- return( AFPERR_PARAM );
+ strcpy(path + DOT_APPLEDOUBLE_LEN, de->d_name);
+ if ((err = netatalk_unlink(path))) {
+ closedir(dp);
+ return err;
}
}
+ closedir(dp);
}
- closedir(dp);
- }
- if ( rmdir( ".AppleDouble" ) < 0 ) {
- switch ( errno ) {
- case ENOENT :
- break;
- case ENOTEMPTY :
- return( AFPERR_DIRNEMPT );
- case EROFS:
- return AFPERR_VLOCK;
- case EPERM:
- case EACCES :
- return( AFPERR_ACCESS );
- default :
- return( AFPERR_PARAM );
+ if ( (err = netatalk_rmdir( ".AppleDouble" )) ) {
+ return err;
}
}
/* 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 (unlink(de->d_name) < 0) {
- switch (errno) {
- case EPERM:
- case EACCES :
- return( AFPERR_ACCESS );
- case EROFS:
- return AFPERR_VLOCK;
- case ENOENT :
- continue;
- default :
- return( AFPERR_PARAM );
- }
+ if ((err = netatalk_unlink(de->d_name))) {
+ closedir(dp);
+ return err;
}
}
- closedir(dp);
}
if ( movecwd( vol, curdir->d_parent ) < 0 ) {
- return( AFPERR_NOOBJ );
- }
-
- if ( rmdir(fdir->d_u_name) < 0 ) {
- switch ( errno ) {
- case ENOENT :
- return( AFPERR_NOOBJ );
- case ENOTEMPTY :
- return( AFPERR_DIRNEMPT );
- case EPERM:
- case EACCES :
- return( AFPERR_ACCESS );
- case EROFS:
- return AFPERR_VLOCK;
- default :
- 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 );
-
- 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;
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 ) {
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 :
case 4 : /* unicode */
- if (( gr = (struct group *)getgrgid( id )) == NULL ) {
+ 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 :
return( AFPERR_PARAM );
}
- switch ( sfunc ) {
- case 3:
- case 4:
- if (afp_version < 30) {
- return( AFPERR_PARAM );
- }
- utf8 = 1;
- /* map to unicode */
- break;
- }
len = strlen( name );
} else {
memcpy( rbuf, name, len );
}
*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;
ibuf++;
sfunc = (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;
len = (unsigned char) *ibuf++;
break;
default :
- *rbuflen = 0;
return( AFPERR_PARAM );
}
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;
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;
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;
* 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 *parentdir;
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 = dirlookup( 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);
}
if ( *path->m_name != '\0' ) {
- return( AFPERR_BADTYPE ); /* not a directory */
+ return path_error(path, AFPERR_NOOBJ);
}
if ( !path->st_valid && of_stat(path ) < 0 ) {