/*!
* @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 <sys/param.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
+#include <arpa/inet.h>
#include <atalk/logger.h>
#include <atalk/adouble.h>
#include <atalk/util.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_private.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
-
-/*
- * AppleDouble entry default offsets.
- * The layout looks like this:
- *
- * this is the v1 layout:
- * 255 200 16 32 N
- * | NAME | COMMENT | FILEI | FINDERI | RFORK |
- *
- * we need to change it to look like this:
- *
- * v2 layout:
- * field length (in bytes)
- * NAME 255
- * COMMENT 200
- * FILEDATESI 16 replaces FILEI
- * FINDERI 32
- * DID 4 new
- * AFPFILEI 4 new
- * SHORTNAME 12 8.3 new
- * RFORK N
- *
- * so, all we need to do is replace FILEI with FILEDATESI, move RFORK,
- * and add in the new fields.
- */
+#include "ad_lock.h"
#define ADEDOFF_MAGIC (0)
#define ADEDOFF_VERSION (ADEDOFF_MAGIC + ADEDLEN_MAGIC)
/* initial lengths of some of the fields */
#define ADEDLEN_INIT 0
-/* make sure we don't redefine ADEDOFF_FILEI */
-#ifdef ADEDOFF_FILEI
-#undef ADEDOFF_FILEI
-#endif /* ADEDOFF_FILEI */
-
/* i stick things in a slightly different order than their eid order in
* case i ever want to separate RootInfo behaviour from the rest of the
* stuff. */
static uid_t default_uid = -1;
/* Forward declarations */
-static int ad_mkrf(char *path);
-static int ad_header_read(struct adouble *ad, struct stat *hst);
-static int ad_header_upgrade(struct adouble *ad, char *name);
+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_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_upgrade_ea(struct adouble *ad, const char *name);
+
+
+static const char *ad_path_osx(const char *path, int adflags);
+static int ad_mkrf_osx(const char *path);
-static int ad_mkrf_ea(char *path);
-static int ad_header_read_ea(struct adouble *ad, struct stat *hst);
-static int ad_header_upgrade_ea(struct adouble *ad, char *name);
static struct adouble_fops ad_adouble = {
&ad_path,
};
static struct adouble_fops ad_adouble_ea = {
+#ifdef HAVE_EAFD
&ad_path_ea,
&ad_mkrf_ea,
+#else
+ &ad_path_osx,
+ &ad_mkrf_osx,
+#endif
&ad_rebuild_adouble_header,
&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_PRIVID, ADEDOFF_PRIVID, ADEDLEN_INIT},
{0, 0, 0}
};
-uint32_t adv2_disk_eid[] = {
- 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
- AD_DEV, AD_INO, AD_SYN, AD_ID
+/* fallback for EAs */
+static const struct entry entry_order_osx[ADEID_NUM_OSX +1] = {
+ {ADEID_FINDERI, ADEDOFF_FINDERI_OSX, ADEDLEN_FINDERI},
+ {ADEID_RFORK, ADEDOFF_RFORK_OSX, 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_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_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;
+}
+
+static uint32_t get_eid(uint32_t eid)
+{
+ if (eid <= 15)
+ return eid;
+ if (eid == AD_DEV)
+ return ADEID_PRIVDEV;
+ if (eid == AD_INO)
+ return ADEID_PRIVINO;
+ if (eid == AD_SYN)
+ return ADEID_PRIVSYN;
+ if (eid == AD_ID)
+ return ADEID_PRIVID;
+
+ return 0;
+}
+
/* ----------------------------------- */
-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 (stp == NULL) {
+ stp = &st;
+ if (lstat(path, &st) != 0)
+ return -1;
+ }
+
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_filler, 0, sizeof( ad->ad_filler ));
+
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 if (ad->ad_vers == AD_VERSION2_OSX)
+ eid = entry_order_osx;
else {
return -1;
}
}
/* put something sane in the directory finderinfo */
- if ((adflags & ADFLAGS_DIR)) {
- /* set default view */
- ashort = htons(FINDERINFO_CLOSEDVIEW);
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort));
- } else {
- /* set default creator/type fields */
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4);
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4);
- }
-
- /* make things invisible */
- if ((ad->ad_options & ADVOL_INVDOTS) && (*path == '.')) {
- ashort = htons(ATTRBIT_INVISIBLE);
- ad_setattr(ad, ashort);
- ashort = htons(FINDERINFO_INVISIBLE);
- memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort));
- }
+ if (ad->ad_vers != AD_VERSION2_OSX) {
+ if ((adflags & ADFLAGS_DIR)) {
+ /* set default view */
+ ashort = htons(FINDERINFO_CLOSEDVIEW);
+ memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort));
+ } else {
+ /* set default creator/type fields */
+ memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4);
+ memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4);
+ }
- if (lstat(path, &st) < 0)
- return -1;
+ /* make things invisible */
+ if ((ad->ad_options & ADVOL_INVDOTS) && (*path == '.')) {
+ ashort = htons(ATTRBIT_INVISIBLE);
+ ad_setattr(ad, ashort);
+ ashort = htons(FINDERINFO_INVISIBLE);
+ memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort));
+ }
- /* 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_BACKUP, AD_DATE_START);
+ /* put something sane in the date fields */
+ 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;
}
/* now, read in the entry bits */
for (; nentries > 0; nentries-- ) {
memcpy(&eid, buf, sizeof( eid ));
- eid = DISK_EID(ntohl( eid ));
+ eid = get_eid(ntohl(eid));
buf += sizeof( eid );
memcpy(&off, buf, sizeof( off ));
off = ntohl( off );
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, 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_DATASZ, 0)) < 0) {
return -1;
}
if (header_len < AD_HEADER_LEN) {
memcpy(&ad->ad_magic, buf, sizeof( ad->ad_magic ));
memcpy(&ad->ad_version, buf + ADEDOFF_VERSION, sizeof( ad->ad_version ));
+ ad->ad_magic = ntohl( ad->ad_magic );
+ ad->ad_version = ntohl( ad->ad_version );
if ((ad->ad_magic != AD_MAGIC) || (ad->ad_version != AD_VERSION2)) {
LOG(log_error, logtype_default, "ad_open: can't parse AppleDouble header.");
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 */
}
}
+
ad->ad_rlen = hst->st_size - ad_getentryoff(ad, ADEID_RFORK);
return 0;
}
-static int ad_header_read_ea(struct adouble *ad, struct stat *hst _U_)
+/* 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)
+{
+ 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, 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_fgetxattr(ad->ad_md->adf_fd, AD_EA_META, ad->ad_data, AD_DATASZ_EA)) < 0) {
- LOG(log_error, logtype_default, "ad_open: can't parse AppleDouble header.");
- errno = EIO;
+ if ((ad_meta_fileno(ad) == -1)
+ && (ad->ad_adflags & ADFLAGS_RDWR)) {
+ LOG(log_error, logtype_default, "ad_header_read_ea: need filedescriptor for rw access");
return -1;
}
+
+ 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;
+ }
+
if (header_len < AD_HEADER_LEN) {
- LOG(log_error, logtype_default, "ad_open: can't parse AppleDouble header.");
+ LOG(log_error, logtype_default, "ad_header_read_ea: bogus AppleDouble header.");
errno = EIO;
return -1;
}
ad->ad_magic = ntohl( ad->ad_magic );
ad->ad_version = ntohl( ad->ad_version );
- if ((ad->ad_magic != AD_MAGIC) || (ad->ad_version != AD_VERSION_EA)) {
- LOG(log_error, logtype_default, "ad_open: can't parse AppleDouble header.");
+ if ((ad->ad_magic != AD_MAGIC) || (ad->ad_version != AD_VERSION2)) {
+ LOG(log_error, logtype_default, "ad_header_read_ea: wrong magic or version");
errno = EIO;
return -1;
}
if (len + AD_HEADER_LEN > sizeof(ad->ad_data))
len = sizeof(ad->ad_data) - AD_HEADER_LEN;
if (len > header_len - AD_HEADER_LEN) {
- LOG(log_error, logtype_default, "ad_header_read: can't read entry info.");
+ LOG(log_error, logtype_default, "ad_header_read_ea: can't read entry info.");
errno = EIO;
return -1;
}
/* Now parse entries */
parse_entries(ad, buf + AD_HEADER_LEN, nentries);
+
return 0;
}
-static int ad_mkrf(char *path)
+/*!
+ * 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_ea(char *path _U_)
+static int ad_mkrf_ea(const char *path _U_)
{
AFP_PANIC("ad_mkrf_ea: dont use");
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;
return 0;
}
-/* ----------------- */
+/* --------------------------- */
+static int ad_header_upgrade(struct adouble *ad _U_, const char *name _U_)
+{
+ return 0;
+}
+
+static int ad_header_upgrade_ea(struct adouble *ad _U_, const char *name _U_)
+{
+ AFP_PANIC("ad_header_upgrade_ea: dont use");
+ return 0;
+}
+
+/*!
+ * Error handling for adouble header(=metadata) file open error
+ *
+ * We're called because opening ADFLAGS_HF caused an error.
+ * 1. In case ad_open is called with ADFLAGS_NOHF the error is suppressed.
+ * 2. If ad_open was called with ADFLAGS_DF we may have opened the datafork and thus
+ * ought to close it before returning with an error condition.
+ */
static int ad_error(struct adouble *ad, int adflags)
{
int err = errno;
- if ((adflags & ADFLAGS_NOHF)) {
- /* FIXME double check : set header offset ?*/
+ if (adflags & ADFLAGS_NOHF) { /* 1 */
+ ad->ad_adflags &= ~ADFLAGS_HF;
return 0;
}
- if ((adflags & ADFLAGS_DF)) {
+ if (adflags & ADFLAGS_DF) { /* 2 */
ad_close( ad, ADFLAGS_DF );
err = errno;
}
return -1 ;
}
-/* --------------------------- */
-static int ad_header_upgrade(struct adouble *ad _U_, char *name _U_)
-{
- return 0;
-}
-
-static int ad_header_upgrade_ea(struct adouble *ad _U_, char *name _U_)
+/* Map ADFLAGS to open() flags */
+static int ad2openflags(int adflags)
{
- AFP_PANIC("ad_header_upgrade_ea: dont use");
- return 0;
+ int oflags = 0;
+
+ if (adflags & ADFLAGS_RDWR)
+ oflags |= O_RDWR;
+ if (adflags & ADFLAGS_RDONLY) {
+ if (adflags & ADFLAGS_SETSHRMD)
+ 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, int oflags, int mode, struct adouble *ad)
+static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble *ad)
{
struct stat st_dir;
- int hoflags, admode;
+ int oflags;
+ mode_t admode;
int st_invalid = -1;
-
- 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\", %04o)",
+ fullpathname(path), mode);
+
+ 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++;
+ return 0;
+ }
- ad->ad_data_fork.adf_fd = open(path, hoflags | O_NOFOLLOW, admode);
+ oflags = O_NOFOLLOW | ad2openflags(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;
+ admode = mode;
+ if ((adflags & ADFLAGS_CREATE)) {
+ st_invalid = ad_mode_st(path, &admode, &st_dir);
+ if ((ad->ad_options & ADVOL_UNIXPRIV))
+ admode = mode;
+ }
- 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);
+ ad->ad_data_fork.adf_fd = open(path, oflags, admode);
+
+ 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;
+ if ((ad->ad_data_fork.adf_fd = open(path, oflags, admode)) == -1)
return -1;
- }
- ad->ad_data_fork.adf_syml[lsz] = 0;
- ad->ad_data_fork.adf_fd = -2; /* -2 means its a symlink */
+ break;
}
- }
-
- if ( ad->ad_data_fork.adf_fd == -1 )
return -1;
-
- 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);
- }
- adf_lock_init(&ad->ad_data_fork);
- } 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;
+ 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);
+ return -1;
+ }
+ ad->ad_data_fork.adf_syml[lsz] = 0;
+ ad->ad_data_fork.adf_fd = -2; /* -2 means its a symlink */
+ break;
+ default:
return -1;
}
- /* 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.
- */
}
+
+ 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++;
return 0;
}
-static int ad_open_hf_v2(const char *path, int adflags, int oflags, int mode, struct adouble *ad)
+/* TODO: error handling */
+static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adouble *ad)
{
struct stat st_dir;
struct stat st_meta;
struct stat *pst = NULL;
- char *ad_p;
- int hoflags, admode;
+ const char *ad_p;
+ int oflags, nocreatflags;
+ mode_t admode;
int st_invalid = -1;
- ad_p = ad->ad_ops->ad_path( path, adflags );
-
- hoflags = oflags & ~(O_CREAT | O_EXCL);
- if (!(adflags & ADFLAGS_RDONLY)) {
- hoflags = (hoflags & ~(O_RDONLY | O_WRONLY)) | O_RDWR;
- }
- ad->ad_md->adf_fd = open( ad_p, hoflags | O_NOFOLLOW, 0 );
- if (ad->ad_md->adf_fd < 0 ) {
- if ((errno == EACCES || errno == EROFS) && !(oflags & O_RDWR)) {
- hoflags = oflags & ~(O_CREAT | O_EXCL);
- ad->ad_md->adf_fd = open( ad_p, hoflags | O_NOFOLLOW, 0 );
+ 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;
}
+ 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;
}
- if ( ad->ad_md->adf_fd < 0 ) {
- if (errno == ENOENT && (oflags & O_CREAT) ) {
+ ad_p = ad->ad_ops->ad_path(path, adflags);
+ oflags = O_NOFOLLOW | ad2openflags(adflags);
+ nocreatflags = oflags & ~(O_CREAT | O_EXCL);
+
+ ad->ad_mdp->adf_fd = open(ad_p, nocreatflags);
+
+ if (ad->ad_mdp->adf_fd != -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;
+ if ((ad->ad_mdp->adf_fd = open(ad_p, nocreatflags)) == -1)
+ return -1;
+ ad->ad_mdp->adf_flags = nocreatflags;
+ break;
+ }
+ return -1;
+ case ENOENT:
+ if (!(oflags & O_CREAT))
+ return ad_error(ad, adflags);
/*
* 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/%s\"): creating adouble file",
- getcwdpath(), ad_p);
+ LOG(log_debug, logtype_default, "ad_open(\"%s\"): creating adouble file",
+ 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 ((errno == ENOENT) && (ad->ad_vers != AD_VERSION2_OSX)) {
if (ad->ad_ops->ad_mkrf( ad_p) < 0) {
return ad_error(ad, adflags);
}
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 ) {
+ ad->ad_mdp->adf_fd = open(ad_p, oflags, admode);
+ if ( ad->ad_mdp->adf_fd < 0 )
return ad_error(ad, adflags);
- }
- ad->ad_md->adf_flags = oflags;
+
+ 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:
+ return -1;
}
- } 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;
+ }
+
+ 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);
- if ((ad->ad_md->adf_flags & ( O_TRUNC | O_CREAT ))) {
+ adf_lock_init(ad->ad_mdp);
+ ad->ad_mdp->adf_refcount = 1;
+
+ 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) {
+ 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);
ad_flush(ad);
} else {
/* Read the adouble header in and parse it.*/
- if (ad->ad_ops->ad_header_read( ad , pst) < 0
+ 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 );
+ ad_close(ad, adflags);
errno = err;
return -1;
}
return 0;
}
-static int ad_open_hf_ea(const char *path, int adflags, int oflags, int mode, struct adouble *ad)
+/* TODO: error handling */
+static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble *ad)
{
- int hoflags;
ssize_t rforklen;
+ int oflags;
- hoflags = (oflags & ~(O_CREAT | O_EXCL)) | O_NOFOLLOW;
- if ((ad->ad_md->adf_fd = open(path, hoflags)) == -1)
- return -1;
+ LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\", %s, %04o)",
+ path, adflags2logstr(adflags), mode);
+
+ oflags = O_NOFOLLOW | (ad2openflags(adflags) & ~(O_CREAT | O_TRUNC));
+
+ 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)) {
+ LOG(log_error, logtype_default, "ad_open_hf_ea(%s): rw request for ro file: %s",
+ fullpathname(path), strerror(errno));
+ errno = EACCES;
+ return -1;
+ }
+ /* it's not new anymore */
+ ad->ad_mdp->adf_flags &= ~( O_TRUNC | O_CREAT );
+ ad->ad_mdp->adf_refcount++;
+ } else {
+ if (adflags & ADFLAGS_RDWR) {
+ /* Fo a RDONLY adouble we just use sys_lgetxattr instead if sys_fgetxattr */
+ LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): opening for base file for meta adouble EA", path);
+ if ((ad_meta_fileno(ad) = open(path, oflags)) == -1)
+ goto error;
+ ad->ad_mdp->adf_flags = oflags;
+ }
+ ad->ad_mdp->adf_refcount = 1;
+ }
/* Read the adouble header in and parse it.*/
- if (ad->ad_ops->ad_header_read(ad, NULL) != 0) {
+ if (ad->ad_ops->ad_header_read(path, ad, NULL) != 0) {
+ LOG(log_error, logtype_default, "ad_open_hf_ea: no EA adouble");
+
+ if (!(adflags & ADFLAGS_CREATE))
+ goto error;
+
+ LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): creating metadata EA", path);
+
/* It doesnt exist, EPERM or another error */
- if (errno != ENOENT)
- return -1;
+ if (!(errno == ENOATTR || errno == ENOENT)) {
+ LOG(log_error, logtype_default, "ad_open_hf_ea: unexpected: %s", strerror(errno));
+ goto error;
+ }
/* Create one */
- if (new_ad_header(path, ad, adflags) < 0) {
- int err = errno;
- /* the file is already deleted, perm, whatever, so return an error */
- ad_close(ad, adflags);
- errno = err;
- return -1;
+ if (new_ad_header(ad, path, NULL, adflags) < 0) {
+ LOG(log_error, logtype_default, "ad_open_hf_ea: can't create new header: %s",
+ fullpathname(path));
+ goto error;
}
+ 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", path);
}
- if ((rforklen = sys_lgetxattr(path, AD_EA_RESO, NULL, 0)) < 0) {
- rforklen = 0;
- }
+ /* TODO: ad_rlen calculation */
+ ad->ad_rlen = 0;
- ad->ad_rlen = rforklen;
return 0;
+
+error:
+ if (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);
}
-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;
- if (ad_meta_fileno(ad) != -1) { /* the file is already open */
- if ((oflags & ( O_RDWR | O_WRONLY))
- && !(ad->ad_md->adf_flags & ( O_RDWR | O_WRONLY))) {
- if ((adflags & ADFLAGS_HF) && ad->ad_data_fork.adf_refcount)
- /* We just have openend the df, so we have to close it now */
- ad_close(ad, ADFLAGS_DF);
- errno = EACCES;
- return -1;
- }
- ad_refresh(ad);
- /* it's not new anymore */
- ad->ad_md->adf_flags &= ~( O_TRUNC | O_CREAT );
- ad->ad_md->adf_refcount++;
- return 0;
- }
+ LOG(log_debug, logtype_default, "ad_open_hf(\"%s\", %04o)", path, mode);
memset(ad->ad_eid, 0, sizeof( ad->ad_eid ));
ad->ad_rlen = 0;
- switch (ad->ad_version) {
+ 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;
}
- ad->ad_md->adf_refcount = 1;
- adf_lock_init(ad->ad_md);
-
+ if (ret != 0) {
+ return ad_error(ad, adflags);
+ }
return ret;
}
-static int ad_open_rf(const char *path, int adflags, int oflags, int mode, struct adouble *ad)
+
+/*!
+ * 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)
{
- return 0;
+ EC_INIT;
+ int oflags;
+ int closeflags = adflags & (ADFLAGS_DF | ADFLAGS_HF);
+ ssize_t rlen;
+#ifndef HAVE_EAFD
+ const char *rfpath;
+ struct stat st;
+#endif
+
+ if (ad->ad_vers != AD_VERSION_EA)
+ return 0;
+
+ LOG(log_debug, logtype_default, "ad_open_rf(\"%s\", %04o)", path, mode);
+
+ oflags = O_NOFOLLOW | (ad2openflags(adflags) & ~O_CREAT);
+
+ if (ad_reso_fileno(ad) != -1) {
+ /* the file is already open, but we want write access: */
+ if ((adflags & ADFLAGS_RDWR)
+ /* and it was already denied: */
+ && (ad->ad_rfp->adf_flags & O_RDONLY)) {
+ errno = EACCES;
+ return -1;
+ }
+ ad->ad_rfp->adf_flags &= ~( O_TRUNC | O_CREAT );
+ ad->ad_rfp->adf_refcount++;
+ return 0;
+ }
+#ifdef HAVE_EAFD
+ if ((ad_reso_fileno(ad) = sys_getxattrfd(path, oflags)) == -1) {
+ if (!(adflags & ADFLAGS_CREATE))
+ EC_FAIL;
+ oflags |= O_CREAT;
+ EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(path, 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
+
+ ad->ad_rfp->adf_refcount = 1;
+ ad->ad_rfp->adf_flags = oflags;
+
+#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, rfpath, &st, 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
+
+EC_CLEANUP:
+ if (ret != 0) {
+ if (ad_reso_fileno(ad) != -1) {
+ close(ad_reso_fileno(ad));
+ ad_reso_fileno(ad) = -1;
+ ad->ad_rfp->adf_refcount = 0;
+ }
+ int err = errno;
+ (void)ad_close(ad, closeflags);
+ errno = err;
+ ad->ad_rlen = 0;
+ }
+
+ LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): END", path);
+
+ EC_EXIT;
}
/***********************************************************************************
* API functions
********************************************************************************* */
-char *ad_path_ea( const char *path, int adflags _U_)
+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:
*
*
* FIXME: should do something for pathname > MAXPATHLEN
*/
-char *ad_path( const char *path, int adflags)
+const char *ad_path( const char *path, int adflags)
{
static char pathbuf[ MAXPATHLEN + 1];
const char *slash;
/* ----------------
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)
{
- ad->ad_inited = 0;
- ad->ad_flags = flags;
- 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_options = options;
ad_data_fileno(ad) = -1;
ad_reso_fileno(ad) = -1;
ad_meta_fileno(ad) = -1;
+ ad->ad_refcount = 1;
+ return;
+}
- /* following can be read even if there's no meda data. */
- memset(ad->ad_eid, 0, sizeof( ad->ad_eid ));
- ad->ad_rlen = 0;
+void ad_init_old(struct adouble *ad, int flags, int options)
+{
+ memset(ad, 0, sizeof(struct adouble));
+ ad->ad_vers = flags;
+ ad->ad_options = options;
+ ad_init_func(ad);
+}
+
+void ad_init(struct adouble *ad, const struct vol * restrict vol)
+{
+ 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;
* ad_init(&ad, vol->v_adouble, vol->v_ad_options);
* @endcode
*
- * @param path Path to file or directory
+ * Open a files data fork, metadata fork or ressource fork.
+ *
+ * @param ad (rw) pointer to struct adouble
+ * @param path (r) Path to file or directory
+ * @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 created
+ * ADFLAGS_DIR: if path is a directory you MUST or ADFLAGS_DIR to adflags
*
- * @param adflags 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_NOADOUBLE: dont create adouble files if not necessary \n
- * ADFLAGS_RDONLY: open read only \n
- * ADFLAGS_OPENFORKS: check for open forks from other processes
+ * Access mode for the forks:
+ * ADFLAGS_RDONLY: open read only
+ * ADFLAGS_RDWR: open read write
*
- * @param oflags flags passed through to open syscall: \n
- * O_RDONLY: *** FIXME *** \n
- * O_RDWR: *** FIXME *** \n
- * O_CREAT: create fork \n
- * O_EXCL: fail if exists with O_CREAT
+ * Creation flags:
+ * ADFLAGS_CREATE: create if not existing
+ * ADFLAGS_TRUNC: truncate
*
- * @param mode passed to open with O_CREAT
- * @param ad pointer to struct adouble
+ * 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
*
- * @returns 0 on success
+ * 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
*
- * @note It's not possible to open the header file O_RDONLY -- the read
- * will fail and return an error. this refcounts things now.\n
- * metadata(ressource)-fork only gets created with O_CREAT.
+ * @returns 0 on success, any other value indicates an error
*/
-int ad_open(const char *path, int adflags, int oflags, int mode, struct adouble *ad)
+int ad_open(struct adouble *ad, const char *path, int adflags, ...)
{
+ EC_INIT;
+ va_list args;
+ mode_t mode = 0;
+
+ LOG(log_debug, logtype_default, "ad_open(\"%s\", %s)",
+ fullpathname(path), adflags2logstr(adflags));
+
+ if (adflags & ADFLAGS_CHECK_OF)
+ /* Checking for open forks requires sharemode lock support (ie RDWR instead of RDONLY) */
+ adflags |= ADFLAGS_SETSHRMD;
+
+ if ((ad->ad_vers == AD_VERSION_EA) && (adflags & ADFLAGS_SETSHRMD))
+ /* adouble:ea sets sharemode locks on the datafork */
+ adflags |= ADFLAGS_DF;
+
if (ad->ad_inited != AD_INITED) {
- ad->ad_inited = AD_INITED;
- ad->ad_refcount = 1;
- ad->ad_open_forks = 0;
ad->ad_adflags = adflags;
- ad->ad_resource_fork.adf_refcount = 0;
- ad->ad_data_fork.adf_refcount = 0;
- ad->ad_data_fork.adf_syml = 0;
+ ad->ad_inited = AD_INITED;
} else {
ad->ad_open_forks = ((ad->ad_data_fork.adf_refcount > 0) ? ATTRBIT_DOPEN : 0);
- /* XXX not true if we have a meta data fork ? */
- if ((ad->ad_resource_fork.adf_refcount > ad->ad_data_fork.adf_refcount))
+ if (ad->ad_resource_fork.adf_refcount > 0)
ad->ad_open_forks |= ATTRBIT_ROPEN;
}
- if ((adflags & ADFLAGS_DF)) {
- if (ad_open_df(path, adflags, oflags, mode, ad) != 0)
- return -1;
+ va_start(args, adflags);
+ if (adflags & ADFLAGS_CREATE)
+ mode = va_arg(args, mode_t);
+ va_end(args);
+
+ if (adflags & ADFLAGS_DF) {
+ EC_ZERO( ad_open_df(path, adflags, mode, ad) );
+ ad->ad_adflags |= ADFLAGS_DF;
}
- if ((adflags & ADFLAGS_HF)) {
- if (ad_open_hf(path, adflags, oflags, mode, ad) != 0)
- return -1;
+ if (adflags & ADFLAGS_HF) {
+ EC_ZERO( ad_open_hf(path, adflags, mode, ad) );
+ ad->ad_adflags |= ADFLAGS_HF;
}
- if ((adflags & ADFLAGS_RF)) {
- if (ad_open_rf(path, adflags, oflags, mode, ad) != 0)
- return -1;
+ if (adflags & ADFLAGS_RF) {
+ EC_ZERO( ad_open_rf(path, adflags, mode, ad) );
+ ad->ad_adflags |= ADFLAGS_RF;
}
- return 0;
+ if (adflags & ADFLAGS_CHECK_OF) {
+ ad->ad_open_forks |= ad_openforks(ad, ad->ad_open_forks);
+ }
+
+EC_CLEANUP:
+ return ret;
}
/*!
*
* @param name name of file/dir
* @param flags ADFLAGS_DIR: name is a directory \n
- * ADFLAGS_CREATE: force creation of header file, but only as user, not as root\n
- * ADFLAGS_OPENFORKS: test if name is open by another afpd process
+ * ADFLAGS_CHECK_OF: test if name is open by us or another afpd process
*
* @param adp pointer to struct adouble
- *
- * @note caller MUST pass ADFLAGS_DIR for directories. Whether ADFLAGS_CREATE really creates
- * a adouble file depends on various other volume options, eg. ADVOL_CACHE
*/
int ad_metadata(const char *name, int flags, struct adouble *adp)
{
uid_t uid;
- int ret, err, dir;
- int create = O_RDONLY;
+ int ret, err, oflags;
- dir = flags & ADFLAGS_DIR;
+ /* Sanitize flags */
+ oflags = (flags & (ADFLAGS_CHECK_OF | ADFLAGS_DIR)) | ADFLAGS_HF | ADFLAGS_RDONLY;
- /* Check if we shall call ad_open with O_CREAT */
- if ( (adp->ad_options & ADVOL_CACHE)
- && ! (adp->ad_options & ADVOL_NOADOUBLE)
- && (flags & ADFLAGS_CREATE) ) {
- create = O_CREAT | O_RDWR;
- }
- if ((ret = ad_open(name, ADFLAGS_HF | dir, create, 0666, adp)) < 0 && errno == EACCES) {
+ if ((ret = ad_open(adp, name, oflags)) < 0 && errno == EACCES) {
uid = geteuid();
if (seteuid(0)) {
LOG(log_error, logtype_default, "ad_metadata(%s): seteuid failed %s", name, strerror(errno));
return -1;
}
/* we are root open read only */
- ret = ad_open(name, ADFLAGS_HF|ADFLAGS_RDONLY| dir, O_RDONLY, 0, adp);
+ ret = ad_open(adp, name, oflags);
err = errno;
if ( seteuid(uid) < 0) {
LOG(log_error, logtype_default, "ad_metadata: can't seteuid back");
errno = err;
}
- if (!ret && (ADFLAGS_OPENFORKS & 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;
}
}
-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;
+ ssize_t len;
+ if ((len = fstat(ad_reso_fileno(ad))) == -1)
+ return -1;
+ ad->ad_rlen = len;
+ }
+#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(int dirfd, /* dir fd openat like */
+int ad_openat(struct adouble *ad,
+ int dirfd, /* dir fd openat like */
const char *path,
- int adflags,
- int oflags,
- int mode,
- struct adouble *ad)
+ 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;
}
- if (ad_open(path, adflags, oflags, mode, ad) < 0) {
- ret = -1;
- goto exit;
- }
+ va_start(args, adflags);
+ if (adflags & ADFLAGS_CREATE)
+ mode = va_arg(args, mode_t);
+ va_end(args);
+
+ EC_NEG1( ad_open(ad, path, adflags, mode) );
if (dirfd != -1) {
if (fchdir(cwdfd) != 0) {
- LOG(log_error, logtype_afpd, "ad_openat: cant chdir back, exiting");
- exit(EXITERR_SYS);
+ AFP_PANIC("ad_openat: cant chdir back");
}
}
-exit:
+EC_CLEANUP:
if (cwdfd != -1)
close(cwdfd);
projects / netatalk.git / blobdiff