/*
- * $Id: filedir.c,v 1.69.2.1 2010-02-01 10:56:08 franklahm Exp $
- *
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*/
#include <atalk/unix.h>
#include <atalk/bstrlib.h>
#include <atalk/bstradd.h>
+#include <atalk/acl.h>
#include "directory.h"
+#include "dircache.h"
#include "desktop.h"
#include "volume.h"
#include "fork.h"
upath, strerror(errno));
ret = AFPERR_ACCESS;
}
- else if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)
+ else if ((!S_ISLNK(st->st_mode)) && (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0))
{
LOG(log_error, logtype_afpd,
"matchfile2dirperms(%s): Error adding file read permissions: %s",
LOG(log_debug, logtype_afpd, "getfildirparams(vid:%u, did:%u, f/d:%04x/%04x) {cwdid:%u, cwd: %s, name:'%s'}",
ntohs(vid), ntohl(dir->d_did), fbitmap, dbitmap,
- ntohl(curdir->d_did), cfrombstring(curdir->d_fullpath), s_path->u_name);
+ ntohl(curdir->d_did), cfrombstr(curdir->d_fullpath), s_path->u_name);
st = &s_path->st;
if (!s_path->st_valid) {
- LOG(log_debug, logtype_afpd, "getfildirparams: !s_path->st_valid");
/* it's a dir and it should be there
* because we chdir in it in cname or
* it's curdir (maybe deleted, but then we can't know).
of_statdir(vol, s_path);
}
if ( s_path->st_errno != 0 ) {
- if (s_path->st_errno != EACCES) {
- LOG(log_debug, logtype_afpd, "getfildirparams: s_path->st_errno != 0");
+ if (afp_errno != AFPERR_ACCESS) {
return( AFPERR_NOOBJ );
}
}
}
if ( path->st_errno != 0 ) {
- return( AFPERR_NOOBJ );
+ if (afp_errno != AFPERR_ACCESS)
+ return( AFPERR_NOOBJ );
}
/*
* If ibuf is odd, make it even.
return 0;
}
-/* -------------------------
- move and rename sdir:oldname to curdir:newname in volume vol
-
- special care is needed for lock
+/* -------------------------
+ move and rename sdir:oldname to curdir:newname in volume vol
+ special care is needed for lock
*/
-static int moveandrename(const struct vol *vol, struct dir *sdir, char *oldname, char *newname, int isdir)
+static int moveandrename(const struct vol *vol,
+ struct dir *sdir,
+ int sdir_fd,
+ char *oldname,
+ char *newname,
+ int isdir)
{
char *p;
char *upath;
int rc;
struct stat *st, nst;
int adflags;
- struct adouble ad;
- struct adouble *adp;
- struct ofork *opened = NULL;
- struct path path;
- cnid_t id;
+ struct adouble ad;
+ struct adouble *adp;
+ struct ofork *opened = NULL;
+ struct path path;
+ cnid_t id;
+ int cwd_fd = -1;
ad_init(&ad, vol->v_adouble, vol->v_ad_options);
adp = &ad;
adflags = 0;
if (!isdir) {
- p = mtoupath(vol, oldname, sdir->d_did, utf8_encoding());
- if (!p) {
+ if ((p = mtoupath(vol, oldname, sdir->d_did, utf8_encoding())) == NULL)
return AFPERR_PARAM; /* can't convert */
- }
+
+#ifndef HAVE_RENAMEAT
+ /* Need full path */
id = cnid_get(vol->v_cdb, sdir->d_did, p, strlen(p));
p = ctoupath( vol, sdir, oldname );
- if (!p) {
+ if (!p)
return AFPERR_PARAM; /* pathname too long */
- }
+#endif /* HAVE_RENAMEAT */
+
path.st_valid = 0;
path.u_name = p;
- if ((opened = of_findname(&path))) {
+#ifdef HAVE_RENAMEAT
+ opened = of_findnameat(sdir_fd, &path);
+#else
+ opened = of_findname(&path);
+#endif /* HAVE_RENAMEAT */
+ if (opened) {
/* reuse struct adouble so it won't break locks */
adp = opened->of_ad;
}
- }
- else {
+ } else {
id = sdir->d_did; /* we already have the CNID */
p = ctoupath( vol, dirlookup(vol, sdir->d_pdid), oldname );
if (!p) {
}
adflags = ADFLAGS_DIR;
}
+
/*
- * p now points to the full pathname of the source fs object.
- *
- * we are in the dest folder so we need to use p for ad_open
+ * p now points to either
+ * a) full pathname of the source fs object (if renameat is not available)
+ * b) the oldname (renameat is available)
+ * we are in the dest folder so we need to use
+ * a) p for ad_open
+ * b) fchdir sdir_fd before eg ad_open or use *at functions where appropiate
*/
+ if (sdir_fd != -1) {
+ if ((cwd_fd = open(".", O_RDONLY)) == -1)
+ return AFPERR_MISC;
+ if (fchdir(sdir_fd) != 0) {
+ rc = AFPERR_MISC;
+ goto exit;
+ }
+ }
if (!ad_metadata(p, adflags, adp)) {
u_int16_t bshort;
ad_getattr(adp, &bshort);
ad_close_metadata( adp);
- if ((bshort & htons(ATTRBIT_NORENAME)))
- return(AFPERR_OLOCK);
+ if ((bshort & htons(ATTRBIT_NORENAME))) {
+ rc = AFPERR_OLOCK;
+ goto exit;
+ }
+ }
+ if (sdir_fd != -1) {
+ if (fchdir(cwd_fd) != 0) {
+ LOG(log_error, logtype_afpd, "moveandrename: %s", strerror(errno) );
+ rc = AFPERR_MISC;
+ goto exit;
+ }
}
- if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding()))){
- return AFPERR_PARAM;
+ if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding()))){
+ rc = AFPERR_PARAM;
+ goto exit;
}
path.u_name = upath;
st = &path.st;
if (0 != (rc = check_name(vol, upath))) {
- return rc;
+ goto exit;
}
/* source == destination. we just silently accept this. */
if ((!isdir && curdir == sdir) || (isdir && curdir->d_did == sdir->d_pdid)) {
- if (strcmp(oldname, newname) == 0)
- return AFP_OK;
+ if (strcmp(oldname, newname) == 0) {
+ rc = AFP_OK;
+ goto exit;
+ }
if (stat(upath, st) == 0 || caseenumerate(vol, &path, curdir) == 0) {
if (!stat(p, &nst) && !(nst.st_dev == st->st_dev && nst.st_ino == st->st_ino) ) {
/* not the same file */
- return AFPERR_EXIST;
+ rc = AFPERR_EXIST;
+ goto exit;
}
errno = 0;
}
- } else if (stat(upath, st ) == 0 || caseenumerate(vol, &path, curdir) == 0)
- return AFPERR_EXIST;
+ } else if (stat(upath, st ) == 0 || caseenumerate(vol, &path, curdir) == 0) {
+ rc = AFPERR_EXIST;
+ goto exit;
+ }
if ( !isdir ) {
path.st_valid = 1;
if (of_findname(&path)) {
rc = AFPERR_EXIST; /* was AFPERR_BUSY; */
} else {
- rc = renamefile(vol, p, upath, newname, adp );
+ rc = renamefile(vol, sdir_fd, p, upath, newname, adp );
if (rc == AFP_OK)
of_rename(vol, opened, sdir, oldname, curdir, newname);
}
} else {
- rc = renamedir(vol, p, upath, sdir, curdir, newname);
+ rc = renamedir(vol, sdir_fd, p, upath, sdir, curdir, newname);
}
if ( rc == AFP_OK && id ) {
/* renaming may have moved the file/dir across a filesystem */
- if (stat(upath, st) < 0)
+ if (stat(upath, st) < 0) {
+ rc = AFPERR_MISC;
+ goto exit;
+ }
+
+ if (dir_modify(vol,
+ sdir,
+ curdir->d_did,
+ 0,
+ newname,
+ upath,
+ S_ISDIR(st->st_mode) ? curdir->d_fullpath : NULL) != 0) {
+ LOG(log_error, logtype_afpd, "moveandrename: dir_modify error: %s -> %s",
+ p, upath);
return AFPERR_MISC;
+ }
/* fix up the catalog entry */
cnid_update(vol->v_cdb, id, st, curdir->d_did, upath, strlen(upath));
}
+exit:
+ if (cwd_fd != -1)
+ close(cwd_fd);
return rc;
}
if ( movecwd( vol, dirlookup(vol, sdir->d_pdid) ) < 0 ) {
return afp_errno;
}
- memcpy(oldname, cfrombstring(sdir->d_m_name), blength(sdir->d_m_name) +1);
+ memcpy(oldname, cfrombstr(sdir->d_m_name), blength(sdir->d_m_name) +1);
}
/* another place where we know about the path type */
if (!plen) {
return AFP_OK; /* newname == oldname same dir */
}
-
- rc = moveandrename(vol, sdir, oldname, newname, isdir);
-
+
+ rc = moveandrename(vol, sdir, -1, oldname, newname, isdir);
if ( rc == AFP_OK ) {
setvoltime(obj, vol );
}
rc = AFPERR_NOOBJ;
}
else {
- rc = deletefile(vol, upath, 1);
+ rc = deletefile(vol, -1, upath, 1);
+
+ struct dir *cachedfile;
+ if ((cachedfile = dircache_search_by_name(vol, dir, upath, strlen(upath)))) {
+ dircache_remove(vol, cachedfile, DIRCACHE | DIDNAME_INDEX | QUEUE_INDEX);
+ dir_free(cachedfile);
+ }
}
}
if ( rc == AFP_OK ) {
if (path->slen > MAXPATHLEN)
return NULL;
- LOG(log_debug, logtype_afpd, "absupath: %s", cfrombstring(path));
+ LOG(log_debug, logtype_afpd, "absupath: %s", cfrombstr(path));
- strncpy(pathbuf, cfrombstring(path), blength(path) + 1);
+ strncpy(pathbuf, cfrombstr(path), blength(path) + 1);
bdestroy(path);
return(pathbuf);
#ifdef DROPKLUDGE
int retvalue;
#endif /* DROPKLUDGE */
+ int sdir_fd = -1;
+
*rbuflen = 0;
ibuf += 2;
}
strcpy(oldname, path->m_name); /* an extra copy for of_rename */
} else {
- memcpy(oldname, cfrombstring(sdir->d_m_name), blength(sdir->d_m_name) + 1);
+ memcpy(oldname, cfrombstr(sdir->d_m_name), blength(sdir->d_m_name) + 1);
}
+#ifdef HAVE_RENAMEAT
+ if ((sdir_fd = open(".", O_RDONLY)) == -1)
+ return AFPERR_MISC;
+#endif
+
/* get the destination directory */
if (NULL == ( ddir = dirlookup( vol, did )) ) {
- return afp_errno; /* was AFPERR_PARAM */
+ rc = afp_errno; /* was AFPERR_PARAM */
+ goto exit;
}
if (NULL == ( path = cname( vol, ddir, &ibuf ))) {
- return( AFPERR_NOOBJ );
+ rc = AFPERR_NOOBJ;
+ goto exit;
}
pdid = curdir->d_did;
if ( *path->m_name != '\0' ) {
- return path_error(path, AFPERR_NOOBJ);
+ rc = path_error(path, AFPERR_NOOBJ);
+ goto exit;
}
/* one more place where we know about path type */
if ((plen = copy_path_name(vol, newname, ibuf)) < 0) {
- return( AFPERR_PARAM );
+ rc = AFPERR_PARAM;
+ goto exit;
}
if (!plen) {
strcpy(newname, oldname);
}
- LOG(log_debug, logtype_afpd, "afp_move: {oldname:'%s', newname:'%s', isdir:%u}",
+ /* This does the work */
+ LOG(log_debug, logtype_afpd, "afp_move(oldname:'%s', newname:'%s', isdir:%u)",
oldname, newname, isdir);
- rc = moveandrename(vol, sdir, oldname, newname, isdir);
+ rc = moveandrename(vol, sdir, sdir_fd, oldname, newname, isdir);
if ( rc == AFP_OK ) {
char *upath = mtoupath(vol, newname, pdid, utf8_encoding());
if (NULL == upath) {
- return AFPERR_PARAM;
+ rc = AFPERR_PARAM;
+ goto exit;
}
curdir->offcnt++;
sdir->offcnt--;
if (vol->v_flags & AFPVOL_DROPBOX) {
/* FIXME did is not always the source id */
if ((retvalue=matchfile2dirperms (upath, vol, did)) != AFP_OK) {
- return retvalue;
+ rc = retvalue;
+ goto exit;
}
}
else
setvoltime(obj, vol );
}
+exit:
+#ifdef HAVE_RENAMEAT
+ if (sdir_fd != -1)
+ close(sdir_fd);
+#endif
+
return( rc );
}
projects / netatalk.git / blobdiff