#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
&& s_of->key.dev == of->key.dev
&& s_of->key.inode == of->key.inode ) {
if (!done) {
- strlcpy( of_name(of), newpath, of->of_ad->ad_m_namelen);
+ free(of_name(of));
+ if ((of_name(of) = strdup(newpath)) == NULL)
+ return AFPERR_MISC;
done = 1;
}
if (newdir != olddir)
/* initialize to zero. This is important to ensure that
ad_open really does reinitialize the structure. */
- ad_init(ad, vol->v_adouble, vol->v_ad_options);
-
- ad->ad_m_namelen = UTF8FILELEN_EARLY +1;
- /* here's the deal: we allocate enough for the standard mac file length.
- * in the future, we'll reallocate in fairly large jumps in case
- * of long unicode names */
- if (( ad->ad_m_name =(char *)malloc( ad->ad_m_namelen )) == NULL ) {
+ ad_init(ad, vol);
+ if ((ad->ad_name = strdup(path)) == NULL) {
LOG(log_error, logtype_afpd, "of_alloc: malloc: %s", strerror(errno) );
free(ad);
free(of);
oforks[ of_refnum ] = NULL;
return NULL;
}
- strlcpy( ad->ad_m_name, path, ad->ad_m_namelen);
+ } else {
+ /* Increase the refcount on this struct adouble. This is
+ decremented again in oforc_dealloc. */
+ ad_ref(ad);
}
- ad_ref(ad);
of->of_ad = ad;
of->of_vol = vol;
of->of_did = dir->d_did;
}
/* -------------------------- */
-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)
}
#endif
-void of_dealloc( struct ofork *of)
+void of_dealloc(struct ofork *of)
{
if (!oforks)
return;
of_unhash(of);
oforks[ of->of_refnum % nforks ] = NULL;
+
+ /* decrease refcount */
+ of->of_ad->ad_refcount--;
+
+ if ( of->of_ad->ad_refcount <= 0) {
+ free( of->of_ad->ad_name );
+ free( of->of_ad);
+ }
+
free( of );
}
/* --------------------------- */
-int of_closefork(struct ofork *ofork)
+int of_closefork(const AFPObj *obj, struct ofork *ofork)
{
struct timeval tv;
- int doflush = 0;
+ int adflags = 0;
int ret;
-
- if ( (ofork->of_flags & AFPFORK_OPEN) && ad_reso_fileno( ofork->of_ad ) != -1 ) {
- /*
- * Only set the rfork's length if we're closing the rfork.
- */
- if ((ofork->of_flags & AFPFORK_RSRC)) {
- ad_refresh( ofork->of_ad );
- if ((ofork->of_flags & AFPFORK_DIRTY) && !gettimeofday(&tv, NULL)) {
- ad_setdate(ofork->of_ad, AD_DATE_MODIFY | AD_DATE_UNIX,tv.tv_sec);
- doflush++;
- }
- if ( doflush ) {
- ad_flush( ofork->of_ad );
- }
+ struct dir *dir;
+ bstring forkpath = NULL;
+
+ adflags = 0;
+ if (ofork->of_flags & AFPFORK_DATA)
+ adflags |= ADFLAGS_DF;
+ if (ofork->of_flags & AFPFORK_META)
+ adflags |= ADFLAGS_HF;
+ if (ofork->of_flags & AFPFORK_RSRC) {
+ adflags |= ADFLAGS_RF;
+ /* Only set the rfork's length if we're closing the rfork. */
+ ad_refresh(NULL, ofork->of_ad );
+ if ((ofork->of_flags & AFPFORK_DIRTY) && !gettimeofday(&tv, NULL)) {
+ ad_setdate(ofork->of_ad, AD_DATE_MODIFY | AD_DATE_UNIX,tv.tv_sec);
+ ad_flush( ofork->of_ad );
}
}
+ 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);
+
+#ifdef HAVE_FSHARE_T
+ if (obj->options.flags & OPTION_SHARE_RESERV) {
+ fshare_t shmd;
+ shmd.f_id = ofork->of_refnum;
+ if (AD_DATA_OPEN(ofork->of_ad))
+ fcntl(ad_data_fileno(ofork->of_ad), F_UNSHARE, &shmd);
+ if (AD_RSRC_OPEN(ofork->of_ad))
+ fcntl(ad_reso_fileno(ofork->of_ad), F_UNSHARE, &shmd);
}
+#endif
ret = 0;
- ad_unlock(ofork->of_ad, ofork->of_refnum);
-
- if (ad_unref(ofork->of_ad) == 0) {
- if ( ad_close( ofork->of_ad, 0 ) < 0 ) {
- ret = -1;
- }
+ /*
+ * 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 );
+ 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->v_adouble, vol->v_ad_options);
+ ad_init(ad, vol);
adp = ad;
}
return adp;
/* ----------------------
close all forks for a volume
*/
-void of_closevol(const struct vol *vol)
+void of_closevol(const AFPObj *obj, const struct vol *vol)
{
int refnum;
for ( refnum = 0; refnum < nforks; refnum++ ) {
if (oforks[ refnum ] != NULL && oforks[refnum]->of_vol == vol) {
- if (of_closefork( oforks[ refnum ]) < 0 ) {
+ if (of_closefork(obj, oforks[ refnum ]) < 0 ) {
LOG(log_error, logtype_afpd, "of_closevol: %s", strerror(errno) );
}
}
/* ----------------------
close all forks for a volume
*/
-void of_close_all_forks(void)
+void of_close_all_forks(const AFPObj *obj)
{
int refnum;
for ( refnum = 0; refnum < nforks; refnum++ ) {
if (oforks[ refnum ] != NULL) {
- if (of_closefork( oforks[ refnum ]) < 0 ) {
+ if (of_closefork(obj, oforks[ refnum ]) < 0 ) {
LOG(log_error, logtype_afpd, "of_close_all_forks: %s", strerror(errno) );
}
}
projects / netatalk.git / blobdiff