X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=include%2Fatalk%2Fadouble.h;h=929bf777a552fa2bd5b530f15479d28e89c2b92f;hp=f1820381ee0c31702523508e8d3b564267022421;hb=9d78f9b52ea18b442fc91c6a1e8d8b607f2f90e8;hpb=60a8d986667706e525a746815917575f732db075 diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h index f1820381..929bf777 100644 --- a/include/atalk/adouble.h +++ b/include/atalk/adouble.h @@ -1,5 +1,5 @@ /* - * $Id: adouble.h,v 1.13 2003-01-16 20:06:33 didg Exp $ + * $Id: adouble.h,v 1.21.6.20.2.8 2008-11-25 15:16:33 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,69 +41,48 @@ #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 +#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 */ - -#else -#include -#endif -#endif -#endif /* SENDFILE_FLAVOR_LINUX */ +#include -#ifdef SENDFILE_FLAVOR_BSD -#define HAVE_SENDFILE_READ -#endif +/* version info */ +#define AD_VERSION1 0x00010000 +#define AD_VERSION2 0x00020000 +#define AD_VERSION2_OSX 0x00020001 +#define AD_VERSION AD_VERSION2 /* * AppleDouble entry IDs. @@ -120,17 +103,27 @@ 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 AD_DEV 0x80444556 +#define AD_INO 0x80494E4F +#define AD_SYN 0x8053594E +#define AD_ID 0x8053567E +#define ADEID_MAX 20 +#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 /* sizes of relevant entry bits */ #define ADEDLEN_MAGIC 4 @@ -138,6 +131,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 */ @@ -156,10 +150,32 @@ 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 +/* 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 */ @@ -181,6 +197,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: * @@ -215,6 +233,7 @@ struct ad_fd { #endif int adf_flags; + int adf_excl; adf_lock_t *adf_lock; int adf_refcount, adf_lockcount, adf_lockmax; }; @@ -227,11 +246,18 @@ struct adouble { char ad_filler[ 16 ]; struct ad_entry ad_eid[ ADEID_MAX ]; struct ad_fd ad_df, ad_hf; - int ad_flags, ad_inited; + int ad_flags; + unsigned 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; + + char *(*ad_path)(const char *, int); + #ifdef USE_MMAPPED_HEADERS char *ad_data; #else @@ -244,6 +270,17 @@ struct adouble { #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_CREATE (1<<7) + +/* 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) @@ -270,8 +307,13 @@ struct adouble { #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) @@ -291,6 +333,29 @@ 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 */ @@ -310,6 +375,8 @@ struct adouble { #define ad_getoflags(ad,adf) (((adf)&ADFLAGS_HF) ? \ (ad)->ad_hf.adf_flags : (ad)->ad_df.adf_flags) +#define ad_get_HF_flags(ad) ((ad)->ad_hf.adf_flags) + /* ad_flush.c */ extern void ad_rebuild_header __P((struct adouble *)); extern int ad_flush __P((struct adouble *, int)); @@ -325,23 +392,41 @@ extern int ad_fcntl_tmplock __P((struct adouble *, const u_int32_t /*eid*/, const int /*type*/, const off_t /*offset*/, 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*/)); + #define ad_lock ad_fcntl_lock #define ad_tmplock ad_fcntl_tmplock #define ad_unlock ad_fcntl_unlock /* 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 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 *)); + +#if 0 +#define ad_metadata(name, flags, adp) ad_open(name, ADFLAGS_HF|(flags), O_RDONLY, 0666, adp) +#endif + +/* 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 -static __inline__ mode_t ad_hf_mode (mode_t mode) +static inline mode_t ad_hf_mode (mode_t mode) { + mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH); /* fnctl lock need write access */ if ((mode & S_IRUSR)) mode |= S_IWUSR; @@ -396,7 +481,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