#include <atalk/bstradd.h>
#include <atalk/globals.h>
#include <atalk/fce_api.h>
+#include <atalk/ea.h>
#include "volume.h"
#include "directory.h"
#include "fork.h"
+#include "desktop.h"
/* we need to have a hashed list of oforks (by dev inode) */
#define OFORK_HASHSIZE 64
}
/* -------------------------- */
-int of_stat(struct path *path)
+int of_stat(const struct vol *vol, struct path *path)
{
int ret;
path->st_errno = 0;
path->st_valid = 1;
- if ((ret = lstat(path->u_name, &path->st)) < 0) {
+ if ((ret = ostat(path->u_name, &path->st, vol_syml_opt(vol))) < 0) {
LOG(log_debug, logtype_afpd, "of_stat('%s/%s': %s)",
cfrombstr(curdir->d_fullpath), path->u_name, strerror(errno));
path->st_errno = errno;
if (*path->m_name) {
/* not curdir */
- return of_stat (path);
+ return of_stat(vol, path);
}
path->st_errno = 0;
path->st_valid = 1;
LOG(log_debug, logtype_afpd, "of_statdir: stating: '%s'", pathname);
- if (!(ret = lstat(pathname, &path->st)))
+ if (!(ret = ostat(pathname, &path->st, vol_syml_opt(vol))))
return 0;
path->st_errno = errno;
return -1;
path->st_errno = 0;
- if ((ret = lstat(cfrombstr(path->d_dir->d_u_name), &path->st)) < 0)
+ if ((ret = ostat(cfrombstr(path->d_dir->d_u_name), &path->st, vol_syml_opt(vol))) < 0)
path->st_errno = errno;
}
}
/* -------------------------- */
-struct ofork *of_findname(struct path *path)
+struct ofork *of_findname(const struct vol *vol, struct path *path)
{
struct ofork *of;
struct file_key key;
if (!path->st_valid) {
- of_stat(path);
+ of_stat(vol, path);
}
if (path->st_errno)
struct timeval tv;
int adflags = 0;
int ret;
+ struct dir *dir;
+ bstring forkpath = NULL;
adflags = 0;
if (ofork->of_flags & AFPFORK_DATA)
}
}
+ dir = dirlookup(ofork->of_vol, ofork->of_did);
+ if (dir == NULL) {
+ LOG(log_debug, logtype_afpd, "dirlookup failed for %ju", (uintmax_t)ofork->of_did);
+ }
+
+ if (dir) {
+ forkpath = bformat("%s/%s", bdata(dir->d_fullpath), of_name(ofork));
+ }
+
/* Somone has used write_fork, we assume file was changed, register it to file change event api */
- if (ofork->of_flags & AFPFORK_MODIFIED) {
- fce_register_file_modification(ofork);
+ if ((ofork->of_flags & AFPFORK_MODIFIED) && (forkpath)) {
+ fce_register(obj, FCE_FILE_MODIFY, bdata(forkpath), NULL);
}
ad_unlock(ofork->of_ad, ofork->of_refnum, ofork->of_flags & AFPFORK_ERROR ? 0 : 1);
#endif
ret = 0;
+
+ /*
+ * Check for 0 byte size resource forks, delete them.
+ * Here's the deal:
+ * (1) the size must be 0
+ * (2) the fork must refer to a resource fork
+ * (3) the refcount must be 1 which means this fork has the last
+ * reference to the adouble struct and the subsequent
+ * ad_close() will close the assoiciated fd.
+ * (4) nobody else has the resource fork open
+ *
+ * We only do this for ._ AppleDouble resource forks, not for
+ * xattr resource forks, because the test-suite then fails several
+ * tests on Solaris, the reason for that still needs to be
+ * determined.
+ */
+ if ((ofork->of_ad->ad_rlen == 0)
+ && (ofork->of_flags & AFPFORK_RSRC)
+ && (ofork->of_ad->ad_rfp->adf_refcount == 1)
+ && (ad_openforks(ofork->of_ad, ATTRBIT_DOPEN) == 0)) {
+
+#ifndef HAVE_EAFD
+ (void)unlink(ofork->of_ad->ad_ops->ad_path(
+ mtoupath(ofork->of_vol,
+ of_name(ofork),
+ ofork->of_did,
+ utf8_encoding(obj)),
+ 0));
+#endif
+ }
+
if ( ad_close( ofork->of_ad, adflags | ADFLAGS_SETSHRMD) < 0 ) {
ret = -1;
}
of_dealloc(ofork);
+ if (forkpath)
+ bdestroy(forkpath);
+
return ret;
}
struct ofork *of;
struct adouble *adp;
- if ((of = of_findname(path))) {
+ if ((of = of_findname(vol, path))) {
adp = of->of_ad;
} else {
ad_init(ad, vol);