/*!
* @file
* Part of Netatalk's AppleDouble implementatation
- * @note We don't use inlines because a good compiler should be
- * able to optimize all the static funcs below.
* @sa include/atalk/adouble.h
*/
#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>
#include <atalk/compat.h>
+#include <atalk/errchk.h>
+#include <atalk/volume.h>
#include "ad_lock.h"
-#ifndef MAX
-#define MAX(a, b) ((a) < (b) ? (b) : (a))
-#endif /* ! MAX */
-
-#ifdef HAVE_PREAD
-# define AD_SET(a)
-#else
-# define AD_SET(a) a = 0
-#endif
-
#define ADEDOFF_MAGIC (0)
#define ADEDOFF_VERSION (ADEDOFF_MAGIC + ADEDLEN_MAGIC)
#define ADEDOFF_FILLER (ADEDOFF_VERSION + ADEDLEN_VERSION)
#define ADEDOFF_RFORK_V2 (ADEDOFF_PRIVID + ADEDLEN_PRIVID)
/* 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_AFPFILEI_EA (ADEDOFF_FILEDATESI_EA + ADEDLEN_FILEDATESI)
+#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_AFPFILEI_EA (ADEDOFF_FILEDATESI_EA + ADEDLEN_FILEDATESI)
+#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(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(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,
};
static struct adouble_fops ad_adouble_ea = {
+#ifdef HAVE_EAFD
&ad_path_ea,
&ad_mkrf_ea,
- &ad_rebuild_adouble_header,
+#else
+ &ad_path_osx,
+ &ad_mkrf_osx,
+#endif
+ &ad_rebuild_adouble_header_ea,
&ad_header_read_ea,
&ad_header_upgrade_ea,
};
{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}
};
+#define ADFLAGS2LOGSTRBUFSIZ 128
+const char *adflags2logstr(int adflags)
+{
+ int first = 1;
+ static char buf[ADFLAGS2LOGSTRBUFSIZ];
+
+ buf[0] = 0;
+
+ if (adflags & ADFLAGS_DF) {
+ strlcat(buf, "DF", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_RF) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "RF", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_NORF) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "NORF", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_HF) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "HF", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_NOHF) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "NOHF", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_DIR) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "DIR", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_CHECK_OF) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "OF", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_SETSHRMD) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "SHRMD", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_RDWR) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "O_RDWR", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_RDONLY) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "O_RDONLY", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_CREATE) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "O_CREAT", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_EXCL) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "O_EXCL", ADFLAGS2LOGSTRBUFSIZ);
+ first = 0;
+ }
+ if (adflags & ADFLAGS_TRUNC) {
+ if (!first)
+ strlcat(buf, "|", ADFLAGS2LOGSTRBUFSIZ);
+ strlcat(buf, "O_TRUNC", ADFLAGS2LOGSTRBUFSIZ);
+ first = 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)
}
/* ----------------------------------- */
-static int new_ad_header(const char *path, struct adouble *ad, int adflags)
+static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, int adflags)
{
const struct entry *eid;
- u_int16_t ashort;
+ uint16_t ashort;
struct stat st;
+ LOG(log_debug, logtype_default, "new_ad_header(\"%s\")", path);
+
+ if (ad->ad_magic == AD_MAGIC) {
+ LOG(log_debug, logtype_default, "new_ad_header(\"%s\"): already initialized", path);
+ return 0;
+ }
+
ad->ad_magic = AD_MAGIC;
- ad->ad_version = ad->ad_flags & 0x0f0000;
+ ad->ad_version = ad->ad_vers & 0x0f0000;
if (!ad->ad_version) {
ad->ad_version = AD_VERSION;
}
-
memset(ad->ad_data, 0, sizeof(ad->ad_data));
- if (ad->ad_flags == AD_VERSION2)
+ if (ad->ad_vers == AD_VERSION2)
eid = entry_order2;
- else if (ad->ad_flags == AD_VERSION_EA)
+ else if (ad->ad_vers == AD_VERSION_EA)
eid = entry_order_ea;
- else {
+ else
return -1;
- }
while (eid->id) {
ad->ad_eid[eid->id].ade_off = eid->offset;
}
/* put something sane in the directory finderinfo */
+ if (stp == NULL) {
+ stp = &st;
+ if (lstat(path, &st) != 0)
+ return -1;
+ }
+
if ((adflags & ADFLAGS_DIR)) {
/* set default view */
ashort = htons(FINDERINFO_CLOSEDVIEW);
}
/* make things invisible */
- if ((ad->ad_options & ADVOL_INVDOTS) && (*path == '.')) {
+ if ((ad->ad_options & ADVOL_INVDOTS)
+ && (*path == '.')
+ && !((adflags & ADFLAGS_DIR) && (path[1] == 0))
+ ) {
ashort = htons(ATTRBIT_INVISIBLE);
ad_setattr(ad, ashort);
ashort = htons(FINDERINFO_INVISIBLE);
memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort));
}
- if (lstat(path, &st) < 0)
- return -1;
-
/* put something sane in the date fields */
- ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, st.st_mtime);
- ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, st.st_mtime);
- ad_setdate(ad, AD_DATE_ACCESS | AD_DATE_UNIX, st.st_mtime);
+ ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, stp->st_mtime);
+ ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, stp->st_mtime);
+ ad_setdate(ad, AD_DATE_ACCESS | AD_DATE_UNIX, stp->st_mtime);
ad_setdate(ad, AD_DATE_BACKUP, AD_DATE_START);
+
return 0;
}
len = ntohl( len );
buf += sizeof( len );
- if (eid && eid < ADEID_MAX && off < sizeof(ad->ad_data) &&
- (off + len <= sizeof(ad->ad_data) || eid == ADEID_RFORK)) {
+ if (eid
+ && eid < ADEID_MAX
+ && off < sizeof(ad->ad_data)
+ && (off + len <= sizeof(ad->ad_data) || eid == ADEID_RFORK)) {
ad->ad_eid[ eid ].ade_off = off;
ad->ad_eid[ eid ].ade_len = len;
} else if (!warning) {
* 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(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;
- u_int16_t nentries;
+ uint16_t nentries;
int len;
ssize_t header_len;
struct stat st;
/* read the header */
- if ((header_len = adf_pread( ad->ad_md, buf, sizeof(ad->ad_data), 0)) < 0) {
+ if ((header_len = adf_pread( ad->ad_mdp, buf, AD_DATASZ2, 0)) < 0) {
return -1;
}
if (header_len < AD_HEADER_LEN) {
if (hst == NULL) {
hst = &st;
- if (fstat(ad->ad_md->adf_fd, &st) < 0) {
+ if (fstat(ad->ad_mdp->adf_fd, &st) < 0) {
return 1; /* fail silently */
}
}
return 0;
}
-static int ad_header_read_ea(struct adouble *ad, struct stat *hst _U_)
+/* 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, const struct stat *hst)
+{
+ EC_INIT;
+ struct adouble adosx;
+ char *buf = &adosx.ad_data[0];
+ uint16_t nentries;
+ int len;
+ ssize_t header_len;
+ struct stat st;
+
+ memset(buf, 0, sizeof(adosx.ad_data));
+
+ /* read the header */
+ EC_NEG1( header_len = adf_pread(ad->ad_rfp, buf, AD_DATASZ_OSX, 0) );
+
+ if (header_len < AD_HEADER_LEN) {
+ errno = EIO;
+ return -1;
+ }
+
+ 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_header_read_osx: can't parse AppleDouble header");
+ errno = EIO;
+ return -1;
+ }
+
+ memcpy(&nentries, buf + ADEDOFF_NENTRIES, sizeof( nentries ));
+ nentries = ntohs(nentries);
+ len = nentries * AD_ENTRY_LEN;
+
+ if (len + AD_HEADER_LEN > sizeof(adosx.ad_data))
+ len = sizeof(adosx.ad_data) - AD_HEADER_LEN;
+
+ buf += AD_HEADER_LEN;
+ if (len > header_len - AD_HEADER_LEN) {
+ LOG(log_error, logtype_afpd, "ad_header_read_osx: can't read entry info.");
+ errno = EIO;
+ return -1;
+ }
+
+ nentries = len / AD_ENTRY_LEN;
+ parse_entries(&adosx, buf, nentries);
+
+ if (ad_getentryoff(&adosx, ADEID_RFORK) == 0
+ || ad_getentryoff(&adosx, ADEID_RFORK) > sizeof(ad->ad_data)
+ || ad_getentryoff(&adosx, ADEID_RFORK) > header_len
+ ) {
+ LOG(log_error, logtype_afpd, "ad_header_read_osx: problem with rfork entry offset.");
+ errno = EIO;
+ return -1;
+ }
+
+ if (hst == NULL) {
+ hst = &st;
+ EC_NEG1( fstat(ad_reso_fileno(ad), &st) );
+ }
+
+ ad_setentryoff(ad, ADEID_RFORK, ad_getentryoff(&adosx, ADEID_RFORK));
+ ad->ad_rlen = hst->st_size - ad_getentryoff(ad, ADEID_RFORK);
+
+EC_CLEANUP:
+ EC_EXIT;
+}
+
+static int ad_header_read_ea(const char *path, struct adouble *ad, const struct stat *hst _U_)
{
uint16_t nentries;
int len;
ssize_t header_len;
char *buf = ad->ad_data;
- /* read the header */
- if ((header_len = sys_lgetxattr(cfrombstr(ad->ad_fullpath), AD_EA_META, ad->ad_data, AD_DATASZ_EA)) < 1) {
- LOG(log_debug, logtype_default, "ad_header_read_ea: %s (%u)", strerror(errno), errno);
+ if (ad_meta_fileno(ad) != -1)
+ header_len = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_META, ad->ad_data, AD_DATASZ_EA);
+ else
+ header_len = sys_lgetxattr(path, AD_EA_META, ad->ad_data, AD_DATASZ_EA);
+ if (header_len < 1) {
+ LOG(log_debug, logtype_default, "ad_header_read_ea: %s", strerror(errno));
return -1;
}
/* Now parse entries */
parse_entries(ad, buf + AD_HEADER_LEN, nentries);
+
return 0;
}
+/*!
+ * Takes a path to an AppleDouble file and creates the parrent .AppleDouble directory
+ *
+ * Example:
+ * path: "/path/.AppleDouble/file"
+ * => mkdir("/path/.AppleDouble/") (in ad_mkdir())
+ */
static int ad_mkrf(const char *path)
{
char *slash;
return 0;
}
+static int ad_mkrf_osx(const char *path _U_)
+{
+ return 0;
+}
+
/* ----------------
if we are root change path user/ group
It can be a native function for BSD cf. FAQ.Q10
/* ----------------
return access right and inode of path parent directory
*/
-static int ad_mode_st(const char *path, int *mode, struct stat *stbuf)
+static int ad_mode_st(const char *path, mode_t *mode, struct stat *stbuf)
{
if (*mode == 0) {
return -1;
static int ad_error(struct adouble *ad, int adflags)
{
int err = errno;
- if ((adflags & ADFLAGS_NOHF)) { /* 1 */
- /* FIXME double check : set header offset ?*/
+ 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 ;
}
-static int ad_open_df(const char *path, int adflags, int oflags, int mode, struct adouble *ad)
+/*!
+ * 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 (((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;
+ }
+ if (adflags & ADFLAGS_CREATE)
+ oflags |= O_CREAT;
+ if (adflags & ADFLAGS_EXCL)
+ oflags |= O_EXCL;
+ if (adflags & ADFLAGS_TRUNC)
+ oflags |= O_TRUNC;
+
+ return oflags;
+}
+
+static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble *ad)
{
+ EC_INIT;
struct stat st_dir;
- int hoflags, admode;
+ int oflags;
+ mode_t admode;
int st_invalid = -1;
-
- LOG(log_debug, logtype_default, "ad_open_df(\"%s\", %s, %04o)",
- abspath(path), oflags2logstr(oflags), mode);
-
- if (ad_data_fileno(ad) == -1) {
- hoflags = (oflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR;
- admode = mode;
- if ((oflags & O_CREAT)) {
- st_invalid = ad_mode_st(path, &admode, &st_dir);
- if ((ad->ad_options & ADVOL_UNIXPRIV)) {
- admode = mode;
+ ssize_t lsz;
+
+ 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: */
+ if ((adflags & ADFLAGS_RDWR)
+ /* and it was denied the first time: */
+ && (ad->ad_data_fork.adf_flags & O_RDONLY)) {
+ errno = EACCES;
+ return -1;
}
- }
+ /* it's not new anymore */
+ ad->ad_data_fork.adf_flags &= ~( O_TRUNC | O_CREAT );
+ ad->ad_data_fork.adf_refcount++;
+ goto EC_CLEANUP;
+ }
- ad->ad_data_fork.adf_fd = open(path, hoflags | O_NOFOLLOW, admode);
+ oflags = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_DF, adflags);
- if (ad->ad_data_fork.adf_fd == -1) {
- if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) {
- hoflags = oflags;
- ad->ad_data_fork.adf_fd = open( path, hoflags | O_NOFOLLOW, admode );
- }
- if (ad->ad_data_fork.adf_fd == -1 && errno == OPEN_NOFOLLOW_ERRNO) {
- int lsz;
-
- ad->ad_data_fork.adf_syml = malloc(MAXPATHLEN+1);
- lsz = readlink(path, ad->ad_data_fork.adf_syml, MAXPATHLEN);
- if (lsz <= 0) {
- free(ad->ad_data_fork.adf_syml);
- return -1;
- }
- ad->ad_data_fork.adf_syml[lsz] = 0;
- ad->ad_data_fork.adf_fd = -2; /* -2 means its a symlink */
- }
- }
+ admode = mode;
+ if ((adflags & ADFLAGS_CREATE)) {
+ st_invalid = ad_mode_st(path, &admode, &st_dir);
+ if ((ad->ad_options & ADVOL_UNIXPRIV))
+ admode = mode;
+ }
- if ( ad->ad_data_fork.adf_fd == -1 )
- return -1;
+ ad->ad_data_fork.adf_fd = open(path, oflags, admode);
- AD_SET(ad->ad_data_fork.adf_off);
- ad->ad_data_fork.adf_flags = hoflags;
- if (!st_invalid) {
- /* just created, set owner if admin (root) */
- ad_chown(path, &st_dir);
- }
- } else {
- /* the file is already open... but */
- if ((oflags & ( O_RDWR | O_WRONLY))
- /* we want write access */
- && !(ad->ad_data_fork.adf_flags & ( O_RDWR | O_WRONLY))) {
- /* and it was denied the first time */
- errno = EACCES;
+ if (ad->ad_data_fork.adf_fd == -1) {
+ switch (errno) {
+ case EACCES:
+ case EPERM:
+ case EROFS:
+ if ((adflags & ADFLAGS_SETSHRMD) && (adflags & ADFLAGS_RDONLY)) {
+ oflags &= ~O_RDWR;
+ oflags |= O_RDONLY;
+ EC_NEG1( ad->ad_data_fork.adf_fd = open(path, oflags, admode) );
+ break;
+ }
return -1;
+ case OPEN_NOFOLLOW_ERRNO:
+ 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);
+ EC_FAIL;
+ }
+ ad->ad_data_fork.adf_syml[lsz] = 0;
+ ad->ad_data_fork.adf_fd = AD_SYMLINK;
+ break;
+ default:
+ EC_FAIL;
}
- /* FIXME
- * for now ad_open is never called with O_TRUNC or O_EXCL if the file is
- * already open. Should we check for it? ie
- * O_EXCL --> error
- * O_TRUNC --> truncate the fork.
- * idem for ressource fork.
- */
}
- return 0;
+ if (!st_invalid)
+ ad_chown(path, &st_dir); /* just created, set owner if admin (root) */
+
+ ad->ad_data_fork.adf_flags = oflags;
+ adf_lock_init(&ad->ad_data_fork);
+ ad->ad_data_fork.adf_refcount++;
+
+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;
}
-static int ad_open_hf_v2(const char *path, int adflags, int oflags, int mode, struct adouble *ad)
+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 hoflags, admode;
+ int oflags, nocreatflags, opened = 0;
+ mode_t admode;
int st_invalid = -1;
- ad_p = ad->ad_ops->ad_path( path, adflags );
+ 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;
+ 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++;
+ goto EC_CLEANUP;
+ }
- hoflags = (oflags & ~(O_CREAT | O_EXCL)) | O_NOFOLLOW;
+ ad_p = ad->ad_ops->ad_path(path, 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_md->adf_fd = open(ad_p, hoflags, 0);
+ ad_meta_fileno(ad) = open(ad_p, nocreatflags);
- if ( ad->ad_md->adf_fd < 0 ) {
- if (errno == ENOENT && (oflags & O_CREAT) ) {
+ if (ad_meta_fileno(ad) != -1) {
+ ad->ad_mdp->adf_flags = nocreatflags;
+ } else {
+ switch (errno) {
+ case EACCES:
+ case EPERM:
+ case EROFS:
+ if ((adflags & ADFLAGS_RDONLY) && (adflags & ADFLAGS_SETSHRMD)) {
+ nocreatflags &= ~O_RDWR;
+ nocreatflags |= O_RDONLY;
+ EC_NEG1( ad_meta_fileno(ad) = open(ad_p, nocreatflags) );
+ ad->ad_mdp->adf_flags = nocreatflags;
+ break;
+ }
+ EC_FAIL;
+ case ENOENT:
+ if (!(oflags & O_CREAT))
+ EC_FAIL;
/*
* We're expecting to create a new adouble header file here
- * if ((oflags & O_CREAT) ==> (oflags & O_RDWR)
*/
LOG(log_debug, logtype_default, "ad_open(\"%s\"): creating adouble file",
- abspath(path));
+ fullpathname(path));
admode = mode;
errno = 0;
st_invalid = ad_mode_st(ad_p, &admode, &st_dir);
- if ((ad->ad_options & ADVOL_UNIXPRIV)) {
+ if ((ad->ad_options & ADVOL_UNIXPRIV))
admode = mode;
- }
admode = ad_hf_mode(admode);
- if ((errno == ENOENT)) {
- if (ad->ad_ops->ad_mkrf( ad_p) < 0) {
- return ad_error(ad, adflags);
- }
+ if (errno == ENOENT) {
+ 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)) {
+ if ((ad->ad_options & ADVOL_UNIXPRIV))
admode = mode;
- }
admode = ad_hf_mode(admode);
}
+
/* retry with O_CREAT */
- ad->ad_md->adf_fd = open(ad_p, oflags, admode);
- if ( ad->ad_md->adf_fd < 0 ) {
- return ad_error(ad, adflags);
- }
- ad->ad_md->adf_flags = oflags;
+ 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) {
+ if (!st_invalid)
ad_chown(ad_p, &st_dir);
- }
- } else {
- return ad_error(ad, adflags);
+ break;
+ default:
+ EC_FAIL;
}
- } else {
- ad->ad_md->adf_flags = hoflags;
- if (fstat(ad->ad_md->adf_fd, &st_meta) == 0 && st_meta.st_size == 0) {
- /* for 0 length files, treat them as new. */
- ad->ad_md->adf_flags |= O_TRUNC;
- } else {
- /* we have valid data in st_meta stat structure, reused it in ad_header_read */
- pst = &st_meta;
+ }
+
+ /* 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 (st_meta.st_size == 0)
+ ad->ad_mdp->adf_flags |= O_TRUNC;
+ else
+ /* we have valid data in st_meta stat structure, reused it in ad_header_read */
+ pst = &st_meta;
}
}
- AD_SET(ad->ad_md->adf_off);
+ adf_lock_init(ad->ad_mdp);
+ ad->ad_mdp->adf_refcount = 1;
- if ((ad->ad_md->adf_flags & ( O_TRUNC | O_CREAT ))) {
+ if ((ad->ad_mdp->adf_flags & ( O_TRUNC | O_CREAT ))) {
/* This is a new adouble header file, create it */
- if (new_ad_header(path, ad, adflags) < 0) {
- int err = errno;
- /* the file is already deleted, perm, whatever, so return an error */
- 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( ad , pst) < 0
- || ad->ad_ops->ad_header_upgrade(ad, ad_p) < 0) {
- int err = errno;
- 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 oflags, int mode, struct adouble *ad)
+static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble *ad)
{
+ EC_INIT;
ssize_t rforklen;
-
- /* we dont use this fd, but open it anyway, maybe we need it sometimes */
- if ((ad->ad_md->adf_fd = open(path, O_RDONLY | O_NOFOLLOW)) == -1)
- goto error;
+ int oflags;
+ int opened = 0;
+
+ LOG(log_debug, logtype_default,
+ "ad_open_hf_ea(\"%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);
+
+ oflags = O_NOFOLLOW | (ad2openflags(ad, ADFLAGS_DF, adflags) & ~(O_CREAT | O_TRUNC));
+
+ if (ad_meta_fileno(ad) == AD_SYMLINK)
+ goto EC_CLEANUP;
+
+ if (ad_meta_fileno(ad) != -1) {
+ /* the file is already open, but we want write access: */
+ if ((oflags & O_RDWR) &&
+ /* and it was already denied: */
+ (ad->ad_mdp->adf_flags & O_RDONLY)) {
+ LOG(log_error, logtype_default, "ad_open_hf_ea(%s): rw request for ro file: %s",
+ fullpathname(path), strerror(errno));
+ errno = EACCES;
+ EC_FAIL;
+ }
+ /* it's not new anymore */
+ ad->ad_mdp->adf_flags &= ~( O_TRUNC | O_CREAT );
+ } else {
+ if (oflags & O_RDWR) {
+ /* Fo a RDONLY adouble we just use sys_lgetxattr instead if sys_fgetxattr */
+ if (adflags & ADFLAGS_DIR)
+ /* For directories we open the directory RDONYL so we can later fchdir() */
+ oflags = (oflags & ~O_RDWR) | O_RDONLY;
+ LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): opening base file for meta adouble EA", path);
+ EC_NEG1(ad_meta_fileno(ad) = open(path, oflags));
+ opened = 1;
+ ad->ad_mdp->adf_flags = oflags;
+ }
+ }
/* Read the adouble header in and parse it.*/
- if (ad->ad_ops->ad_header_read(ad, NULL) != 0) {
- if (!(oflags & O_CREAT))
- goto error;
+ 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\"): creating metadata EA", path);
/* It doesnt exist, EPERM or another error */
- if (errno != ENOATTR && errno != ENOENT) {
+ if (!(errno == ENOATTR || errno == ENOENT)) {
LOG(log_error, logtype_default, "ad_open_hf_ea: unexpected: %s", strerror(errno));
- goto error;
+ EC_FAIL;
}
/* Create one */
- if (new_ad_header(path, ad, adflags) < 0) {
- LOG(log_error, logtype_default, "ad_open_hf_ea: can't create new header: %s",
- abspath(path));
- goto error;
- }
- ad->ad_md->adf_flags |= O_CREAT; /* mark as just created */
+ EC_NEG1_LOG(new_ad_header(ad, path, NULL, adflags));
+ ad->ad_mdp->adf_flags |= O_CREAT; /* mark as just created */
ad_flush(ad);
- LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): created metadata EA",
- cfrombstr(ad->ad_fullpath));
+ LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): created metadata EA", path);
}
- ad->ad_md->adf_flags |= oflags & (O_RDONLY|O_WRONLY|O_RDWR); /* store current flags */
-
- if ((rforklen = sys_lgetxattr(cfrombstr(ad->ad_fullpath), AD_EA_RESO, NULL, 0)) > 0)
- ad->ad_rlen = rforklen;
-
- return 0;
+ if (ad_meta_fileno(ad) != -1)
+ ad->ad_mdp->adf_refcount++;
+ (void)ad_reso_size(path, adflags, ad);
-error:
- if (ad->ad_md->adf_fd != -1) {
- close(ad->ad_md->adf_fd);
- ad->ad_md->adf_fd = -1;
+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;
}
- return ad_error(ad, adflags);
+ LOG(log_debug, logtype_default,
+ "ad_open_hf_ea(\"%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(const char *path, int adflags, int oflags, int mode, struct adouble *ad)
+static int ad_open_hf(const char *path, int adflags, int mode, struct adouble *ad)
{
int ret = 0;
- LOG(log_debug, logtype_default, "ad_open_hf(\"%s\", %s, %04o)",
- cfrombstr(ad->ad_fullpath), oflags2logstr(oflags), mode);
-
memset(ad->ad_eid, 0, sizeof( ad->ad_eid ));
ad->ad_rlen = 0;
- switch (ad->ad_flags) {
+ switch (ad->ad_vers) {
case AD_VERSION2:
- ret = ad_open_hf_v2(path, adflags, oflags, mode, ad);
+ ret = ad_open_hf_v2(path, adflags, mode, ad);
break;
case AD_VERSION_EA:
- ret = ad_open_hf_ea(path, adflags, oflags, mode, ad);
+ ret = ad_open_hf_ea(path, adflags, mode, ad);
break;
default:
ret = -1;
break;
}
+ if (ret != 0)
+ ret = ad_error(ad, adflags);
+
return ret;
}
/*!
- * 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.
+ * Get resofork length for adouble:ea
*/
-static int ad_open_rf(const char *path, int adflags, int oflags, int mode, struct adouble *ad)
+static int ad_reso_size(const char *path, int adflags, struct adouble *ad)
{
- int ret = 0;
+ EC_INIT;
+ struct stat st;
- if (ad->ad_flags != AD_VERSION_EA)
- return 0;
+ if (adflags & ADFLAGS_DIR) {
+ ad->ad_rlen = 0;
+ goto EC_CLEANUP;
+ }
- LOG(log_debug, logtype_default, "ad_open_rf(\"%s\", %s, %04o)",
- cfrombstr(ad->ad_fullpath), oflags2logstr(oflags), mode);
+ LOG(log_debug, logtype_default, "ad_reso_size(\"%s\"): BEGIN", path);
- if ((ad->ad_rlen = sys_lgetxattr(cfrombstr(ad->ad_fullpath), AD_EA_RESO, NULL, 0)) <= 0) {
- switch (errno) {
- case ENOATTR:
- ad->ad_rlen = 0;
- break;
- default:
- LOG(log_warning, logtype_default, "ad_open_rf(\"%s\"): %s",
- abspath(path), strerror(errno));
- ret = -1;
- goto exit;
- }
- }
+#ifdef HAVE_EAFD
+ ssize_t easz;
- /* Round up and allocate buffer */
- size_t roundup = ((ad->ad_rlen / RFORK_EA_ALLOCSIZE) + 1) * RFORK_EA_ALLOCSIZE;
- if ((ad->ad_resforkbuf = malloc(roundup)) == NULL) {
- ret = -1;
- goto exit;
+ 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)) );
}
- ad->ad_resforkbufsize = roundup;
+#else
+ const char *rfpath;
+ EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags));
+ EC_ZERO( lstat(rfpath, &st));
+ if (st.st_size > ADEDOFF_RFORK_OSX)
+ ad->ad_rlen = st.st_size - ADEDOFF_RFORK_OSX;
+ else
+ ad->ad_rlen = 0;
+#endif
+
+ LOG(log_debug, logtype_default, "ad_reso_size(\"%s\"): size: %zd", path, ad->ad_rlen);
- /* Read the EA into the buffer */
- if (ad->ad_rlen > 0) {
- if (sys_lgetxattr(cfrombstr(ad->ad_fullpath), AD_EA_RESO, ad->ad_resforkbuf, ad->ad_rlen) == -1) {
- ret = -1;
- goto exit;
- }
+EC_CLEANUP:
+ if (ret != 0)
+ ad->ad_rlen = 0;
+ EC_EXIT;
+}
+
+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;
+ int opened = 0;
+ int closeflags = adflags & (ADFLAGS_DF | ADFLAGS_HF);
+ ssize_t rlen;
+#ifndef HAVE_EAFD
+ const char *rfpath;
+ struct stat st;
+#endif
+
+ LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): BEGIN", fullpathname(path));
+
+ 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: */
+ if ((oflags & O_RDWR)
+ /* and it was already denied: */
+ && (ad->ad_rfp->adf_flags & O_RDONLY)) {
+ errno = EACCES;
+ EC_FAIL;
+ }
+ ad->ad_rfp->adf_flags &= ~( O_TRUNC | O_CREAT );
+ ad->ad_rfp->adf_refcount++;
+ EC_NEG1_LOG( ad_reso_size(path, adflags, ad));
+ goto EC_CLEANUP;
+ }
+#ifdef HAVE_EAFD
+ 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(ad_meta_fileno(ad),
+ AD_EA_RESO, oflags, 0666) );
}
+#else
+ EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags) );
+ if ((ad_reso_fileno(ad) = open(rfpath, oflags)) == -1) {
+ if (!(adflags & ADFLAGS_CREATE))
+ EC_FAIL;
+ oflags |= O_CREAT;
+ EC_NEG1_LOG( ad_reso_fileno(ad) = open(rfpath, oflags, mode) );
+ LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork: \"%s\"",
+ path, rfpath);
+ }
+#endif
+ opened = 1;
+ ad->ad_rfp->adf_refcount = 1;
+ ad->ad_rfp->adf_flags = oflags;
-exit:
+#ifndef HAVE_EAFD
+ EC_ZERO_LOG( fstat(ad_reso_fileno(ad), &st) );
+ if (ad->ad_rfp->adf_flags & O_CREAT) {
+ /* This is a new adouble header file, create it */
+ LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork, initializing: \"%s\"",
+ path, rfpath);
+ EC_NEG1_LOG( new_ad_header(ad, path, NULL, adflags) );
+ LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork, flushing: \"%s\"",
+ path, rfpath);
+ ad_flush(ad);
+ } else {
+ /* Read the adouble header */
+ LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): reading adouble rfork: \"%s\"",
+ path, rfpath);
+ EC_NEG1_LOG( ad_header_read_osx(NULL, ad, &st) );
+ }
+#endif
+
+ (void)ad_reso_size(path, adflags, ad);
+
+EC_CLEANUP:
if (ret != 0) {
- free(ad->ad_resforkbuf);
- ad->ad_resforkbuf = NULL;
+ if (opened && (ad_reso_fileno(ad) != -1)) {
+ close(ad_reso_fileno(ad));
+ ad_reso_fileno(ad) = -1;
+ ad->ad_rfp->adf_refcount = 0;
+ }
+ if (adflags & ADFLAGS_NORF) {
+ ret = 0;
+ } else {
+ int err = errno;
+ (void)ad_close(ad, closeflags);
+ errno = err;
+ }
ad->ad_rlen = 0;
- ad->ad_resforkbufsize = 0;
+ }
+
+ LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): END: %d", fullpathname(path), ret);
+
+ 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;
}
+const char *ad_path_osx(const char *path, int adflags _U_)
+{
+ static char pathbuf[ MAXPATHLEN + 1];
+ char c, *slash, buf[MAXPATHLEN + 1];
+
+ if (!strcmp(path,".")) {
+ /* fixme */
+ getcwd(buf, MAXPATHLEN);
+ }
+ else {
+ strlcpy(buf, path, MAXPATHLEN +1);
+ }
+ if (NULL != ( slash = strrchr( buf, '/' )) ) {
+ c = *++slash;
+ *slash = '\0';
+ strlcpy( pathbuf, buf, MAXPATHLEN +1);
+ *slash = c;
+ } else {
+ pathbuf[ 0 ] = '\0';
+ slash = buf;
+ }
+ strlcat( pathbuf, "._", MAXPATHLEN +1);
+ strlcat( pathbuf, slash, MAXPATHLEN +1);
+ return pathbuf;
+}
+
/*
* Put the .AppleDouble where it needs to be:
*
/* ----------------
return access right of path parent directory
*/
-int ad_mode( const char *path, int mode)
+int ad_mode( const char *path, mode_t mode)
{
struct stat stbuf;
ad_mode_st(path, &mode, &stbuf);
/*
* Use mkdir() with mode bits taken from ad_mode().
*/
-int ad_mkdir( const char *path, int mode)
+int ad_mkdir( const char *path, mode_t mode)
{
int ret;
int st_invalid;
return ret;
}
-void ad_init(struct adouble *ad, int flags, int options)
+static void ad_init_func(struct adouble *ad)
{
- memset(ad, 0, sizeof(struct adouble));
-
- if (flags == AD_VERSION2) {
+ switch (ad->ad_vers) {
+ case AD_VERSION2:
ad->ad_ops = &ad_adouble;
- ad->ad_md = &ad->ad_resource_fork;
- }
- else if (flags == AD_VERSION_EA) {
+ ad->ad_rfp = &ad->ad_resource_fork;
+ ad->ad_mdp = &ad->ad_resource_fork;
+ break;
+ case AD_VERSION_EA:
ad->ad_ops = &ad_adouble_ea;
- ad->ad_md = &ad->ad_metadata_fork;
- } else {
- LOG(log_error, logtype_default, "ad_init: unknown AD version");
- errno = EIO;
- return;
+ ad->ad_rfp = &ad->ad_resource_fork;
+ ad->ad_mdp = &ad->ad_data_fork;
+ break;
+ default:
+ AFP_PANIC("ad_init: unknown AD version");
}
- ad->ad_flags = flags;
- ad->ad_options = options;
+
ad_data_fileno(ad) = -1;
ad_reso_fileno(ad) = -1;
ad_meta_fileno(ad) = -1;
- ad->ad_inited = AD_INITED;
+ ad->ad_refcount = 1;
+ return;
}
-const char *adflags2logstr(int adflags)
+void ad_init_old(struct adouble *ad, int flags, int options)
{
- int first = 1;
- static char buf[64];
-
- buf[0] = 0;
-
- if (adflags & ADFLAGS_DF) {
- strlcat(buf, "DF", 64);
- first = 0;
- }
- if (adflags & ADFLAGS_RF) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "RF", 64);
- first = 0;
- }
- if (adflags & ADFLAGS_HF) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "HF", 64);
- first = 0;
- }
- if (adflags & ADFLAGS_NOHF) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "NOHF", 64);
- first = 0;
- }
- if (adflags & ADFLAGS_DIR) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "DIR", 64);
- first = 0;
- }
- if (adflags & ADFLAGS_CHECK_OF) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "OF", 64);
- first = 0;
- }
- return buf;
+ memset(ad, 0, sizeof(struct adouble));
+ ad->ad_vers = flags;
+ ad->ad_options = options;
+ ad_init_func(ad);
}
-const char *oflags2logstr(int oflags)
+void ad_init(struct adouble *ad, const struct vol * restrict vol)
{
- int first = 1;
- static char buf[64];
-
- buf[0] = 0;
-
- if (oflags == O_RDONLY) {
- strlcat(buf, "O_RDONLY", 64);
- first = 0;
- }
- if (oflags & O_RDWR) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "O_RDWR", 64);
- first = 0;
- }
- if (oflags & O_CREAT) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "O_CREAT", 64);
- first = 0;
- }
- if (oflags & O_EXCL) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "O_EXCL", 64);
- first = 0;
- }
- return buf;
+ memset(ad, 0, sizeof(struct adouble));
+ ad->ad_vers = vol->v_adouble;
+ ad->ad_options = vol->v_ad_options;
+ ad_init_func(ad);
}
/*!
* Open data-, metadata(header)- or ressource fork
*
+ * ad_open(struct adouble *ad, const char *path, int adflags, int flags)
+ * ad_open(struct adouble *ad, const char *path, int adflags, int flags, mode_t mode)
+ *
* You must call ad_init() before ad_open, usually you'll just call it like this: \n
* @code
* struct adoube ad;
*
* Open a files data fork, metadata fork or ressource fork.
*
- * For each fork to be opened specify the open flags and mode in case you want to create it
- * (O_CREAT in open flags). The order in which forks are opened is:
- * 1) ADFLAGS_DF, 2) ADFLAGS_HF, 3) ADFLAGS_RF.
- * It is possible to call ad_open subsequently opening ADFLAGS_DF first and ADFLAGS_HF in
- * another ad_open call. Already openend forks are uneffected in subsequent calls (3).
- * The variable arguments must be passed according to this order. Then:
- * 1. Ensure the adouble struct has been initialized.
- * 2. Store the full path to the object the first time ad_open is called for it.
- * 3. Check if the fork has already been opened.
- *
- * ad_close accompanies ad_open and closes a struct adouble. In order to tigh together the
- * semantics of struct adouble/ad_open/ad_close and versus forks, which use and keep a ref to
- * the according struct adouble for the fork, open forks refcount their struct adouble
- * in struct adouble.ad_refcount. An ad_close is ignored when ad_refcount != 0, because
- * ad_refcount != 0 means an open fork is using this very struct adouble.
- *
* @param ad (rw) pointer to struct adouble
* @param path (r) Path to file or directory
- * @param adflags (r) ADFLAGS_DF: open data fork \n
- * ADFLAGS_RF: open ressource fork \n
- * ADFLAGS_HF: open header (metadata) file \n
- * ADFLAGS_NOHF: it's not an error if header file couldn't be created \n
- * ADFLAGS_DIR: if path is a directory you MUST or ADFLAGS_DIR to adflags \n
- * ADFLAGS_RDONLY: dont upgrade mode from r to rw with adouble:v2 headerfile \n
- * ADFLAGS_CHECK_OF: check for open forks from us and other afpd's
+ * @param adflags (r) Flags specifying which fork to open, can be or'd:
+ * ADFLAGS_DF: open data fork
+ * ADFLAGS_RF: open ressource fork
+ * ADFLAGS_HF: open header (metadata) file
+ * ADFLAGS_NOHF: it's not an error if header file couldn't be opened
+ * ADFLAGS_NORF: it's not an error if reso fork couldn't be opened
+ * ADFLAGS_DIR: if path is a directory you MUST or ADFLAGS_DIR to adflags
+ *
+ * Access mode for the forks:
+ * ADFLAGS_RDONLY: open read only
+ * ADFLAGS_RDWR: open read write
+ *
+ * Creation flags:
+ * ADFLAGS_CREATE: create if not existing
+ * ADFLAGS_TRUNC: truncate
+ *
+ * Special flags:
+ * ADFLAGS_CHECK_OF: check for open forks from us and other afpd's
+ * ADFLAGS_SETSHRMD: this adouble struct will be used to set sharemode locks.
+ * This basically results in the files being opened RW instead of RDONLY.
+ * @param mode (r) mode used with O_CREATE
+ *
+ * The open mode flags (rw vs ro) have to take into account all the following requirements:
+ * - we remember open fds for files because me must avoid a single close releasing fcntl locks for other
+ * fds of the same file
*
* @returns 0 on success, any other value indicates an error
*/
-static int vad_open(struct adouble *ad, const char *path, int adflags, va_list args)
+int ad_open(struct adouble *ad, const char *path, int adflags, ...)
{
- int ret = 0;
- int oflags;
- int mode = 0;
-
- LOG(log_debug, logtype_default, "ad_open(\"%s\", %s)",
- abspath(path), adflags2logstr(adflags));
-
- if (ad->ad_inited != AD_INITED) /* 1 */
- AFP_PANIC("ad_open: not initialized");
-
- if (ad->ad_fullpath == NULL) { /* 2 */
- if ((ad->ad_fullpath = bfromcstr(abspath(path))) == NULL) {
- ret = -1;
- goto exit;
- }
+ EC_INIT;
+ va_list args;
+ mode_t mode = 0;
+
+ LOG(log_debug, logtype_default,
+ "ad_open(\"%s\", %s): BEGIN {d: %d, m: %d, r: %d}"
+ "[dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
+ fullpathname(path), adflags2logstr(adflags),
+ ad->ad_data_refcount, ad->ad_meta_refcount, ad->ad_reso_refcount,
+ 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 (adflags & ADFLAGS_CHECK_OF)
+ /* Checking for open forks requires sharemode lock support (ie RDWR instead of RDONLY) */
+ adflags |= ADFLAGS_SETSHRMD;
+
+ 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;
}
- if ((adflags & ADFLAGS_DF) && !(ad->ad_adflags & ADFLAGS_DF)) { /* 3 */
- oflags = va_arg(args, int);
- if (oflags & O_CREAT)
- mode = va_arg(args, int);
- if (ad_open_df(path, adflags, oflags, mode, ad) != 0) {
- ret = -1;
- goto exit;
- }
- ad->ad_adflags |= ADFLAGS_DF;
+ if (ad->ad_inited != AD_INITED) {
+ ad->ad_adflags = adflags;
+ ad->ad_inited = AD_INITED;
+ } else {
+ ad->ad_open_forks = ((ad->ad_data_fork.adf_refcount > 0) ? ATTRBIT_DOPEN : 0);
+ if (ad->ad_resource_fork.adf_refcount > 0)
+ ad->ad_open_forks |= ATTRBIT_ROPEN;
}
- if ((adflags & ADFLAGS_HF) && !(ad->ad_adflags & ADFLAGS_HF)) { /* 3 */
- oflags = va_arg(args, int);
- if (oflags & O_CREAT)
- mode = va_arg(args, int);
- if (ad_open_hf(path, adflags, oflags, mode, ad) != 0) {
- ret = -1;
- goto exit;
+ va_start(args, adflags);
+ if (adflags & ADFLAGS_CREATE)
+ mode = (sizeof(mode_t) < sizeof(int) ? va_arg (args, int) : va_arg (args, mode_t));
+ va_end(args);
+
+ if (adflags & ADFLAGS_DF) {
+ ad->ad_data_refcount++;
+ if (ad_open_df(path, adflags, mode, ad) != 0) {
+ ad->ad_data_refcount--;
+ EC_FAIL;
}
- ad->ad_adflags |= ADFLAGS_HF;
}
- if ((adflags & ADFLAGS_RF) && !(ad->ad_adflags & ADFLAGS_RF)) { /* 3 */
- oflags = va_arg(args, int);
- if (oflags & O_CREAT)
- mode = va_arg(args, int);
- if (ad_open_rf(path, adflags, oflags, mode, ad) != 0) {
- ret = -1;
- goto exit;
+ if (adflags & ADFLAGS_HF) {
+ ad->ad_meta_refcount++;
+ if (ad_open_hf(path, adflags, mode, ad) != 0) {
+ ad->ad_meta_refcount--;
+ EC_FAIL;
}
- ad->ad_adflags |= ADFLAGS_RF;
}
-exit:
- if (ret != 0) {
- /* FIXME: ad_close stuff we opened before hitting an error */
- /* Dont forget ADFLAGS_NOHF !!! */
-
- if (ad->ad_fullpath) {
- bdestroy(ad->ad_fullpath);
- ad->ad_fullpath = NULL;
+ if (adflags & ADFLAGS_RF) {
+ ad->ad_reso_refcount++;
+ if (ad_open_rf(path, adflags, mode, ad) != 0) {
+ ad->ad_reso_refcount--;
+ EC_FAIL;
}
}
- return ret;
-}
-
-int ad_open(struct adouble *ad, const char *path, int adflags, ...)
-{
- int ret;
- va_list args;
+ if (adflags & ADFLAGS_CHECK_OF) {
+ ad->ad_open_forks |= ad_openforks(ad, ad->ad_open_forks);
+ }
- va_start(args, adflags);
- ret = vad_open(ad, path, adflags, args);
- va_end(args);
- return ret;
+EC_CLEANUP:
+ LOG(log_debug, logtype_default,
+ "ad_open(\"%s\"): END: %d {d: %d, m: %d, r: %d}"
+ "[dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]",
+ fullpathname(path), ret,
+ ad->ad_data_refcount, ad->ad_meta_refcount, ad->ad_reso_refcount,
+ 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;
}
/*!
*/
int ad_metadata(const char *name, int flags, struct adouble *adp)
{
- uid_t uid;
- int ret, err, dir;
+ int ret, err, oflags;
- dir = flags & ADFLAGS_DIR;
+ /* Sanitize flags */
+ oflags = (flags & (ADFLAGS_CHECK_OF | ADFLAGS_DIR)) | ADFLAGS_HF | ADFLAGS_RDONLY;
- if ((ret = ad_open(adp, name, ADFLAGS_HF | dir, O_RDONLY)) < 0 && errno == EACCES) {
- uid = geteuid();
- if (seteuid(0)) {
- LOG(log_error, logtype_default, "ad_metadata(%s): seteuid failed %s", name, strerror(errno));
- errno = EACCES;
- return -1;
- }
- /* we are root open read only */
- ret = ad_open(adp, name, ADFLAGS_HF | dir, O_RDONLY);
+ if ((ret = ad_open(adp, name, oflags)) < 0 && errno == EACCES) {
+ become_root();
+ ret = ad_open(adp, name, oflags);
+ unbecome_root();
err = errno;
- if ( seteuid(uid) < 0) {
- LOG(log_error, logtype_default, "ad_metadata: can't seteuid back");
- exit(EXITERR_SYS);
- }
errno = err;
}
- if (!ret && (ADFLAGS_CHECK_OF & flags)) {
- /*
- we need to check if the file is open by another process.
- it's slow so we only do it if we have to:
- - it's requested.
- - we don't already have the answer!
- */
- adp->ad_open_forks |= ad_openforks(adp, adp->ad_open_forks);
- }
return ret;
}
}
if (dirfd != -1) {
+
if (fchdir(cwdfd) != 0) {
LOG(log_error, logtype_afpd, "ad_openat: cant chdir back, exiting");
exit(EXITERR_SYS);
}
-int ad_refresh(struct adouble *ad)
+int ad_refresh(const char *path, struct adouble *ad)
{
+ switch (ad->ad_vers) {
+ case AD_VERSION2:
+ if (ad_meta_fileno(ad) == -1)
+ return -1;
+ return ad->ad_ops->ad_header_read(NULL, ad, NULL);
+ break;
+ case AD_VERSION_EA:
+#ifdef HAVE_EAFD
+ if (AD_META_OPEN(ad)) {
+ if (ad_data_fileno(ad) == -1)
+ return -1;
+ // TODO: read meta EA
+ }
- if (ad_meta_fileno(ad) == -1)
+ if (AD_RSRC_OPEN(ad)) {
+ if (ad_reso_fileno(ad) == -1)
+ return -1;
+ struct stat st;
+ if (fstat(ad_reso_fileno(ad), &st) == -1)
+ return -1;
+ ad->ad_rlen = st.st_size;
+ }
+#else
+ if (AD_META_OPEN(ad)) {
+ if (ad_data_fileno(ad) == -1)
+ return -1;
+ // TODO: read meta EA
+ }
+ if (AD_RSRC_OPEN(ad)) {
+ if (ad_reso_fileno(ad) == -1)
+ return -1;
+ if (ad_header_read_osx(path, ad, NULL) < 0)
+ return -1;
+ }
+#endif
+ return ad->ad_ops->ad_header_read(path, ad, NULL);
+ break;
+ default:
return -1;
+ break;
+ }
- return ad->ad_ops->ad_header_read(ad, NULL);
}
int ad_openat(struct adouble *ad,
const char *path,
int adflags, ...)
{
- int ret = 0;
+ EC_INIT;
int cwdfd = -1;
va_list args;
+ mode_t mode;
if (dirfd != -1) {
- if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0)) {
- ret = -1;
- goto exit;
- }
+ if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0))
+ EC_FAIL;
}
va_start(args, adflags);
-
- if (vad_open(ad, path, adflags, args) < 0) {
- ret = -1;
- goto exit;
- }
-
+ if (adflags & ADFLAGS_CREATE)
+ 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) );
+
if (dirfd != -1) {
if (fchdir(cwdfd) != 0) {
AFP_PANIC("ad_openat: cant chdir back");
}
}
-exit:
+EC_CLEANUP:
if (cwdfd != -1)
close(cwdfd);
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;
+}
projects / netatalk.git / blobdiff