-/*
+ /*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
*
/* version info */
#define AD_VERSION2 0x00020000
-#define AD_VERSION2_OSX 0x00020001
#define AD_VERSION_EA 0x00020002
/* default */
struct ad_fd ad_data_fork; /* the data fork */
- struct ad_fd ad_metadata_fork; /* adouble:v2 -> unused *
- * adouble:ea -> fd unused, only flags used */
-
struct ad_fd ad_resource_fork; /* adouble:v2 -> the adouble file *
* adouble:ea -> the EA fd */
* adouble:ea -> ad_resource_fork */
struct ad_fd *ad_mdp; /* adouble:v2 -> ad_resource_fork *
- * adouble:ea -> ad_metadata_fork */
+ * adouble:ea -> ad_data_fork */
int ad_vers; /* Our adouble version info (AD_VERSION*) */
int ad_adflags; /* ad_open flags adflags like ADFLAGS_DIR */
uint32_t ad_inited;
int ad_options;
int ad_refcount; /* multiple forks may open one adouble */
+ int ad_data_refcount;
+ int ad_meta_refcount;
+ int ad_reso_refcount;
off_t ad_rlen; /* ressource fork len with AFP 3.0 *
* the header parameter size is too small. */
- char *ad_name; /* name in server encoding (usually UTF8) */
+ char *ad_name; /* mac name (maccharset or UTF8-MAC) */
struct adouble_fops *ad_ops;
uint16_t ad_open_forks; /* open forks (by others) */
char ad_data[AD_DATASZ_MAX];
#define ADFLAGS_TRUNC (1<<12) /* truncate, open called with O_TRUNC */
#define ADVOL_NODEV (1 << 0)
+#define ADVOL_RO (1 << 1)
#define ADVOL_UNIXPRIV (1 << 2) /* adouble unix priv */
#define ADVOL_INVDOTS (1 << 3) /* dot files (.DS_Store) are invisible) */
+#define ADVOL_FOLLO_SYML (1 << 4)
/* lock flags */
#define ADLOCK_CLR (0)
#define ad_meta_fileno(ad) ((ad)->ad_mdp->adf_fd)
/* -1: not open, AD_SYMLINK (-2): it's a symlink */
-#define AD_DATA_OPEN(ad) ((ad)->ad_data_fork.adf_fd >= 0)
-#define AD_META_OPEN(ad) ((ad)->ad_mdp->adf_fd >= 0)
-#define AD_RSRC_OPEN(ad) ((ad)->ad_rfp->adf_fd >= 0)
+#define AD_DATA_OPEN(ad) (((ad)->ad_data_refcount) && (ad_data_fileno(ad) >= 0))
+#define AD_META_OPEN(ad) (((ad)->ad_meta_refcount) && (ad_meta_fileno(ad) >= 0))
+#define AD_RSRC_OPEN(ad) (((ad)->ad_reso_refcount) && (ad_reso_fileno(ad) >= 0))
#define ad_getversion(ad) ((ad)->ad_version)
#define ad_ref(ad) (ad)->ad_refcount++
#define ad_unref(ad) --((ad)->ad_refcount)
+#define ad_get_syml_opt(ad) (((ad)->ad_options & ADVOL_FOLLO_SYML) ? 0 : O_NOFOLLOW)
+
/* ad_flush.c */
extern int ad_rebuild_adouble_header_v2(struct adouble *);
extern int ad_rebuild_adouble_header_ea(struct adouble *);
struct vol;
extern void ad_init (struct adouble *, const struct vol * restrict);
extern void ad_init_old (struct adouble *ad, int flags, int options);
+extern int ad_init_offsets(struct adouble *ad);
extern int ad_open (struct adouble *ad, const char *path, int adflags, ...);
extern int ad_openat (struct adouble *, int dirfd, const char *path, int adflags, ...);
extern int ad_refresh (const char *path, struct adouble *);
extern int ad_metadataat (int, const char *, int, struct adouble *);
extern mode_t ad_hf_mode(mode_t mode);
extern int ad_valid_header_osx(const char *path);
+extern off_t ad_reso_size(const char *path, int adflags, struct adouble *ad);
/* ad_conv.c */
extern int ad_convert(const char *path, const struct stat *sp, const struct vol *vol, const char **newpath);
extern ssize_t adf_pread(struct ad_fd *, void *, size_t, off_t);
extern ssize_t adf_pwrite(struct ad_fd *, const void *, size_t, off_t);
extern int ad_dtruncate(struct adouble *, off_t);
-extern int ad_rtruncate(struct adouble *, off_t);
+extern int ad_rtruncate(struct adouble *, const char *, off_t);
extern int copy_fork(int eid, struct adouble *add, struct adouble *ads);
/* ad_size.c */
extern int ad_getdate(const struct adouble *, unsigned int, uint32_t *);
/* ad_attr.c */
-extern int ad_setattr(const struct adouble *, uint16_t);
+extern int ad_setattr(const struct adouble *, const uint16_t);
extern int ad_getattr(const struct adouble *, uint16_t *);
extern int ad_setname(struct adouble *, const char *);
extern int ad_setid(struct adouble *, dev_t dev, ino_t ino, uint32_t, uint32_t, const void *);
#ifdef WITH_SENDFILE
extern int ad_readfile_init(const struct adouble *ad, int eid, off_t *off, int end);
#endif
+#ifdef WITH_RECVFILE
+extern ssize_t ad_recvfile(struct adouble *ad, int eid, int sock, off_t off, size_t len, int);
+#endif
#endif /* _ATALK_ADOUBLE_H */