#include <atalk/logger.h>
#include <atalk/adouble.h>
#include <atalk/util.h>
+#include <atalk/unix.h>
#include <atalk/ea.h>
#include <atalk/bstrlib.h>
#include <atalk/bstradd.h>
/* ad:ea */
#define ADEDOFF_FINDERI_EA (AD_HEADER_LEN + ADEID_NUM_EA * AD_ENTRY_LEN)
-#define ADEDOFF_COMMENT_EA (ADEDOFF_FINDERI_EA + ADEDLEN_FINDERI)
-#define ADEDOFF_FILEDATESI_EA (ADEDOFF_COMMENT_EA + ADEDLEN_COMMENT)
+#define ADEDOFF_COMMENT_EA (ADEDOFF_FINDERI_EA + ADEDLEN_FINDERI)
+#define ADEDOFF_FILEDATESI_EA (ADEDOFF_COMMENT_EA + ADEDLEN_COMMENT)
#define ADEDOFF_AFPFILEI_EA (ADEDOFF_FILEDATESI_EA + ADEDLEN_FILEDATESI)
-#define ADEDOFF_PRIVID_EA (ADEDOFF_AFPFILEI_EA + ADEDLEN_AFPFILEI)
+#define ADEDOFF_PRIVDEV_EA (ADEDOFF_AFPFILEI_EA + ADEDLEN_AFPFILEI)
+#define ADEDOFF_PRIVINO_EA (ADEDOFF_PRIVDEV_EA + ADEDLEN_PRIVDEV)
+#define ADEDOFF_PRIVSYN_EA (ADEDOFF_PRIVINO_EA + ADEDLEN_PRIVINO)
+#define ADEDOFF_PRIVID_EA (ADEDOFF_PRIVSYN_EA + ADEDLEN_PRIVSYN)
/* this is to prevent changing timezones from causing problems with
localtime volumes. the screw-up is 30 years. we use a delta of 5 years */
/* Forward declarations */
static int ad_mkrf(const char *path);
-static int ad_header_read(const char *path, struct adouble *ad, struct stat *hst);
+static int ad_header_read(const char *path, struct adouble *ad, const struct stat *hst);
static int ad_header_upgrade(struct adouble *ad, const char *name);
static int ad_mkrf_ea(const char *path);
-static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat *hst);
+static int ad_header_read_ea(const char *path, struct adouble *ad, const struct stat *hst);
static int ad_header_upgrade_ea(struct adouble *ad, const char *name);
static int ad_reso_size(const char *path, int adflags, struct adouble *ad);
static int ad_mkrf_osx(const char *path);
static struct adouble_fops ad_adouble = {
&ad_path,
&ad_mkrf,
- &ad_rebuild_adouble_header,
+ &ad_rebuild_adouble_header_v2,
&ad_header_read,
&ad_header_upgrade,
};
&ad_path_osx,
&ad_mkrf_osx,
#endif
- &ad_rebuild_adouble_header,
+ &ad_rebuild_adouble_header_ea,
&ad_header_read_ea,
&ad_header_upgrade_ea,
};
-static struct adouble_fops ad_osx = {
- &ad_path_osx,
- &ad_mkrf_osx,
- &ad_rebuild_adouble_header,
- &ad_header_read,
- &ad_header_upgrade,
-};
-
static const struct entry entry_order2[ADEID_NUM_V2 + 1] = {
{ADEID_NAME, ADEDOFF_NAME_V2, ADEDLEN_INIT},
{ADEID_COMMENT, ADEDOFF_COMMENT_V2, ADEDLEN_INIT},
{ADEID_COMMENT, ADEDOFF_COMMENT_EA, ADEDLEN_INIT},
{ADEID_FILEDATESI, ADEDOFF_FILEDATESI_EA, ADEDLEN_FILEDATESI},
{ADEID_AFPFILEI, ADEDOFF_AFPFILEI_EA, ADEDLEN_AFPFILEI},
+ {ADEID_PRIVDEV, ADEDOFF_PRIVDEV_EA, ADEDLEN_INIT},
+ {ADEID_PRIVINO, ADEDOFF_PRIVINO_EA, ADEDLEN_INIT},
+ {ADEID_PRIVSYN, ADEDOFF_PRIVSYN_EA, ADEDLEN_INIT},
{ADEID_PRIVID, ADEDOFF_PRIVID_EA, ADEDLEN_INIT},
{0, 0, 0}
};
return buf;
}
+#define OPENFLAGS2LOGSTRBUFSIZ 128
+const char *openflags2logstr(int oflags)
+{
+ int first = 1;
+ static char buf[OPENFLAGS2LOGSTRBUFSIZ];
+
+ buf[0] = 0;
+
+ if ((oflags & O_RDONLY) || (oflags == O_RDONLY)) {
+ strlcat(buf, "O_RDONLY", OPENFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (oflags & O_RDWR) {
+ if (!first)
+ strlcat(buf, "|", OPENFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "O_RDWR", OPENFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (oflags & O_CREAT) {
+ if (!first)
+ strlcat(buf, "|", OPENFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "O_CREAT", OPENFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (oflags & O_TRUNC) {
+ if (!first)
+ strlcat(buf, "|", OPENFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "O_TRUNC", OPENFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (oflags & O_EXCL) {
+ if (!first)
+ strlcat(buf, "|", OPENFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "O_EXCL", OPENFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ return buf;
+}
+
static uint32_t get_eid(uint32_t eid)
{
if (eid <= 15)
* NOTE: we're assuming that the resource fork is kept at the end of
* the file. also, mmapping won't work for the hfs fs until it
* understands how to mmap header files. */
-static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat *hst)
+static int ad_header_read(const char *path _U_, struct adouble *ad, const struct stat *hst)
{
char *buf = ad->ad_data;
uint16_t nentries;
struct stat st;
/* read the header */
- if ((header_len = adf_pread( ad->ad_mdp, buf, AD_DATASZ, 0)) < 0) {
+ if ((header_len = adf_pread( ad->ad_mdp, buf, AD_DATASZ2, 0)) < 0) {
return -1;
}
if (header_len < AD_HEADER_LEN) {
return 0;
}
+/* error here means it's not ad ._ adouble:osx file and thus we return 1 */
+int ad_valid_header_osx(const char *path)
+{
+ EC_INIT;
+ int fd = -1;
+ struct adouble adosx;
+ char *buf = &adosx.ad_data[0];
+ ssize_t header_len;
+
+ LOG(log_debug, logtype_afpd, "ad_valid_header_osx(\"%s\"): BEGIN", fullpathname(path));
+
+ EC_NEG1( fd = open(path, O_RDONLY) );
+
+ /* read the header */
+ EC_NEG1( header_len = read(fd, buf, AD_DATASZ_OSX) );
+
+ if (header_len < AD_HEADER_LEN)
+ EC_FAIL;
+
+ memcpy(&adosx.ad_magic, buf, sizeof(adosx.ad_magic));
+ memcpy(&adosx.ad_version, buf + ADEDOFF_VERSION, sizeof(adosx.ad_version));
+ adosx.ad_magic = ntohl(adosx.ad_magic);
+ adosx.ad_version = ntohl(adosx.ad_version);
+
+ if ((adosx.ad_magic != AD_MAGIC) || (adosx.ad_version != AD_VERSION2)) {
+ LOG(log_error, logtype_afpd, "ad_valid_header_osx: not an adouble:ox file");
+ EC_FAIL;
+ }
+
+EC_CLEANUP:
+ LOG(log_debug, logtype_afpd, "ad_valid_header_osx(\"%s\"): END: %d", fullpathname(path), ret);
+ if (fd != -1)
+ close(fd);
+ if (ret != 0)
+ return 1;
+ return 0;
+}
+
/* Read an ._ file, only uses the resofork, finderinfo is taken from EA */
-static int ad_header_read_osx(const char *path _U_, struct adouble *ad, struct stat *hst)
+static int ad_header_read_osx(const char *path _U_, struct adouble *ad, const struct stat *hst)
{
EC_INIT;
struct adouble adosx;
EC_EXIT;
}
-static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat *hst _U_)
+static int ad_header_read_ea(const char *path, struct adouble *ad, const struct stat *hst _U_)
{
uint16_t nentries;
int len;
if (adflags & ADFLAGS_NOHF) { /* 1 */
return 0;
}
- if (adflags & ADFLAGS_DF) { /* 2 */
+ if (adflags & (ADFLAGS_DF | ADFLAGS_SETSHRMD | ADFLAGS_CHECK_OF)) { /* 2 */
ad_close( ad, ADFLAGS_DF );
err = errno;
}
return -1 ;
}
-/* Map ADFLAGS to open() flags */
-static int ad2openflags(int adflags)
+/*!
+ * Map ADFLAGS to open() flags
+ *
+ * @param adfile (r) the file you really want to open: ADFLAGS_DF or ADFLAGS_HF
+ * @param adflags (r) flags from ad_open(..., adflags, ...)
+ * @returns mapped flags suitable for calling open()
+ */
+static int ad2openflags(const struct adouble *ad, int adfile, int adflags)
{
int oflags = 0;
if (adflags & ADFLAGS_RDWR)
oflags |= O_RDWR;
if (adflags & ADFLAGS_RDONLY) {
- if (adflags & ADFLAGS_SETSHRMD)
+ if (((adfile == ADFLAGS_DF || adfile == ADFLAGS_RF) && (adflags & ADFLAGS_SETSHRMD))
+ /* need rw access for locks */
+ || ((adfile == ADFLAGS_HF) && (ad->ad_vers == AD_VERSION2)))
+ /* need rw access for adouble file for the case:
+ 1) openfork(data+meta:O_RDONLY), 2) openfork(reso(=meta):O_RDWR) */
oflags |= O_RDWR;
else
oflags |= O_RDONLY;
static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble *ad)
{
+ EC_INIT;
struct stat st_dir;
int oflags;
mode_t admode;
int st_invalid = -1;
ssize_t lsz;
- LOG(log_debug, logtype_default, "ad_open_df(\"%s\", %04o)",
- fullpathname(path), mode);
+ LOG(log_debug, logtype_default,
+ "ad_open_df(\"%s\", %s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
+ fullpathname(path), adflags2logstr(adflags),
+ ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
+ ad_meta_fileno(ad), ad->ad_mdp->adf_refcount,
+ ad_reso_fileno(ad), ad->ad_rfp->adf_refcount);
if (ad_data_fileno(ad) != -1) {
/* the file is already open, but we want write access: */
/* it's not new anymore */
ad->ad_data_fork.adf_flags &= ~( O_TRUNC | O_CREAT );
ad->ad_data_fork.adf_refcount++;
- return 0;
+ goto EC_CLEANUP;
}
- oflags = O_NOFOLLOW | ad2openflags(adflags);
+ oflags = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_DF, adflags);
admode = mode;
if ((adflags & ADFLAGS_CREATE)) {
if ((adflags & ADFLAGS_SETSHRMD) && (adflags & ADFLAGS_RDONLY)) {
oflags &= ~O_RDWR;
oflags |= O_RDONLY;
- if ((ad->ad_data_fork.adf_fd = open(path, oflags, admode)) == -1)
- return -1;
+ EC_NEG1( ad->ad_data_fork.adf_fd = open(path, oflags, admode) );
break;
}
return -1;
ad->ad_data_fork.adf_syml = malloc(MAXPATHLEN+1);
if ((lsz = readlink(path, ad->ad_data_fork.adf_syml, MAXPATHLEN)) <= 0) {
free(ad->ad_data_fork.adf_syml);
- return -1;
+ EC_FAIL;
}
ad->ad_data_fork.adf_syml[lsz] = 0;
- ad->ad_data_fork.adf_fd = -2; /* -2 means its a symlink */
+ ad->ad_data_fork.adf_fd = AD_SYMLINK;
break;
default:
- return -1;
+ EC_FAIL;
}
}
adf_lock_init(&ad->ad_data_fork);
ad->ad_data_fork.adf_refcount++;
- return 0;
+EC_CLEANUP:
+ LOG(log_debug, logtype_default,
+ "ad_open_df(\"%s\", %s): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
+ fullpathname(path), adflags2logstr(adflags), ret,
+ ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
+ ad_meta_fileno(ad), ad->ad_mdp->adf_refcount,
+ ad_reso_fileno(ad), ad->ad_rfp->adf_refcount);
+ EC_EXIT;
}
-/* TODO: error handling */
static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adouble *ad)
{
+ EC_INIT;
struct stat st_dir;
struct stat st_meta;
struct stat *pst = NULL;
const char *ad_p;
- int oflags, nocreatflags;
+ int oflags, nocreatflags, opened = 0;
mode_t admode;
int st_invalid = -1;
+ LOG(log_debug, logtype_default,
+ "ad_open_hf_v2(\"%s\", %s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
+ fullpathname(path), adflags2logstr(adflags),
+ ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
+ ad_meta_fileno(ad), ad->ad_mdp->adf_refcount,
+ ad_reso_fileno(ad), ad->ad_rfp->adf_refcount);
+
if (ad_meta_fileno(ad) != -1) {
/* the file is already open, but we want write access: */
if ((adflags & ADFLAGS_RDWR) &&
/* and it was already denied: */
(ad->ad_mdp->adf_flags & O_RDONLY)) {
errno = EACCES;
- return -1;
+ EC_FAIL;
}
ad_refresh(path, ad);
/* it's not new anymore */
ad->ad_mdp->adf_flags &= ~( O_TRUNC | O_CREAT );
ad->ad_mdp->adf_refcount++;
- return 0;
+ goto EC_CLEANUP;
}
ad_p = ad->ad_ops->ad_path(path, adflags);
- oflags = O_NOFOLLOW | ad2openflags(adflags);
+ oflags = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_HF, adflags);
+ LOG(log_debug, logtype_default,"ad_open_hf_v2(\"%s\"): open flags: %s",
+ fullpathname(path), openflags2logstr(oflags));
nocreatflags = oflags & ~(O_CREAT | O_EXCL);
- ad->ad_mdp->adf_fd = open(ad_p, nocreatflags);
+ ad_meta_fileno(ad) = open(ad_p, nocreatflags);
- if (ad->ad_mdp->adf_fd != -1) {
+ if (ad_meta_fileno(ad) != -1) {
ad->ad_mdp->adf_flags = nocreatflags;
} else {
switch (errno) {
if ((adflags & ADFLAGS_RDONLY) && (adflags & ADFLAGS_SETSHRMD)) {
nocreatflags &= ~O_RDWR;
nocreatflags |= O_RDONLY;
- if ((ad->ad_mdp->adf_fd = open(ad_p, nocreatflags)) == -1)
- return -1;
+ EC_NEG1( ad_meta_fileno(ad) = open(ad_p, nocreatflags) );
ad->ad_mdp->adf_flags = nocreatflags;
break;
}
- return -1;
+ EC_FAIL;
case ENOENT:
if (!(oflags & O_CREAT))
- return ad_error(ad, adflags);
+ EC_FAIL;
/*
* We're expecting to create a new adouble header file here
*/
admode = mode;
admode = ad_hf_mode(admode);
if (errno == ENOENT) {
- if (ad->ad_ops->ad_mkrf( ad_p) < 0) {
- return ad_error(ad, adflags);
- }
+ EC_NEG1_LOG( ad->ad_ops->ad_mkrf(ad_p) );
admode = mode;
st_invalid = ad_mode_st(ad_p, &admode, &st_dir);
if ((ad->ad_options & ADVOL_UNIXPRIV))
}
/* retry with O_CREAT */
- ad->ad_mdp->adf_fd = open(ad_p, oflags, admode);
- if ( ad->ad_mdp->adf_fd < 0 )
- return ad_error(ad, adflags);
-
+ EC_NEG1( ad_meta_fileno(ad) = open(ad_p, oflags, admode) );
ad->ad_mdp->adf_flags = oflags;
/* just created, set owner if admin owner (root) */
if (!st_invalid)
ad_chown(ad_p, &st_dir);
break;
default:
- return -1;
+ EC_FAIL;
}
}
+ /* Now we've got a new opened fd, we need to check that in the error case */
+ opened = 1;
+
if (!(ad->ad_mdp->adf_flags & O_CREAT)) {
/* check for 0 length files, treat them as new. */
if (fstat(ad->ad_mdp->adf_fd, &st_meta) == 0) {
if ((ad->ad_mdp->adf_flags & ( O_TRUNC | O_CREAT ))) {
/* This is a new adouble header file, create it */
- if (new_ad_header(ad, path, pst, adflags) < 0) {
- int err = errno;
- /* the file is already deleted, perm, whatever, so return an error */
- ad_close(ad, adflags);
- errno = err;
- return -1;
- }
+ EC_NEG1_LOG( new_ad_header(ad, path, pst, adflags) );
ad_flush(ad);
} else {
/* Read the adouble header in and parse it.*/
- if (ad->ad_ops->ad_header_read(path, ad, pst) < 0
- || ad->ad_ops->ad_header_upgrade(ad, ad_p) < 0) {
- int err = errno;
- ad_close(ad, adflags);
- errno = err;
- return -1;
- }
+ EC_NEG1_LOG( ad->ad_ops->ad_header_read(path, ad, pst) );
}
- return 0;
+EC_CLEANUP:
+ if (ret != 0 && opened && ad_meta_fileno(ad) != -1) {
+ close(ad_meta_fileno(ad));
+ ad_meta_fileno(ad) = -1;
+ ad->ad_mdp->adf_refcount = 0;
+ }
+ LOG(log_debug, logtype_default,
+ "ad_open_hf_v2(\"%s\", %s): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
+ fullpathname(path), adflags2logstr(adflags), ret,
+ ad_data_fileno(ad), ad->ad_data_fork.adf_refcount,
+ ad_meta_fileno(ad), ad->ad_mdp->adf_refcount,
+ ad_reso_fileno(ad), ad->ad_rfp->adf_refcount);
+ EC_EXIT;
}
static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble *ad)
ad_meta_fileno(ad), ad->ad_mdp->adf_refcount,
ad_reso_fileno(ad), ad->ad_rfp->adf_refcount);
- oflags = O_NOFOLLOW | (ad2openflags(adflags) & ~(O_CREAT | O_TRUNC));
+ oflags = O_NOFOLLOW | (ad2openflags(ad, ADFLAGS_DF, adflags) & ~(O_CREAT | O_TRUNC));
+
+ if (ad_meta_fileno(ad) == AD_SYMLINK)
+ /* symlink */
+ EC_EXIT;
if (ad_meta_fileno(ad) != -1) {
/* the file is already open, but we want write access: */
/* Read the adouble header in and parse it.*/
if (ad->ad_ops->ad_header_read(path, ad, NULL) != 0) {
if (!(adflags & ADFLAGS_CREATE)) {
+ LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): can't read metadata EA", path);
errno = ENOENT;
EC_FAIL;
}
LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): created metadata EA", path);
}
- ad->ad_mdp->adf_refcount++;
+ if (ad_meta_fileno(ad) != -1)
+ ad->ad_mdp->adf_refcount++;
(void)ad_reso_size(path, adflags, ad);
EC_CLEANUP:
EC_INIT;
struct stat st;
- LOG(log_debug, logtype_default, "ad_reso_size(\"%s\")", path);
+ if (adflags & ADFLAGS_DIR) {
+ ad->ad_rlen = 0;
+ goto EC_CLEANUP;
+ }
+
+ LOG(log_debug, logtype_default, "ad_reso_size(\"%s\"): BEGIN", path);
#ifdef HAVE_EAFD
- int opened = 0;
- int eafd = ad_reso_fileno(ad);
- if (eafd == -1) {
- EC_NEG1( eafd = sys_getxattrfd(path, AD_EA_RESO, O_RDONLY) );
- opened = 1;
+ ssize_t easz;
+
+ if (ad_reso_fileno(ad) != -1) {
+ EC_NEG1( fstat(ad_reso_fileno(ad), &st) );
+ ad->ad_rlen = st.st_size;
+ } else if (ad_meta_fileno(ad) != -1) {
+ EC_NEG1( (ad->ad_rlen = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0)) );
+ } else {
+ EC_NEG1( (ad->ad_rlen = sys_lgetxattr(path, AD_EA_RESO, NULL, 0)) );
}
- EC_NEG1( rlen = fstat(eafd, &st) );
- ad->ad_rlen = st.st_size;
+
#else
const char *rfpath;
EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags));
LOG(log_debug, logtype_default, "ad_reso_size(\"%s\"): size: %zd", path, ad->ad_rlen);
EC_CLEANUP:
-#ifdef HAVE_EAFD
- if (opened)
- close(eafd);
-#endif
if (ret != 0)
ad->ad_rlen = 0;
EC_EXIT;
}
-/*!
- * Open ressource fork
- *
- * Only for adouble:ea, a nullop otherwise because adouble:v2 has the ressource fork as part
- * of the adouble file which is openend by ADFLAGS_HF.
- */
-static int ad_open_rf(const char *path, int adflags, int mode, struct adouble *ad)
+static int ad_open_rf_v2(const char *path, int adflags, int mode, struct adouble *ad)
+{
+ /*
+ * ad_open_hf_v2() does the work, but if it failed and adflags are ADFLAGS_NOHF | ADFLAGS_RF
+ * ad_open_hf_v2() didn't give an error, but we're supposed to return a reso fork fd
+ */
+ if (!AD_RSRC_OPEN(ad) && !(adflags & ADFLAGS_NORF))
+ return -1;
+ return 0;
+}
+
+static int ad_open_rf_ea(const char *path, int adflags, int mode, struct adouble *ad)
{
EC_INIT;
int oflags;
struct stat st;
#endif
- if (ad->ad_vers != AD_VERSION_EA)
- return 0;
-
LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): BEGIN", fullpathname(path));
- oflags = O_NOFOLLOW | (ad2openflags(adflags) & ~O_CREAT);
+ oflags = O_NOFOLLOW | (ad2openflags(ad, ADFLAGS_RF, adflags) & ~O_CREAT);
if (ad_reso_fileno(ad) != -1) {
/* the file is already open, but we want write access: */
goto EC_CLEANUP;
}
#ifdef HAVE_EAFD
- if ((ad_reso_fileno(ad) = sys_getxattrfd(path, oflags)) == -1) {
- if (!(adflags & ADFLAGS_CREATE))
+ if (ad_meta_fileno(ad) < 0)
+ EC_FAIL;
+ if ((ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad), AD_EA_RESO, oflags)) == -1) {
+ if (!(adflags & ADFLAGS_CREATE)) {
+ errno = ENOENT;
EC_FAIL;
+ }
oflags |= O_CREAT;
- EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(path, oflags, 0666) );
+ EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad),
+ AD_EA_RESO, oflags, 0666) );
}
#else
EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags) );
EC_EXIT;
}
+/*!
+ * Open ressource fork
+ */
+static int ad_open_rf(const char *path, int adflags, int mode, struct adouble *ad)
+{
+ int ret = 0;
+
+ switch (ad->ad_vers) {
+ case AD_VERSION2:
+ ret = ad_open_rf_v2(path, adflags, mode, ad);
+ break;
+ case AD_VERSION_EA:
+ ret = ad_open_rf_ea(path, adflags, mode, ad);
+ break;
+ default:
+ ret = -1;
+ break;
+ }
+
+ return ret;
+}
+
/***********************************************************************************
* API functions
********************************************************************************* */
+off_t ad_getentryoff(const struct adouble *ad, int eid)
+{
+ if (ad->ad_vers == AD_VERSION2)
+ return ad->ad_eid[eid].ade_off;
+
+ switch (eid) {
+ case ADEID_DFORK:
+ return 0;
+ case ADEID_RFORK:
+#ifdef HAVE_EAFD
+ return 0;
+#else
+ return ADEDOFF_RFORK_OSX;
+#endif
+ default:
+ return ad->ad_eid[eid].ade_off;
+ }
+ /* deadc0de */
+ AFP_PANIC("What am I doing here?");
+}
+
const char *ad_path_ea( const char *path, int adflags _U_)
{
return path;
/* Checking for open forks requires sharemode lock support (ie RDWR instead of RDONLY) */
adflags |= ADFLAGS_SETSHRMD;
- if ((ad->ad_vers == AD_VERSION2) && (adflags & ADFLAGS_RF)) {
- adflags |= ADFLAGS_HF;
+ if (adflags & ADFLAGS_SETSHRMD)
+ /* sharemode locks are stored in the data fork */
+ adflags |= ADFLAGS_DF;
+
+ if (ad->ad_vers == AD_VERSION2) {
+ if (adflags & ADFLAGS_RF)
+ adflags |= ADFLAGS_HF;
if (adflags & ADFLAGS_NORF)
adflags |= ADFLAGS_NOHF;
}
va_start(args, adflags);
if (adflags & ADFLAGS_CREATE)
- mode = va_arg(args, mode_t);
+ mode = (sizeof(mode_t) < sizeof(int) ? va_arg (args, int) : va_arg (args, mode_t));
va_end(args);
if (adflags & ADFLAGS_DF) {
if (AD_RSRC_OPEN(ad)) {
if (ad_reso_fileno(ad) == -1)
return -1;
- ssize_t len;
- if ((len = fstat(ad_reso_fileno(ad))) == -1)
+ struct stat st;
+ if (fstat(ad_reso_fileno(ad), &st) == -1)
return -1;
- ad->ad_rlen = len;
+ ad->ad_rlen = st.st_size;
}
#else
if (AD_META_OPEN(ad)) {
va_start(args, adflags);
if (adflags & ADFLAGS_CREATE)
- mode = va_arg(args, mode_t);
+ mode = (sizeof(mode_t) < sizeof(int) ? va_arg (args, int) : va_arg (args, mode_t));
va_end(args);
EC_NEG1( ad_open(ad, path, adflags, mode) );
return ret;
}
+
+/* build a resource fork mode from the data fork mode:
+ * remove X mode and extend header to RW if R or W (W if R for locking),
+ */
+mode_t ad_hf_mode(mode_t mode)
+{
+ mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH);
+ /* fnctl lock need write access */
+ if ((mode & S_IRUSR))
+ mode |= S_IWUSR;
+ if ((mode & S_IRGRP))
+ mode |= S_IWGRP;
+ if ((mode & S_IROTH))
+ mode |= S_IWOTH;
+
+ /* if write mode set add read mode */
+ if ((mode & S_IWUSR))
+ mode |= S_IRUSR;
+ if ((mode & S_IWGRP))
+ mode |= S_IRGRP;
+ if ((mode & S_IWOTH))
+ mode |= S_IROTH;
+
+ return mode;
+}