/*
- * $Id: directory.c,v 1.71.2.4.2.9 2004-02-13 22:32:18 didg Exp $
+ * $Id: directory.c,v 1.71.2.4.2.15.2.10 2008-11-25 15:16:32 didg Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#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>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/param.h>
#include <errno.h>
#include <utime.h>
-#include <netatalk/endian.h>
#include <atalk/adouble.h>
+
#include <atalk/afp.h>
#include <atalk/util.h>
#include <atalk/cnid.h>
#ifdef ATACC
int path_isadir(struct path *o_path)
{
- return o_path->dir != NULL;
+ 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 */
/* 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;
if ( path->u_name == NULL) {
path->u_name = mtoupath(vol, path->m_name, dir->d_did, (path->m_type==3) );
}
- path->dir = NULL;
+ path->d_dir = NULL;
if ( path->u_name == NULL) {
afp_errno = AFPERR_PARAM;
}
}
- path->dir = dir;
+ path->d_dir = dir;
if ( movecwd( vol, dir ) < 0 ) {
return( NULL );
}
}
/* 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 utimbuf ut;
size_t slen, dlen;
size_t srem, drem;
-
int err;
/* doesn't exist or the path is too long. */
strcpy(dpath + dlen, de->d_name);
if (S_ISDIR(st.st_mode)) {
- if (AFP_OK != (err = copydir(spath, dpath, noadouble)))
+ if (AFP_OK != (err = copydir(vol, spath, dpath)))
goto copydir_done;
- } else if (AFP_OK != (err = copyfile(spath, dpath, NULL, noadouble))) {
+ } else if (AFP_OK != (err = copyfile(vol, vol, spath, dpath, NULL, NULL))) {
goto copydir_done;
} else {
u_int16_t len16;
int size = 0;
char sep;
+ int toUTF8 = 0;
data = *cpath;
afp_errno = AFPERR_NOOBJ;
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) {
ret.m_name = path;
ret.st_errno = 0;
ret.st_valid = 0;
- ret.dir = NULL;
+ ret.d_dir = NULL;
for ( ;; ) {
if ( len == 0 ) {
if (movecwd( vol, dir ) < 0 ) {
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.dir = dir;
+ ret.d_dir = dir;
return &ret;
} else if (afp_errno == AFPERR_NOOBJ) {
if ( movecwd( vol, dir->d_parent ) < 0 ) {
ret.u_name = path +tp;
}
+ /* FIXME should we set :
+ ret.st_valid = 1;
+ ret.st_errno = ENOENT;
+ */
+
dir_invalidate(vol, dir);
return &ret;
}
}
if (*path == '\0') {
ret.u_name = ".";
- ret.dir = dir;
+ ret.d_dir = dir;
}
return &ret;
} /* if (len == 0) */
if ( p != path ) { /* we got something */
ret.u_name = NULL;
if (afp_version >= 30) {
- /* check for OS X mangled filename :( */
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) {
}
+/* --------------------- */
+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
(1 << DIRPBIT_BDATE) |
(1 << DIRPBIT_FINFO)))) {
- ad_init(&ad, vol->v_adouble);
- 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;
}
}
case DIRPBIT_ATTR :
if ( isad ) {
ad_getattr(&ad, &ashort);
- } else if (*dir->d_u_name == '.' && strcmp(dir->d_u_name, ".")
- && strcmp(dir->d_u_name, "..")) {
+ } else if (invisible_dots(vol, dir->d_u_name)) {
ashort = htons(ATTRBIT_INVISIBLE);
} else
ashort = 0;
ashort = htons(FINDERINFO_CLOSEDVIEW);
memcpy(data + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort));
- /* dot files are by default invisible */
- if (*dir->d_u_name == '.' && strcmp(dir->d_u_name , ".") &&
- strcmp(dir->d_u_name , "..")) {
+ /* 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;
*data++ = ma.ma_group;
*data++ = ma.ma_owner;
break;
-
-
+
default :
if ( isad ) {
ad_close( &ad, ADFLAGS_HF );
*/
if (path_isadir(path))
return afp_errno;
- if (path->st_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;
}
if ( *path->m_name != '\0' ) {
- return path_error(path, AFPERR_NOOBJ);
+ rc = path_error(path, AFPERR_NOOBJ);
+ /* maybe we are trying to set perms back */
+ if (rc != AFPERR_ACCESS)
+ return rc;
}
/*
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;
- ad_init(&ad, vol->v_adouble);
+ dir = path->d_dir;
+ while ( bitmap != 0 ) {
+ while (( bitmap & 1 ) == 0 ) {
+ bitmap = bitmap>>1;
+ bit++;
+ }
+
+ switch( bit ) {
+ case DIRPBIT_ATTR :
+ change_mdate = 1;
+ memcpy( &ashort, buf, sizeof( ashort ));
+ buf += sizeof( ashort );
+ break;
+ case DIRPBIT_CDATE :
+ change_mdate = 1;
+ memcpy(&cdate, buf, sizeof(cdate));
+ buf += sizeof( cdate );
+ break;
+ case DIRPBIT_MDATE :
+ memcpy(&newdate, buf, sizeof(newdate));
+ buf += sizeof( newdate );
+ break;
+ case DIRPBIT_BDATE :
+ change_mdate = 1;
+ memcpy(&bdate, buf, sizeof(bdate));
+ buf += sizeof( bdate );
+ break;
+ case DIRPBIT_FINFO :
+ change_mdate = 1;
+ memcpy( finder_buf, buf, 32 );
+ buf += 32;
+ break;
+ case DIRPBIT_UID : /* What kind of loser mounts as root? */
+ change_parent_mdate = 1;
+ memcpy( &owner, buf, sizeof(owner));
+ buf += sizeof( owner );
+ break;
+ case DIRPBIT_GID :
+ change_parent_mdate = 1;
+ memcpy( &group, buf, sizeof( group ));
+ buf += sizeof( group );
+ break;
+ case DIRPBIT_ACCESS :
+ change_mdate = 1;
+ change_parent_mdate = 1;
+ ma.ma_user = *buf++;
+ ma.ma_world = *buf++;
+ ma.ma_group = *buf++;
+ ma.ma_owner = *buf++;
+ mpriv = mtoumode( &ma ) | vol->v_perm;
+ if (dir_rx_set(mpriv) && setdirmode( vol, upath, mpriv) < 0 ) {
+ err = set_dir_errors(path, "setdirmode", errno);
+ bitmap = 0;
+ }
+ break;
+ /* Ignore what the client thinks we should do to the
+ ProDOS information block. Skip over the data and
+ report nothing amiss. <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;
+ }
+
+ 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_get_HF_flags( &ad ) & 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;
+ 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;
- goto setdirparam_done;
- default :
- LOG(log_error, logtype_afpd, "setdirparam: setdeskmode: %s",
- strerror(errno) );
- break;
- err = AFPERR_PARAM;
+ if (!dir_rx_set(mpriv) && setdirmode( vol, upath, mpriv) < 0 ) {
+ err = set_dir_errors(path, "setdirmode", errno);
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;
- goto setdirparam_done;
- default :
- LOG(log_error, logtype_afpd, "setdirparam: setdirmode: %s",
- strerror(errno) );
- err = AFPERR_PARAM;
- goto setdirparam_done;
- }
- }
break;
-
- /* Ignore what the client thinks we should do to the
- ProDOS information block. Skip over the data and
- report nothing amiss. <shirsch@ibm.net> */
case DIRPBIT_PDINFO :
- if (afp_version < 30) {
- buf += 6;
- break;
- }
-
- case DIRPBIT_UNIXPR :
- /* Skip UID and GID for now, there seems to be now way to set them from an OSX client anyway */
- buf += sizeof( aint );
- buf += sizeof( aint );
-
- change_mdate = 1;
- change_parent_mdate = 1;
- memcpy( &aint, buf, sizeof( aint ));
- buf += sizeof( aint );
- aint = ntohl (aint);
- if (curdir->d_did == DIRDID_ROOT)
- setdeskmode( aint );
-#if 0 /* don't error if we can't set the desktop mode */
- switch ( errno ) {
- case EPERM :
- case EACCES :
- err = AFPERR_ACCESS;
- goto setdirparam_done;
- case EROFS :
- err = AFPERR_VLOCK;
- goto setdirparam_done;
- default :
- LOG(log_error, logtype_afpd, "setdirparam: setdeskmode: %s",
- strerror(errno) );
- break;
- err = AFPERR_PARAM;
+ if (afp_version >= 30) {
+ err = AFPERR_BITMAP;
goto setdirparam_done;
}
-#endif /* 0 */
-
- if ( setdirunixmode( aint, 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;
-
default :
err = AFPERR_BITMAP;
goto setdirparam_done;
if (path->st_valid && !path->st_errno) {
struct stat *st = &path->st;
- if (curdir->d_parent) {
- ad_setid(&ad,(vol->v_flags & AFPVOL_NODEV)?0:st->st_dev,
- st->st_ino, curdir->d_did, curdir->d_parent->d_did, vol->v_stamp);
+ 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 ?*/
}
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;
return( AFPERR_PARAM );
}
- ad_init(&ad, vol->v_adouble);
+ 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_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_setid( &ad, (vol->v_flags & AFPVOL_NODEV)?0:s_path->st.st_dev,
- s_path->st.st_ino, dir->d_did, did, vol->v_stamp);
+ ad_setname(&ad, s_path->m_name);
+ ad_setid( &ad, s_path->st.st_dev, s_path->st.st_ino, dir->d_did, did, vol->v_stamp);
ad_flush( &ad, ADFLAGS_HF );
ad_close( &ad, ADFLAGS_HF );
* 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;
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;
}
}
}
- ad_init(&ad, 0); /* FIXME */
+ 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 );
/* 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_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 );
}
-
+
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;
fdir = curdir;
- ad_init(&ad, vol->v_adouble);
- 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;
-
- /* 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;
- }
+ if (vol->v_adouble == AD_VERSION2_OSX) {
+
+ if ((err = netatalk_unlink(vol->ad_path(".",0) )) ) {
+ return err;
+ }
+ }
+ else {
+ /* delete stray .AppleDouble files. this happens to get .Parent files
+ as well. */
+ if ((dp = opendir(".AppleDouble"))) {
+ strcpy(path, ".AppleDouble/");
+ while ((de = readdir(dp))) {
+ /* skip this and previous directory */
+ if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, ".."))
+ continue;
+
+ /* bail if the file exists in the current directory.
+ * note: this will not fail with dangling symlinks */
+ if (stat(de->d_name, &st) == 0) {
+ closedir(dp);
+ return AFPERR_DIRNEMPT;
+ }
- strcpy(path + DOT_APPLEDOUBLE_LEN, de->d_name);
- if ((err = netatalk_unlink(path))) {
- closedir(dp);
- return err;
+ strcpy(path + DOT_APPLEDOUBLE_LEN, de->d_name);
+ if ((err = netatalk_unlink(path))) {
+ closedir(dp);
+ return err;
+ }
}
+ closedir(dp);
}
- closedir(dp);
- }
- if ( (err = netatalk_rmdir( ".AppleDouble" )) ) {
- return err;
+ if ( (err = netatalk_rmdir( ".AppleDouble" )) ) {
+ return err;
+ }
}
/* now get rid of dangling symlinks */
}
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;
if (( pw = getpwuid( id )) == NULL ) {
return( AFPERR_NOITEM );
}
- len = convert_string_allocate( obj->options.unixcharset, ((sfunc == 1)?obj->options.maccharset:CH_UTF8_MAC),
+ len = convert_string_allocate( obj->options.unixcharset, ((!utf8)?obj->options.maccharset:CH_UTF8_MAC),
pw->pw_name, strlen(pw->pw_name), &name);
break;
if (NULL == ( gr = (struct group *)getgrgid( id ))) {
return( AFPERR_NOITEM );
}
- len = convert_string_allocate( obj->options.unixcharset, (sfunc == 1)?obj->options.maccharset:CH_UTF8_MAC,
+ len = convert_string_allocate( obj->options.unixcharset, (!utf8)?obj->options.maccharset:CH_UTF8_MAC,
gr->gr_name, strlen(gr->gr_name), &name);
break;
}
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;
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;