#include <atalk/acl.h>
#include <atalk/globals.h>
#include <atalk/fce_api.h>
+#include <atalk/netatalk_conf.h>
#include "directory.h"
#include "dircache.h"
struct stat *st;
struct vol *vol;
struct dir *dir;
- u_int32_t did;
+ uint32_t did;
int ret;
size_t buflen;
- u_int16_t fbitmap, dbitmap, vid;
+ uint16_t fbitmap, dbitmap, vid;
struct path *s_path;
*rbuflen = 0;
if (!dir)
return AFPERR_NOOBJ;
- ret = getdirparams(vol, dbitmap, s_path, dir,
- rbuf + 3 * sizeof( u_int16_t ), &buflen );
+ ret = getdirparams(obj, vol, dbitmap, s_path, dir,
+ rbuf + 3 * sizeof( uint16_t ), &buflen );
if (ret != AFP_OK )
return( ret );
}
/* this is a directory */
- *(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR;
+ *(rbuf + 2 * sizeof( uint16_t )) = (char) FILDIRBIT_ISDIR;
} else {
- if (fbitmap && AFP_OK != (ret = getfilparams(vol, fbitmap, s_path, curdir,
- rbuf + 3 * sizeof( u_int16_t ), &buflen )) ) {
+ if (fbitmap && AFP_OK != (ret = getfilparams(obj, vol, fbitmap, s_path, curdir,
+ rbuf + 3 * sizeof( uint16_t ), &buflen )) ) {
return( ret );
}
/* this is a file */
- *(rbuf + 2 * sizeof( u_int16_t )) = FILDIRBIT_ISFILE;
+ *(rbuf + 2 * sizeof( uint16_t )) = FILDIRBIT_ISFILE;
}
- *rbuflen = buflen + 3 * sizeof( u_int16_t );
+ *rbuflen = buflen + 3 * sizeof( uint16_t );
fbitmap = htons( fbitmap );
memcpy( rbuf, &fbitmap, sizeof( fbitmap ));
rbuf += sizeof( fbitmap );
struct vol *vol;
struct dir *dir;
struct path *path;
- u_int16_t vid, bitmap;
+ uint16_t vid, bitmap;
int did, rc;
*rbuflen = 0;
if (S_ISDIR(st->st_mode)) {
rc = setdirparams(vol, path, bitmap, ibuf );
} else {
- rc = setfilparams(vol, path, bitmap, ibuf );
+ rc = setfilparams(obj, vol, path, bitmap, ibuf );
}
if ( rc == AFP_OK ) {
setvoltime(obj, vol );
*/
int check_name(const struct vol *vol, char *name)
{
- /* check for illegal characters in the unix filename */
- if (!wincheck(vol, name))
- return AFPERR_PARAM;
-
if ((vol->v_flags & AFPVOL_NOHEX) && strchr(name, '/'))
return AFPERR_PARAM;
"moveandrename: [\"%s\"/\"%s\"] -> \"%s\"",
cfrombstr(sdir->d_u_name), oldname, newname);
- ad_init(&ad, vol->v_adouble, vol->v_ad_options);
+ ad_init(&ad, vol);
adp = &ad;
adflags = 0;
if (!isdir) {
- if ((oldunixname = strdup(mtoupath(vol, oldname, sdir->d_did, utf8_encoding()))) == NULL)
+ if ((oldunixname = strdup(mtoupath(vol, oldname, sdir->d_did, utf8_encoding(vol->v_obj)))) == NULL)
return AFPERR_PARAM; /* can't convert */
id = cnid_get(vol->v_cdb, sdir->d_did, oldunixname, strlen(oldunixname));
}
}
if (!ad_metadata(oldunixname, adflags, adp)) {
- u_int16_t bshort;
+ uint16_t bshort;
ad_getattr(adp, &bshort);
- ad_close_metadata( adp);
+ ad_close(adp, ADFLAGS_HF);
if ((bshort & htons(ATTRBIT_NORENAME))) {
rc = AFPERR_OLOCK;
goto exit;
}
}
- if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding()))){
+ if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding(vol->v_obj)))){
rc = AFPERR_PARAM;
goto exit;
}
if (!ad_metadata(upath, adflags, adp)) {
ad_setid(adp, st->st_dev, st->st_ino, id, curdir->d_did, vol->v_stamp);
ad_flush(adp);
- ad_close_metadata(adp);
+ ad_close(adp, ADFLAGS_HF);
}
/* fix up the catalog entry */
struct dir *sdir;
char *oldname, *newname;
struct path *path;
- u_int32_t did;
+ uint32_t did;
int plen;
- u_int16_t vid;
+ uint16_t vid;
int isdir = 0;
int rc;
/* ------------------------------- */
int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen)
{
- struct vol *vol;
- struct dir *dir;
- struct path *s_path;
+ struct vol *vol;
+ struct dir *dir;
+ struct path *s_path;
char *upath;
- int did, rc;
- u_int16_t vid;
+ int did;
+ int rc = AFP_OK;
+ uint16_t vid;
*rbuflen = 0;
ibuf += 2;
}
upath = s_path->u_name;
- if ( path_isadir( s_path) ) {
+ if (path_isadir(s_path)) {
if (*s_path->m_name != '\0' || curdir->d_did == DIRDID_ROOT) {
- rc = AFPERR_ACCESS;
+ if (vol->v_adouble == AD_VERSION2)
+ return AFPERR_ACCESS;
+ if (*s_path->m_name == '\0' && curdir->d_did == DIRDID_ROOT)
+ return AFPERR_ACCESS;
+ if (rmdir(upath) != 0) {
+ switch (errno) {
+ case ENOTEMPTY:
+ return AFPERR_DIRNEMPT;
+ case EACCES:
+ return AFPERR_ACCESS;
+ default:
+ return AFPERR_MISC;
+ }
+ }
+ struct dir *deldir;
+ cnid_t delcnid = CNID_INVALID;
+ if ((deldir = dircache_search_by_name(vol, curdir, upath, strlen(upath)))) {
+ delcnid = deldir->d_did;
+ dir_remove(vol, deldir);
+ }
+ if (delcnid == CNID_INVALID)
+ delcnid = cnid_get(vol->v_cdb, curdir->d_did, upath, strlen(upath));
+ if (delcnid != CNID_INVALID)
+ cnid_delete(vol->v_cdb, delcnid);
+ fce_register_delete_dir(upath);
} else {
/* we have to cache this, the structs are lost in deletcurdir*/
/* but we need the positive returncode to send our event */
{
if (vol == NULL || dir == NULL || name == NULL)
return NULL;
- return absupath(vol, dir, mtoupath(vol, name, dir->d_did, utf8_encoding()));
+ return absupath(vol, dir, mtoupath(vol, name, dir->d_did, utf8_encoding(vol->v_obj)));
}
/* ------------------------- */
int did;
int pdid;
int plen;
- u_int16_t vid;
+ uint16_t vid;
int rc;
int sdir_fd = -1;
rc = moveandrename(vol, sdir, sdir_fd, oldname, newname, isdir);
if ( rc == AFP_OK ) {
- char *upath = mtoupath(vol, newname, pdid, utf8_encoding());
+ char *upath = mtoupath(vol, newname, pdid, utf8_encoding(obj));
if (NULL == upath) {
rc = AFPERR_PARAM;
goto exit;
}
- curdir->offcnt++;
- sdir->offcnt--;
/* if unix priv don't try to match perm with dest folder */
if (!isdir && !vol_unix_priv(vol)) {
int admode = ad_mode("", 0777) | vol->v_fperm;
projects / netatalk.git / blobdiff