/*!
* @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/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"
#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)
static uid_t default_uid = -1;
/* Forward declarations */
-static int ad_mkrf(char *path);
+static int ad_mkrf(const 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_header_upgrade(struct adouble *ad, const char *name);
-static int ad_mkrf_ea(char *path);
+static int ad_mkrf_ea(const 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 int ad_header_upgrade_ea(struct adouble *ad, const char *name);
static struct adouble_fops ad_adouble = {
&ad_path,
{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)
static int new_ad_header(const char *path, struct adouble *ad, int adflags)
{
const struct entry *eid;
- u_int16_t ashort;
+ uint16_t ashort;
struct stat st;
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 {
return -1;
static int ad_header_read(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, sizeof(ad->ad_data), 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 */
}
}
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) {
+ if ((header_len = sys_fgetxattr(ad_data_fileno(ad), AD_EA_META, ad->ad_data, AD_DATASZ_EA)) < 1) {
LOG(log_debug, logtype_default, "ad_header_read_ea: %s (%u)", strerror(errno), errno);
return -1;
}
/* Now parse entries */
parse_entries(ad, buf + AD_HEADER_LEN, nentries);
+
+ return 0;
+}
+
+static int ad_rsrc_len_ea(struct adouble *ad)
+{
+ ssize_t rlen;
+
+ if ((rlen = sys_fgetxattr(ad_data_fileno(ad), AD_EA_RESO, NULL, 0)) <= 0) {
+ switch (errno) {
+ case ENOATTR:
+ case ENOENT:
+ ad->ad_rlen = 0;
+ break;
+ default:
+ LOG(log_error, logtype_default, "ad_refresh_rsrc_len_ea: %s", strerror(errno));
+ ad->ad_rlen = 0;
+ return -1;
+ }
+ }
+ ad->ad_rlen = rlen;
return 0;
}
-static int ad_mkrf(char *path)
+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;
/* ----------------
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_header_upgrade(struct adouble *ad _U_, char *name _U_)
+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_, char *name _U_)
+static int ad_header_upgrade_ea(struct adouble *ad _U_, const char *name _U_)
{
AFP_PANIC("ad_header_upgrade_ea: dont use");
return 0;
}
-static int ad_open_df(const char *path, int adflags, int oflags, int mode, struct adouble *ad)
+/*!
+ * 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) { /* 1 */
+ ad->ad_adflags &= ~ADFLAGS_HF;
+ return 0;
+ }
+ if (adflags & ADFLAGS_DF) { /* 2 */
+ ad_close( ad, ADFLAGS_DF );
+ err = errno;
+ }
+ return -1 ;
+}
+
+/* Map ADFLAGS to open() flags */
+static int ad2openflags(int adflags)
+{
+ int oflags = 0;
+
+ if (adflags & ADFLAGS_RDWR)
+ oflags |= O_RDWR;
+ if ((adflags & ADFLAGS_RDONLY) && (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, mode_t mode, struct adouble *ad)
{
struct stat st_dir;
- int hoflags, admode;
+ int oflags;
+ mode_t admode;
int st_invalid = -1;
+ ssize_t lsz;
- LOG(log_maxdebug, logtype_default, "ad_open_df(\"%s/%s\", adf: 0x%04x, of: 0x%04x)",
- getcwdpath(), path, adflags, oflags);
+ LOG(log_debug, logtype_default, "ad_open_df(\"%s\", %04o)",
+ fullpathname(path), 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;
+ 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_mdp->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);
- }
- } 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)
+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(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) {
if (ad->ad_ops->ad_mkrf( ad_p) < 0) {
- return -1;
+ 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 ) {
- return -1;
- }
- ad->ad_md->adf_flags = oflags;
+ ad->ad_mdp->adf_fd = open(ad_p, oflags, admode);
+ if ( ad->ad_mdp->adf_fd < 0 )
+ return ad_error(ad, adflags);
+
+ 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 {
+ 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 ))) {
+ ad->ad_mdp->adf_refcount = 1;
+ adf_lock_init(ad->ad_mdp);
+
+ 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 */
+ ad_close(ad, adflags);
errno = err;
return -1;
}
if (ad->ad_ops->ad_header_read( ad , pst) < 0
|| ad->ad_ops->ad_header_upgrade(ad, ad_p) < 0) {
int err = errno;
+ 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)
+static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble *ad)
{
ssize_t rforklen;
- int ret;
+ int oflags = O_NOFOLLOW;
- LOG(log_maxdebug, logtype_default, "ad_open_hf_ea(\"%s\", adf: 0x%04x, of: 0x%04x)",
- abspath(path), adflags, oflags);
+ LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\", %04o)", path, mode);
- if ((ad->ad_md->adf_fd = open(path, O_RDONLY | O_NOFOLLOW)) == -1)
- return -1;
+ oflags |= ad2openflags(adflags) & ~(O_CREAT | O_TRUNC);
+
+ if (ad_data_fileno(ad) != -1) {
+ /* the file is already open, but we want write access: */
+ if ((adflags & ADFLAGS_RDWR) &&
+ /* and it was already denied: */
+ (ad->ad_data_fork.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 );
+ } else {
+ if ((ad_data_fileno(ad) = open(path, oflags)) == -1)
+ goto error;
+ ad->ad_data_fork.adf_flags = oflags;
+ adf_lock_init(&ad->ad_data_fork);
+ }
/* Read the adouble header in and parse it.*/
if (ad->ad_ops->ad_header_read(ad, NULL) != 0) {
- if (!(oflags & O_CREAT))
- return -1;
+ if (!(adflags & ADFLAGS_CREATE))
+ goto error;
/* 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));
- ret = -1;
goto error;
}
/* 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));
- ret = -1;
+ 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);
}
- ad->ad_md->adf_flags = O_RDWR; /* Pretend its rw, in fact for the EA API it is */
+ ad->ad_data_fork.adf_refcount++;
- if ((rforklen = sys_lgetxattr(cfrombstr(ad->ad_fullpath), AD_EA_RESO, NULL, 0)) > 0)
+ if ((rforklen = sys_fgetxattr(ad_data_fileno(ad), AD_EA_RESO, NULL, 0)) > 0)
ad->ad_rlen = rforklen;
return 0;
error:
- return ret;
+ if (ad_data_fileno(ad) != -1) {
+ close(ad_data_fileno(ad));
+ ad_data_fileno(ad) = -1;
+ }
+ 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;
- LOG(log_maxdebug, logtype_default, "ad_open_hf(\"%s/%s\", adf: 0x%04x, of: 0x%04x)",
- getcwdpath(), path, adflags, oflags);
+ 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_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;
return ret;
}
+
/*!
- * Open EA with resfork, only for AD_VERSION_EA, a nullop otherwise
+ * 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 oflags, int mode, struct adouble *ad)
+static int ad_open_rf(const char *path, int adflags, int mode, struct adouble *ad)
{
int ret = 0;
+ int oflags;
+ ssize_t rlen;
- if (ad->ad_flags != AD_VERSION_EA)
+ if (ad->ad_vers != AD_VERSION_EA)
return 0;
- LOG(log_debug, logtype_default, "ad_open_rf(\"%s\", adf: 0x%04x, of: 0x%04x)",
- abspath(path), adflags, oflags);
+ LOG(log_debug, logtype_default, "ad_open_rf(\"%s\", %04o)", path, mode);
- 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;
+ oflags |= ad2openflags(adflags) & ~(O_CREAT | O_TRUNC);
+
+ if (ad_data_fileno(ad) != -1) {
+ /* the file is already open, but we want write access: */
+ if ((adflags & ADFLAGS_RDWR) &&
+ /* and it was already denied: */
+ (ad->ad_data_fork.adf_flags & O_RDONLY)) {
+ LOG(log_error, logtype_default, "ad_open_rf(%s): rw request for ro file: %s",
+ fullpathname(path), strerror(errno));
+ errno = EACCES;
+ return -1;
}
+ } else {
+ if ((ad_data_fileno(ad) = open(path, oflags)) == -1)
+ goto exit;
+ ad->ad_data_fork.adf_flags = oflags;
+ adf_lock_init(&ad->ad_data_fork);
}
- /* 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;
+ if ((ret = ad_rsrc_len_ea(ad)) != 0)
goto exit;
- }
- ad->ad_resforkbufsize = roundup;
-
- /* 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;
- }
- }
+ ad->ad_data_fork.adf_refcount++;
exit:
- if (ret != 0) {
- free(ad->ad_resforkbuf);
- ad->ad_resforkbuf = NULL;
- ad->ad_rlen = 0;
- ad->ad_resforkbufsize = 0;
- }
-
return ret;
}
* 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;
}
*
* 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)
{
- 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_resource_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;
+ memset(ad->ad_eid, 0, sizeof( ad->ad_eid ));
+ ad->ad_rlen = 0;
+ ad->ad_refcount = 1;
+ ad->ad_open_forks = 0;
+ ad->ad_resource_fork.adf_refcount = 0;
+ ad->ad_resforkbuf = NULL;
+ ad->ad_data_fork.adf_refcount = 0;
+ ad->ad_data_fork.adf_syml = 0;
+ ad->ad_inited = 0;
+ return;
}
-static 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_RDONLY) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "RDONLY", 64);
- first = 0;
- }
- if (adflags & ADFLAGS_OPENFORKS) {
- if (!first)
- strlcat(buf, "|", 64);
- strlcat(buf, "OF", 64);
- first = 0;
- }
- return buf;
+ ad->ad_vers = flags;
+ ad->ad_options = options;
+ ad_init_func(ad);
}
-static 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;
+ ad->ad_vers = vol->v_adouble;
+ ad->ad_options = vol->v_ad_options;
+// ad->ad_maxeafssize = 3500; /* FIXME: option from vol */
+ ad->ad_maxeafssize = 0; /* no limit */
+ 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
- *
- * @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_RDONLY: open read only \n
- * ADFLAGS_OPENFORKS: check for open forks from other processes
- *
- * @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
+ * Open a files data fork, metadata fork or ressource fork.
*
- * @param mode passed to open with O_CREAT
- * @param ad pointer to 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
+ * 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
+ * - a file may be opened first ro, then rw and theres no way to upgrade this -> fork.c always opens rw
+ * ADFLAGS_CHECK_OF: check for open forks from us and other afpd's
+ * @param mode (r) mode used with O_CREATE
*
- * @returns 0 on success
- *
- * @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, ...)
{
- int ret = 0;
-
- LOG(log_debug, logtype_default, "ad_open(\"%s\", %s, %s, 0%04o)",
- abspath(path), adflags2logstr(adflags), oflags2logstr(oflags), mode);
+ EC_INIT;
+ va_list args;
+ mode_t mode = 0;
- if (ad->ad_inited != AD_INITED)
- AFP_PANIC("ad_open: not initialized");
+ LOG(log_debug, logtype_default, "ad_open(\"%s\", %s)",
+ fullpathname(path), adflags2logstr(adflags));
- if (ad->ad_fullpath == NULL) {
- if ((ad->ad_fullpath = bfromcstr(abspath(path))) == NULL) {
- ret = -1;
- goto exit;
- }
+ 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;
}
- ad->ad_refcount++;
-
- if ((adflags & ADFLAGS_DF)) {
- if (ad_open_df(path, adflags, oflags, mode, ad) != 0) {
- ret = -1;
- goto exit;
- }
- ad->ad_adflags |= ADFLAGS_DF;
- }
+ va_start(args, adflags);
+ if (adflags & ADFLAGS_CREATE)
+ mode = va_arg(args, mode_t);
+ va_end(args);
- if ((adflags & ADFLAGS_HF)) {
- if (ad_open_hf(path, adflags, oflags, mode, ad) != 0) {
- ret = -1;
- goto exit;
- }
- ad->ad_adflags |= ADFLAGS_HF;
+ if (adflags & ADFLAGS_DF) {
+ EC_ZERO( ad_open_df(path, adflags, mode, ad) );
}
- if ((adflags & ADFLAGS_RF)) {
- if (ad_open_rf(path, adflags, oflags, mode, ad) != 0) {
- ret = -1;
- goto exit;
- }
- ad->ad_adflags |= ADFLAGS_RF;
+ if (adflags & ADFLAGS_HF) {
+ EC_ZERO( ad_open_hf(path, adflags, mode, ad) );
}
-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) {
+ EC_ZERO( ad_open_rf(path, adflags, mode, ad) );
}
+EC_CLEANUP:
return ret;
}
* @brief open metadata, possibly as root
*
* Return only metadata but try very hard ie at first try as user, then try as root.
- * Caller must pass ADFLAGS_DIR for directories.
*
* @param name name of file/dir
* @param flags ADFLAGS_DIR: name is a directory \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
*/
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;
+ oflags = (flags & ADFLAGS_DIR) | ADFLAGS_HF | ADFLAGS_RDONLY;
- if ((ret = ad_open(name, ADFLAGS_HF | dir, create, 0666, adp)) < 0 && errno == EACCES) {
+ if ((ret = ad_open(adp, name, oflags | ADFLAGS_SETSHRMD)) < 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)) {
+ if ((ret == 0) && (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:
int ad_refresh(struct adouble *ad)
{
-
- if (ad_meta_fileno(ad) == -1)
+ switch (ad->ad_vers) {
+ case AD_VERSION2:
+ if (ad_meta_fileno(ad) == -1)
+ return -1;
+ return ad->ad_ops->ad_header_read(ad, NULL);
+ break;
+ case AD_VERSION_EA:
+ if (ad_data_fileno(ad) == -1)
+ return -1;
+ if (ad_rsrc_len_ea(ad) != 0)
+ return -1;
+ return ad->ad_ops->ad_header_read(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