X-Git-Url: https://arthur.barton.de/gitweb/?p=netatalk.git;a=blobdiff_plain;f=include%2Fatalk%2Fadouble.h;h=1881ba028240c0ff5f74edbd162e3d3083e6e5ae;hp=f95279d7aa7779ada385ea7642799aad682b832e;hb=8784106fd01519896f06d88d985d9420bf1c3c17;hpb=e00467826a7ea8dd706d0728191b13894d25618d diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h index f95279d7..1881ba02 100644 --- a/include/atalk/adouble.h +++ b/include/atalk/adouble.h @@ -1,4 +1,4 @@ -/* + /* * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * @@ -49,7 +49,6 @@ /* version info */ #define AD_VERSION2 0x00020000 -#define AD_VERSION2_OSX 0x00020001 #define AD_VERSION_EA 0x00020002 /* default */ @@ -155,6 +154,9 @@ #define ADEDOFF_FINDERI_OSX (AD_HEADER_LEN + ADEID_NUM_OSX*AD_ENTRY_LEN) #define ADEDOFF_RFORK_OSX (ADEDOFF_FINDERI_OSX + ADEDLEN_FINDERI) +/* special fd value used to indicate an open fork file is a (not open) symlink */ +#define AD_SYMLINK -2 + typedef uint32_t cnid_t; struct ad_entry { @@ -169,7 +171,7 @@ typedef struct adf_lock_t { } adf_lock_t; struct ad_fd { - int adf_fd; /* -1: invalid, -2: symlink */ + int adf_fd; /* -1: invalid, AD_SYMLINK: symlink */ char *adf_syml; int adf_flags; adf_lock_t *adf_lock; @@ -198,9 +200,6 @@ struct adouble { 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 */ @@ -208,16 +207,19 @@ struct adouble { * 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]; @@ -243,8 +245,10 @@ struct adouble { #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) @@ -348,10 +352,10 @@ struct adouble { #define ad_reso_fileno(ad) ((ad)->ad_rfp->adf_fd) #define ad_meta_fileno(ad) ((ad)->ad_mdp->adf_fd) -/* -1 means not open, -2 is 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) +/* -1: not open, AD_SYMLINK (-2): it's a symlink */ +#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) @@ -367,9 +371,12 @@ struct adouble { #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 *); +extern int ad_rebuild_adouble_header_osx(struct adouble *ad, char *adbuf); extern int ad_copy_header (struct adouble *, struct adouble *); extern int ad_flush (struct adouble *); extern int ad_close (struct adouble *, int); @@ -396,6 +403,7 @@ extern int ad_mkdir (const char *, mode_t); 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 *); @@ -404,6 +412,7 @@ extern int ad_metadata (const char *, int, 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); @@ -416,7 +425,7 @@ extern ssize_t ad_write(struct adouble *, uint32_t, off_t, int, const char *, si 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 */ @@ -432,7 +441,7 @@ extern int ad_setdate(struct adouble *, unsigned int, uint32_t); 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 *); @@ -442,5 +451,8 @@ extern uint32_t ad_forcegetid(struct adouble *adp); #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 */