/*
- * $Id: directory.c,v 1.39 2002-08-30 19:32:40 didg Exp $
+ * $Id: directory.c,v 1.57 2003-01-21 09:58:58 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include "unix.h"
struct dir *curdir;
+int afp_errno;
#define SENTINEL (&sentinel)
static struct dir sentinel = { SENTINEL, SENTINEL, NULL, DIRTREE_COLOR_BLACK,
- NULL, NULL, NULL, NULL, NULL, 0, 0, NULL };
-static struct dir rootpar = { SENTINEL, SENTINEL, NULL, 0,
- NULL, NULL, NULL, NULL, NULL, 0, 0, NULL };
+ NULL, NULL, NULL, NULL, NULL, 0, 0,
+ 0, 0, NULL, NULL};
+static struct dir rootpar = { SENTINEL, SENTINEL, NULL, 0,
+ NULL, NULL, NULL, NULL, NULL, 0, 0,
+ 0, 0, NULL, NULL};
/* (from IM: Toolbox Essentials)
* dirFinderInfo (DInfo) fields:
/* 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_name ? dir : NULL;
+ return dir->d_m_name ? dir : NULL;
dir = (dir->d_did > did) ? dir->d_left : dir->d_right;
}
return NULL;
char *ptr;
static char buffer[12 + MAXPATHLEN + 1];
int buflen = 12 + MAXPATHLEN + 1;
-
+ char *mpath;
+
ret = dirsearch(vol, did);
if (ret != NULL)
return ret;
id = did;
- if ((upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) == NULL) {
+ if (NULL == (upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) ) {
+ afp_errno = AFPERR_NOOBJ;
return NULL;
}
ptr = path + MAXPATHLEN;
- len = strlen(upath);
+ mpath = utompath(vol, upath);
+ 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)
+ if ((upath = cnid_resolve(vol->v_db, &id, buffer, buflen)) == NULL) {
+ afp_errno = AFPERR_NOOBJ;
return NULL;
- len = strlen(upath) + 1;
+ }
+ mpath = utompath(vol, upath);
+ len = strlen(mpath) + 1;
pathlen += len;
- if (pathlen > 255)
+ if (pathlen > 255) {
+ afp_errno = AFPERR_PARAM;
return NULL;
- strcpy(ptr - len, upath);
+ }
+ strcpy(ptr - len, mpath);
ptr -= len;
}
/* fill the cache */
/* i'm not sure if it really helps to delete stuff. */
#ifndef REMOVE_NODES
- free(dir->d_name);
- dir->d_name = NULL;
+ if (dir->d_u_name != dir->d_m_name) {
+ free(dir->d_u_name);
+ }
+ free(dir->d_m_name);
+ dir->d_m_name = NULL;
+ dir->d_u_name = 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;
}
if (node->d_color == DIRTREE_COLOR_BLACK)
dir_rmrecolor(vol, leaf);
- free(node->d_name);
+
+ 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;
* 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;
- p = mtoupath(vol, path );
- if ( stat( p, &st ) != 0 ) {
+ path->u_name = p = mtoupath(vol, path->m_name );
+ if ( of_stat( path ) != 0 ) {
return( NULL );
}
- if (!S_ISDIR(st.st_mode)) {
+
+ if (!S_ISDIR(path->st.st_mode)) {
return( NULL );
}
- if (( dir = adddir( vol, dir, path, strlen( path ), p, strlen(p),
- &st)) == NULL ) {
+ if (( dir = adddir( vol, dir, path)) == NULL ) {
return( NULL );
}
DIR *dp;
struct dirent *de;
struct stat st;
- int len, err;
+ size_t len;
+ int err;
if ((len = strlen(dir)) > sizeof(path))
return AFPERR_PARAM;
struct dirent *de;
struct stat st;
struct utimbuf ut;
- int slen, dlen, err;
+ size_t slen, dlen;
+ int err;
/* doesn't exist or the path is too long. */
if (((slen = strlen(src)) > sizeof(spath) - 2) ||
}
if (dir != SENTINEL) {
- free( dir->d_name );
+ if (dir->d_u_name != dir->d_m_name) {
+ free(dir->d_u_name);
+ }
+ free(dir->d_m_name);
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) {
+ 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;
}
return dir;
}
-
-/* XXX: this needs to be changed to handle path types */
-char *
+/* -------------------------------------------------- */
+/* XXX: this needs to be changed to handle path types
+ return
+ if it's a filename:
+ in extenddir:
+ compute unix name
+ stat the file
+ return mac name
+ if it's a dirname:
+ not in the cache
+ in extenddir
+ compute unix name
+ stat the 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.
+
+*/
+struct path *
cname( vol, dir, cpath )
const struct vol *vol;
struct dir *dir;
char **cpath;
{
- struct dir *cdir;
- static char path[ MAXPATHLEN + 1];
+ struct dir *cdir;
+ static char path[ MAXPATHLEN + 1];
+ static struct path ret;
+
char *data, *p;
- char *u;
int extend = 0;
int len;
- int olen = 0;
-
+ u_int32_t hint;
+ u_int16_t len16;
+ int size = 0;
+ char sep;
+
data = *cpath;
- if ( *data++ != 2 ) { /* path type */
+ afp_errno = AFPERR_NOOBJ;
+ switch (ret.m_type = *data) { /* path type */
+ case 2:
+ data++;
+ len = (unsigned char) *data++;
+ size = 2;
+ sep = 0;
+ 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 );
+
}
- len = (unsigned char) *data++;
- *cpath += len + 2;
+ *cpath += len + size;
*path = '\0';
- u = NULL;
-
+ ret.m_name = path;
+ ret.st_errno = 0;
+ ret.st_valid = 0;
for ( ;; ) {
if ( len == 0 ) {
if ( !extend && 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;
+ if (dir->d_did == DIRDID_ROOT_PARENT)
+ return NULL;
+ if (afp_errno == AFPERR_ACCESS)
+ return NULL;
+
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';
+ return NULL;
}
- return( path );
+ if (*path == '\0') {
+ ret.u_name = ".";
+ }
+ 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++;
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;
while (cdir) {
- if ( strcasecmp( cdir->d_name, path ) == 0 ) {
+ if ( strcmp( cdir->d_m_name, path ) == 0 ) {
break;
}
cdir = (cdir == dir->d_child->d_prev) ? NULL :
++extend;
/* if dir == curdir it always succeed,
even if curdir is deleted.
- it's not a pb because it will failed in extenddir
+ 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.
*/
- dir_invalidate(vol, dir);
- return( NULL );
+ if ( dir->d_did != DIRDID_ROOT_PARENT &&
+ (afp_errno != AFPERR_ACCESS)) {
+ dir_invalidate(vol, dir);
+ }
+ return NULL;
}
- cdir = extenddir( vol, dir, path );
+ cdir = extenddir( vol, dir, &ret );
}
} else {
- cdir = extenddir( vol, dir, path );
+ cdir = extenddir( vol, dir, &ret );
}
if ( cdir == NULL ) {
+
if ( len > 0 ) {
- return( NULL );
+ return NULL;
}
} else {
return( 0 );
}
if ( dir->d_did == DIRDID_ROOT_PARENT) {
+ afp_errno = 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;
n = strlen( u );
+ if (p -n -1 < path) {
+ afp_errno = AFPERR_PARAM;
+ return -1;
+ }
+ *--p = '/';
p -= n;
strncpy( 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 );
}
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;
+}
+
+/* ------------------------------
+ (".", 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;
-
- memset(&ad, 0, sizeof(ad));
-
- if ( ad_open( upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY,
- DIRBITS | 0777, &ad) < 0 ) {
- isad = 0;
+ int ret;
+ u_int32_t utf8 = 0;
+ struct stat *st = &s_path->st;
+ char *upath = s_path->u_name;
+
+ if ((bitmap & ((1 << DIRPBIT_ATTR) |
+ (1 << DIRPBIT_CDATE) |
+ (1 << DIRPBIT_MDATE) |
+ (1 << DIRPBIT_BDATE) |
+ (1 << DIRPBIT_FINFO)))) {
+ memset(&ad, 0, sizeof(ad));
+ if ( !ad_open( upath, ADFLAGS_HF|ADFLAGS_DIR, O_RDONLY,
+ DIRBITS | 0777, &ad)) {
+ isad = 1;
+ }
}
data = buf;
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 (st->st_ctime == dir->ctime) {
+ ashort = dir->offcnt;
+ }
+ else if ((ret = for_each_dirent(vol, upath, NULL,NULL)) >= 0) {
+ ashort = ret;
+ dir->offcnt = ashort;
+ dir->ctime = st->st_ctime;
}
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;
default :
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(data, dir->d_m_name, 0);
+ }
+ if ( utf_nameoff ) {
+ ashort = htons( data - buf );
+ memcpy( utf_nameoff, &ashort, sizeof( ashort ));
+ data = set_name(data, dir->d_m_name, utf8);
}
if ( isad ) {
ad_close( &ad, ADFLAGS_HF );
return( AFP_OK );
}
+/* ----------------------------- */
int afp_setdirparams(obj, ibuf, ibuflen, rbuf, rbuflen )
AFPObj *obj;
char *ibuf, *rbuf;
{
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 afp_errno;
}
- if ( *path != '\0' ) {
+ if ( *path->m_name != '\0' ) {
return( AFPERR_BADTYPE ); /* not a directory */
}
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, /* stat is not set */
+ 0, /* */
+};
+
int setdirparams(const struct vol *vol,
- char *path, u_int16_t bitmap, char *buf )
+ struct path *path, u_int16_t bitmap, char *buf )
{
struct maccess ma;
struct adouble ad;
int change_parent_mdate = 0;
int newdate = 0;
- upath = mtoupath(vol, path);
+ upath = path->u_name;
memset(&ad, 0, sizeof(ad));
if (ad_open( upath, vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR,
* 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_setentrylen( &ad, ADEID_NAME, strlen( curdir->d_m_name ));
+ memcpy( ad_entry( &ad, ADEID_NAME ), curdir->d_m_name,
ad_getentrylen( &ad, ADEID_NAME ));
}
}
ProDOS information block. Skip over the data and
report nothing amiss. <shirsch@ibm.net> */
case DIRPBIT_PDINFO :
- buf += 6;
- break;
-
+ if (afp_version < 30) {
+ buf += 6;
+ break;
+ }
default :
err = AFPERR_BITMAP;
goto setdirparam_done;
if (!movecwd(vol, curdir->d_parent)) {
newdate = AD_DATE_FROM_UNIX(tv.tv_sec);
bitmap = 1<<DIRPBIT_MDATE;
- setdirparams(vol, "", bitmap, (char *)&newdate);
+ setdirparams(vol, &Cur_Path, bitmap, (char *)&newdate);
/* should we reset curdir ?*/
}
}
int ibuflen, *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;
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 ) {
+ if (NULL == ( dir = dirlookup( vol, did )) ) {
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 == ( s_path = cname( vol, dir, &ibuf )) ) {
+ return afp_errno;
}
/* FIXME check done elswhere? cname was able to move curdir to it! */
- if (*path == '\0')
- return AFPERR_EXIST;
- upath = mtoupath(vol, path);
+ if (*s_path->m_name == '\0')
+ return AFPERR_EXIST;
+
+ upath = s_path->u_name;
{
int ret;
if (0 != (ret = check_name(vol, upath))) {
}
}
- if (stat(upath, &st) < 0) {
+ if (of_stat(s_path) < 0) {
return AFPERR_MISC;
}
-
- if ((dir = adddir( vol, curdir, path, strlen( path ), upath,
- strlen(upath), &st)) == NULL) {
+ curdir->offcnt++;
+ if ((dir = adddir( vol, curdir, s_path)) == NULL) {
return AFPERR_MISC;
}
}
memset(&ad, 0, sizeof(ad));
- if (ad_open( "", vol_noadouble(vol)|ADFLAGS_HF|ADFLAGS_DIR,
+ 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_setentrylen( &ad, ADEID_NAME, strlen( path ));
- memcpy( ad_entry( &ad, ADEID_NAME ), path,
+ 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 );
return( AFP_OK );
}
-
+/*
+ * dst new unix filename (not a pathname)
+ * newname new mac name
+ * newparent curdir
+ *
+*/
int renamedir(src, dst, dir, newparent, newname, noadouble)
char *src, *dst, *newname;
struct dir *dir, *newparent;
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 );
}
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 );
- }
- }
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
+ */
+ if ( !ad_open( dst, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR, 0, &ad)) {
+ ad_setentrylen( &ad, ADEID_NAME, len );
+ memcpy( ad_entry( &ad, ADEID_NAME ), newname, len );
+ ad_flush( &ad, ADFLAGS_HF );
+ ad_close( &ad, ADFLAGS_HF );
+ }
+
+ if (dir->d_m_name == dir->d_u_name)
+ dir->d_u_name = NULL;
-renamedir_done:
- if ((buf = (char *) realloc( dir->d_name, len + 1 )) == NULL ) {
- LOG(log_error, logtype_afpd, "renamedir: realloc: %s", strerror(errno) );
+ 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 (( parent = dir->d_parent ) == NULL ) {
return( AFP_OK );
}
if ( movecwd( vol, curdir->d_parent ) < 0 ) {
- return( AFPERR_NOOBJ );
+ return afp_errno;
}
- if ( rmdir(mtoupath(vol, fdir->d_name)) < 0 ) {
+ if ( rmdir(fdir->d_u_name) < 0 ) {
switch ( errno ) {
case ENOENT :
return( AFPERR_NOOBJ );
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 ( id != 0 ) {
switch ( sfunc ) {
case 1 :
+ case 3 :/* unicode */
if (( pw = getpwuid( id )) == NULL ) {
- *rbuflen = 0;
return( AFPERR_NOITEM );
}
name = pw->pw_name;
break;
case 2 :
+ case 4 : /* unicode */
if (( gr = (struct group *)getgrgid( id )) == NULL ) {
- *rbuflen = 0;
return( AFPERR_NOITEM );
}
name = gr->gr_name;
break;
default :
- *rbuflen = 0;
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 {
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;
return( AFP_OK );
}
{
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++;
+ switch ( sfunc ) {
+ case 1 :
+ case 2 : /* unicode */
+ memcpy(&ulen, ibuf, sizeof(ulen));
+ len = ntohs(ulen);
+ ibuf += 2;
+ break;
+ case 3 :
+ case 4 :
+ len = (unsigned char) *ibuf++;
+ break;
+ default :
+ *rbuflen = 0;
+ 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;
id = pw->pw_uid;
break;
+ case 2 : /* unicode */
case 4 :
if (( gr = (struct group *)getgrnam( ibuf )) == NULL ) {
*rbuflen = 0;
}
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;
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;
char *ibuf, *rbuf;
int ibuflen, *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;
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 afp_errno;
}
- /* 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( AFPERR_BADTYPE ); /* not a directory */
}
- 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 );
}
-
- /* we don't already have a did. add one in. */
- if ((dir = adddir(vol, parentdir, path, strlen(path),
- upath, strlen(upath), &st)) == NULL) {
- return AFPERR_MISC;
+ if ( path->st_errno ) {
+ return( AFPERR_NOOBJ );
}
- memcpy(rbuf, &dir->d_did, sizeof(dir->d_did));
- *rbuflen = sizeof(dir->d_did);
+ memcpy(rbuf, &curdir->d_did, sizeof(curdir->d_did));
+ *rbuflen = sizeof(curdir->d_did);
return AFP_OK;
}
projects / netatalk.git / blobdiff