/*
- * $Id: filedir.c,v 1.73 2010/03/12 15:16:49 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"
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) {
struct ofork *opened = NULL;
struct path path;
cnid_t id;
- int cwd_fd;
+ int cwd_fd = -1;
ad_init(&ad, vol->v_adouble, vol->v_ad_options);
adp = &ad;
if (sdir_fd != -1) {
if ((cwd_fd = open(".", O_RDONLY)) == -1)
return AFPERR_MISC;
- if (fchdir(sdir_fd) != 0)
- 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) );
- return AFPERR_MISC;
+ 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 ( rc == AFP_OK && id ) {
/* renaming may have moved the file/dir across a filesystem */
- if (stat(upath, st) < 0)
- return AFPERR_MISC;
+ if (stat(upath, st) < 0) {
+ rc = AFPERR_MISC;
+ goto exit;
+ }
+
+ /* Remove it from the cache */
+ struct dir *cacheddir = dircache_search_by_did(vol, id);
+ if (cacheddir) {
+ LOG(log_warning, logtype_afpd,"Still cached: \"%s/%s\"", getcwdpath(), upath);
+ (void)dir_remove(vol, cacheddir);
+ }
/* 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 */
rc = deletefile(vol, -1, upath, 1);
struct dir *cachedfile;
- if (cachedfile = dircache_search_by_name(vol, dir, upath, strlen(upath))) {
- dircache_remove(vol, dir, DIRCACHE | DIDNAME_INDEX | QUEUE_INDEX);
+ if ((cachedfile = dircache_search_by_name(vol, dir, upath, strlen(upath), s_path->st.st_ctime))) {
+ dircache_remove(vol, cachedfile, DIRCACHE | DIDNAME_INDEX | QUEUE_INDEX);
dir_free(cachedfile);
}
}
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);
}
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