X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fatalk%2Fadouble.h;h=3bc262190570e2ca2e582fb1aebacb4356d03ae4;hb=be4c7009bc01f39e8b256ff05045871f55df61e1;hp=95dea94e78ac72c7dd400b1beb58953dbbb37dcf;hpb=6b814c857d98259bd82737ce8746c6c1d94e9cd5;p=netatalk.git diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h index 95dea94e..3bc26219 100644 --- a/include/atalk/adouble.h +++ b/include/atalk/adouble.h @@ -1,5 +1,5 @@ /* - * $Id: adouble.h,v 1.11 2002-10-11 14:18:35 didg Exp $ + * $Id: adouble.h,v 1.32 2006-09-29 09:44:59 didg Exp $ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * @@ -25,6 +25,10 @@ #ifndef _ATALK_ADOUBLE_H #define _ATALK_ADOUBLE_H +#ifdef HAVE_CONFIG_H +#include +#endif + /* ------------------- * need pread() and pwrite() */ @@ -37,79 +41,52 @@ #endif #ifdef HAVE_PWRITE - #ifndef HAVE_PREAD #undef HAVE_PWRITE #endif - #endif -#ifdef HAVE_PREAD +/* + Still have to figure out which platforms really + need _XOPEN_SOURCE defined for pread. + */ +#if defined(HAVE_PREAD) && !defined(SOLARIS) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(TRU64) +#ifdef _XOPEN_SOURCE +#undef _XOPEN_SOURCE +#endif #define _XOPEN_SOURCE 500 #endif +#include +#include + #ifdef HAVE_UNISTD_H +#undef __USE_MISC +#define __USE_MISC #include #endif -#ifdef HAVE_FLOCK -#include -#else -#define LOCK_SH 1 -#define LOCK_EX 2 -#define LOCK_NB 4 -#define LOCK_UN 8 -extern int flock (int /*fd*/, int /*operation*/); -#endif +#include #ifdef HAVE_FCNTL_H #include #endif -#include -#include -#include #include -#include - -/* XXX: this is the wrong place to put this. - * NOTE: as of 2.2.1, linux can't do a sendfile from a socket. - * and it doesn't have 64 bits sendfile - */ -#ifdef SENDFILE_FLAVOR_LINUX - -#if _FILE_OFFSET_BITS == 64 - -#undef SENDFILE_FLAVOR_LINUX - -#else -#define HAVE_SENDFILE_READ -#define HAVE_SENDFILE_WRITE -#include - -#ifdef __NR_sendfile -#ifndef ATACC -static __inline__ int sendfile(int fdout, int fdin, off_t *off, size_t count) -{ -#if _FILE_OFFSET_BITS == 64 - return syscall(__NR_sendfile64, fdout, fdin, off, count); -#else - return syscall(__NR_sendfile, fdout, fdin, off, count); +#ifdef HAVE_SYS_TIME_H +#include #endif -} -#else -extern int sendfile __P((int , int , off_t *, size_t )); -#endif /* ATACC */ +#include -#else -#include -#endif -#endif -#endif /* SENDFILE_FLAVOR_LINUX */ +/* version info */ +#define AD_VERSION1 0x00010000 +#define SFM_VERSION AD_VERSION1 -#ifdef SENDFILE_FLAVOR_BSD -#define HAVE_SENDFILE_READ -#endif +#define AD_VERSION2 0x00020000 +#define AD_VERSION2_OSX 0x00020001 +#define AD_VERSION1_ADS 0x00010002 +#define AD_VERSION1_SFM 0x00010003 +#define AD_VERSION AD_VERSION2 /* * AppleDouble entry IDs. @@ -130,17 +107,30 @@ extern int sendfile __P((int , int , off_t *, size_t )); #define ADEID_AFPFILEI 14 /* where the rest of the FILEI info goes */ #define ADEID_DID 15 +#if AD_VERSION == AD_VERSION1 #define ADEID_MAX 16 +#else +/* netatalk private note fileid reused DID */ +#define ADEID_PRIVDEV 16 +#define ADEID_PRIVINO 17 +#define ADEID_PRIVSYN 18 /* in synch with database */ +#define ADEID_PRIVID 19 +#define ADEID_SFMRESERVE1 20 +#define ADEID_SFMRESERVE2 21 + +#define AD_DEV 0x80444556 +#define AD_INO 0x80494E4F +#define AD_SYN 0x8053594E +#define AD_ID 0x8053567E +#define ADEID_MAX 22 +#endif /* magic */ #define AD_APPLESINGLE_MAGIC 0x00051600 #define AD_APPLEDOUBLE_MAGIC 0x00051607 #define AD_MAGIC AD_APPLEDOUBLE_MAGIC -/* version info */ -#define AD_VERSION1 0x00010000 -#define AD_VERSION2 0x00020000 -#define AD_VERSION AD_VERSION1 +#define SFM_MAGIC 0x00504641 /* sizes of relevant entry bits */ #define ADEDLEN_MAGIC 4 @@ -148,6 +138,7 @@ extern int sendfile __P((int , int , off_t *, size_t )); #define ADEDLEN_FILLER 16 #define ADEDLEN_NENTRIES 2 +/* 26 */ #define AD_HEADER_LEN (ADEDLEN_MAGIC + ADEDLEN_VERSION + \ ADEDLEN_FILLER + ADEDLEN_NENTRIES) #define AD_ENTRY_LEN 12 /* size of a single entry header */ @@ -166,10 +157,36 @@ extern int sendfile __P((int , int , off_t *, size_t )); #define ADEDLEN_PRODOSFILEI 8 #define ADEDLEN_MSDOSFILEI 2 #define ADEDLEN_DID 4 +#define ADEDLEN_PRIVDEV 8 +#define ADEDLEN_PRIVINO 8 +#define ADEDLEN_PRIVSYN 8 +#define ADEDLEN_PRIVID 4 + +#define ADEID_NUM_V1 5 +#define ADEID_NUM_V2 13 + +// #define ADEID_NUM_SFM 5 +/* sizeof SFM meta data */ +#define AD_SFM_LEN 60 + +/* 589 */ +#define AD_DATASZ1 (AD_HEADER_LEN + ADEDLEN_NAME + ADEDLEN_COMMENT +ADEDLEN_FILEI +ADEDLEN_FINDERI+\ +ADEID_NUM_V1*AD_ENTRY_LEN) + +#if AD_DATASZ1 != 589 +#error bad size for AD_DATASZ1 +#endif + +#define AD_NEWSZ2 (ADEDLEN_DID + ADEDLEN_AFPFILEI +ADEDLEN_SHORTNAME +ADEDLEN_PRODOSFILEI \ ++ADEDLEN_PRIVDEV +ADEDLEN_PRIVINO +ADEDLEN_PRIVSYN+ ADEDLEN_PRIVID) + +/* 725 */ +#define AD_DATASZ2 (AD_DATASZ1 + AD_NEWSZ2 + (ADEID_NUM_V2 -ADEID_NUM_V1)*AD_ENTRY_LEN) +#if AD_DATASZ2 != 741 +#error bad size for AD_DATASZ2 +#endif -#define AD_DATASZ1 589 -#define AD_DATASZ2 665 /* v1 + 4 new entries (entry desc. + entry) */ #define AD_DATASZ_MAX 1024 #if AD_VERSION == AD_VERSION1 #define AD_DATASZ AD_DATASZ1 /* hold enough for the entries */ @@ -191,6 +208,8 @@ extern int sendfile __P((int , int , off_t *, size_t )); #define ADEDOFF_FILEI 541 #endif +typedef u_int32_t cnid_t; + /* * The header of the AppleDouble Header File looks like this: * @@ -225,23 +244,41 @@ struct ad_fd { #endif int adf_flags; + int adf_excl; adf_lock_t *adf_lock; int adf_refcount, adf_lockcount, adf_lockmax; }; +/* fork attribute */ +#define ATTRBIT_DOPEN (1<<3) /* data fork already open */ +#define ATTRBIT_ROPEN (1<<4) /* resource fork already open */ + /* some header protection */ #define AD_INITED 0xad494e54 /* ad"INT" */ +struct adouble_fops; + struct adouble { u_int32_t ad_magic; u_int32_t ad_version; char ad_filler[ 16 ]; struct ad_entry ad_eid[ ADEID_MAX ]; - struct ad_fd ad_df, ad_hf; - int ad_flags, ad_inited; + struct ad_fd ad_data_fork, ad_resource_fork, ad_metadata_fork; + struct ad_fd *ad_md; /* either ad_resource or ad_metadata */ + + int ad_flags; + unsigned int ad_inited; + int ad_options; int ad_refcount; /* used in afpd/ofork.c */ off_t ad_rlen; /* ressource fork len with AFP 3.0 the header parameter size is too small. */ + char *ad_m_name; /* mac name for open fork */ + int ad_m_namelen; + struct adouble_fops *ad_ops; + + + u_int16_t ad_open_forks; /* open forks (by others) */ + #ifdef USE_MMAPPED_HEADERS char *ad_data; #else @@ -249,11 +286,37 @@ struct adouble { #endif }; +struct adouble_fops { + char *(*ad_path)(const char *, int); + int (*ad_mkrf)(char *); + + int (*ad_rebuild_header)(struct adouble *); + int (*ad_check_header)(struct adouble *, struct stat *); + int (*ad_header_read)(struct adouble *, struct stat *); + + int (*ad_header_upgrade)(struct adouble *, char *); + +}; + #define ADFLAGS_DF (1<<0) -#define ADFLAGS_HF (1<<1) +#define ADFLAGS_HF (1<<1) #define ADFLAGS_DIR (1<<2) #define ADFLAGS_NOADOUBLE (1<<3) #define ADFLAGS_V1COMPAT (1<<4) +#define ADFLAGS_NOHF (1<<5) /* not an error if no ressource fork */ +#define ADFLAGS_RDONLY (1<<6) /* don't try readwrite */ +#define ADFLAGS_OPENFORKS (1<<7) /* check for open fork in ad_metadata function */ +#define ADFLAGS_RF (1<<8) +#define ADFLAGS_MD ADFLAGS_HF /* (1<<9) */ +#define ADFLAGS_CREATE (1<<9) + +/* adouble v2 cnid cache */ +#define ADVOL_NODEV (1 << 0) +#define ADVOL_CACHE (1 << 1) +/* adouble unix priv */ +#define ADVOL_UNIXPRIV (1 << 2) +/* dot files (.DS_Store) are invisible) */ +#define ADVOL_INVDOTS (1 << 3) /* lock flags */ #define ADLOCK_CLR (0) @@ -271,8 +334,23 @@ struct adouble { /* synchronization locks */ #define AD_FILELOCK_BASE (0x80000000) #else -#define AD_FILELOCK_BASE (0x7FFFFFFF -4) +#define AD_FILELOCK_BASE (0x7FFFFFFF -9) #endif + +/* FIXME: + * AD_FILELOCK_BASE case + */ +#if _FILE_OFFSET_BITS == 64 +#define BYTELOCK_MAX (0x7FFFFFFFFFFFFFFFULL) +#else +/* Tru64 is an always-64-bit OS; version 4.0 does not set _FILE_OFFSET_BITS */ +#if defined(TRU64) +#define BYTELOCK_MAX (0x7FFFFFFFFFFFFFFFULL) +#else +#define BYTELOCK_MAX (0x7FFFFFFFU) +#endif +#endif + #define AD_FILELOCK_OPEN_WR (AD_FILELOCK_BASE + 0) #define AD_FILELOCK_OPEN_RD (AD_FILELOCK_BASE + 1) #define AD_FILELOCK_DENY_WR (AD_FILELOCK_BASE + 2) @@ -291,14 +369,39 @@ struct adouble { #define AD_DATE_DELTA 946684800 #define AD_DATE_FROM_UNIX(x) htonl((x) - AD_DATE_DELTA) #define AD_DATE_TO_UNIX(x) (ntohl(x) + AD_DATE_DELTA) + +/* various finder offset and info bits */ +#define FINDERINFO_FRTYPEOFF 0 +#define FINDERINFO_FRCREATOFF 4 + +#define FINDERINFO_FRFLAGOFF 8 +/* finderinfo flags */ +#define FINDERINFO_ISONDESK (1) +#define FINDERINFO_COLOR (0x0e) +#define FINDERINFO_ISHARED (1<<6) +#define FINDERINFO_HASNOINITS (1<<7) +#define FINDERINFO_HASBEENINITED (1<<8) +#define FINDERINFO_HASCUSTOMICON (1<<10) +#define FINDERINFO_ISSTATIONNERY (1<<11) +#define FINDERINFO_NAMELOCKED (1<<12) +#define FINDERINFO_HASBUNDLE (1<<13) +#define FINDERINFO_INVISIBLE (1<<14) +#define FINDERINFO_ISALIAS (1<<15) + +#define FINDERINFO_FRVIEWOFF 14 +#define FINDERINFO_CUSTOMICON 0x4 +#define FINDERINFO_CLOSEDVIEW 0x100 + /* private AFPFileInfo bits */ #define AD_AFPFILEI_OWNER (1 << 0) /* any owner */ #define AD_AFPFILEI_GROUP (1 << 1) /* ignore group */ #define AD_AFPFILEI_BLANKACCESS (1 << 2) /* blank access permissions */ -#define ad_dfileno(ad) ((ad)->ad_df.adf_fd) -#define ad_hfileno(ad) ((ad)->ad_hf.adf_fd) +#define ad_data_fileno(ad) ((ad)->ad_data_fork.adf_fd) +#define ad_reso_fileno(ad) ((ad)->ad_resource_fork.adf_fd) +#define ad_meta_fileno(ad) ((ad)->ad_md->adf_fd) + #define ad_getversion(ad) ((ad)->ad_version) #define ad_getentrylen(ad,eid) ((ad)->ad_eid[(eid)].ade_len) @@ -307,54 +410,70 @@ struct adouble { #define ad_getentryoff(ad,eid) ((ad)->ad_eid[(eid)].ade_off) #define ad_entry(ad,eid) ((caddr_t)(ad)->ad_data + \ (ad)->ad_eid[(eid)].ade_off) -#define ad_getoflags(ad,adf) (((adf)&ADFLAGS_HF) ? \ - (ad)->ad_hf.adf_flags : (ad)->ad_df.adf_flags) -/* ad_flush.c */ -extern void ad_rebuild_header __P((struct adouble *)); -extern int ad_flush __P((struct adouble *, int)); +#define ad_get_HF_flags(ad) ((ad)->ad_resource_fork.adf_flags) +#define ad_get_MD_flags(ad) ((ad)->ad_md->adf_flags) + +/* ad_flush.c + +*/ +extern int ad_rebuild_adouble_header __P((struct adouble *)); +extern int ad_rebuild_sfm_header __P((struct adouble *)); + +extern int ad_flush __P((struct adouble *)); extern int ad_close __P((struct adouble *, int)); /* ad_lock.c */ -extern int ad_flock_lock __P((struct adouble *, const u_int32_t /*eid*/, - const int /*type*/, const off_t /*offset*/, - const size_t /*len*/, const int /*user*/)); extern int ad_fcntl_lock __P((struct adouble *, const u_int32_t /*eid*/, const int /*type*/, const off_t /*offset*/, - const size_t /*len*/, const int /*user*/)); + const off_t /*len*/, const int /*user*/)); extern void ad_fcntl_unlock __P((struct adouble *, const int /*user*/)); -extern int ad_flock_tmplock __P((struct adouble *, const u_int32_t /*eid*/, - const int /*type*/, const off_t /*offset*/, - const size_t /*len*/)); extern int ad_fcntl_tmplock __P((struct adouble *, const u_int32_t /*eid*/, const int /*type*/, const off_t /*offset*/, - const size_t /*len*/)); + const off_t /*len*/, const int /*user*/)); + +extern int ad_testlock __P((struct adouble * /*adp*/, int /*eid*/, off_t /*off*/)); +extern int ad_excl_lock __P((struct adouble * /*adp*/, const u_int32_t /*eid*/)); -#ifdef USE_FLOCK_LOCKS -#define ad_lock ad_flock_lock -#define ad_tmplock ad_flock_tmplock -#define ad_unlock(a,b) -#else #define ad_lock ad_fcntl_lock #define ad_tmplock ad_fcntl_tmplock #define ad_unlock ad_fcntl_unlock -#endif /* ad_open.c */ -extern char *ad_dir __P((const char *)); -extern char *ad_path __P((const char *, int)); -extern int ad_mode __P((const char *, int)); -extern int ad_mkdir __P((const char *, int)); -extern int ad_open __P((const char *, int, int, int, struct adouble *)); -extern int ad_refresh __P((struct adouble *)); - -/* extend header to RW if R or W (W if R for locking), +extern int ad_setfuid __P((const uid_t )); +extern uid_t ad_getfuid __P((void )); + +extern char *ad_dir __P((const char *)); +extern char *ad_path __P((const char *, int)); +extern char *ad_path_osx __P((const char *, int)); +extern char *ad_path_ads __P((const char *, int)); +extern char *ad_path_sfm __P((const char *, int)); + +extern int ad_mode __P((const char *, int)); +extern int ad_mkdir __P((const char *, int)); +extern void ad_init __P((struct adouble *, int, int )); + +extern int ad_open __P((const char *, int, int, int, struct adouble *)); +extern int ad_refresh __P((struct adouble *)); +extern int ad_stat __P((const char *, struct stat *)); +extern int ad_metadata __P((const char *, int, struct adouble *)); + +#define ad_open_metadata(name, flags, mode, adp)\ + ad_open(name, ADFLAGS_MD|(flags), O_RDWR |(mode), 0666, (adp)) + +#define ad_close_metadata(adp) ad_close( (adp), ADFLAGS_MD) + +/* 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), */ #ifndef ATACC +#ifndef __inline__ +#define __inline__ +#endif static __inline__ mode_t ad_hf_mode (mode_t mode) { -#ifndef USE_FLOCK_LOCKS + mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH); /* fnctl lock need write access */ if ((mode & S_IRUSR)) mode |= S_IWUSR; @@ -362,7 +481,7 @@ static __inline__ mode_t ad_hf_mode (mode_t mode) mode |= S_IWGRP; if ((mode & S_IROTH)) mode |= S_IWOTH; -#endif + /* if write mode set add read mode */ if ((mode & S_IWUSR)) mode |= S_IRUSR; @@ -388,8 +507,8 @@ extern ssize_t ad_write __P((struct adouble *, const u_int32_t, off_t, extern ssize_t adf_pread __P((struct ad_fd *, void *, size_t, off_t)); extern ssize_t adf_pwrite __P((struct ad_fd *, const void *, size_t, off_t)); -extern int ad_dtruncate __P((struct adouble *, const size_t)); -extern int ad_rtruncate __P((struct adouble *, const size_t)); +extern int ad_dtruncate __P((struct adouble *, const off_t)); +extern int ad_rtruncate __P((struct adouble *, const off_t)); /* ad_size.c */ extern off_t ad_size __P((const struct adouble *, const u_int32_t )); @@ -409,7 +528,15 @@ extern int ad_getdate __P((const struct adouble *, unsigned int, u_int32_t *)); extern int ad_setattr __P((const struct adouble *, const u_int16_t)); extern int ad_getattr __P((const struct adouble *, u_int16_t *)); -#ifdef HAVE_SENDFILE_READ +extern int ad_setname __P((struct adouble *, const char *)); +#if AD_VERSION == AD_VERSION2 +extern int ad_setid __P((struct adouble *, const dev_t dev,const ino_t ino, const u_int32_t, const u_int32_t, const void *)); +extern u_int32_t ad_getid __P((struct adouble *, const dev_t, const ino_t, const cnid_t, const void *)); +#else +#define ad_setid(a, b, c) +#endif + +#ifdef WITH_SENDFILE extern ssize_t ad_readfile __P((const struct adouble *, const int, const int, off_t, const size_t)); #endif