/*
- * $Id: adouble.h,v 1.20 2003-02-16 12:35:05 didg Exp $
+ * $Id: adouble.h,v 1.21.6.10 2004-02-20 19:56:15 didg Exp $
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
*
#endif
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
#ifdef HAVE_PREAD
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#endif
#define _XOPEN_SOURCE 500
#endif
#include <fcntl.h>
#endif
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/mman.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
#include <netatalk/endian.h>
-/* 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 /* _FILE_OFFSET_BITS != 64 */
-
-#define HAVE_SENDFILE_READ
-#define HAVE_SENDFILE_WRITE
-#include <asm/unistd.h>
-
-#ifdef __NR_sendfile
-#ifdef ATACC
-extern int sendfile __P((int , int , off_t *, size_t ));
-#else /* !ATACC */
-static __inline__ int sendfile(int fdout, int fdin, off_t *off, size_t count)
-{
- return syscall(__NR_sendfile, fdout, fdin, off, count);
-}
-#endif /* ATACC */
-
-#else /* !__NR_sendfile */
-#include <sys/sendfile.h>
-#endif /* __NR_sendfile */
-#endif /* _FILE_OFFSET_BITS */
-#endif /* SENDFILE_FLAVOR_LINUX */
-
-#ifdef SENDFILE_FLAVOR_BSD
-#define HAVE_SENDFILE_READ
-#endif
+/* version info */
+#define AD_VERSION1 0x00010000
+#define AD_VERSION2 0x00020000
+#define AD_VERSION AD_VERSION2
/*
* AppleDouble entry IDs.
#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
#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 */
#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 */
#define ADEDOFF_FILEI 541
#endif
+typedef u_int32_t cnid_t;
+
/*
* The header of the AppleDouble Header File looks like this:
*
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 void ad_init __P((struct adouble *, 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 *));
/* 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)
{
/* fnctl lock need write access */
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
+#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 *));
+#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