--- cvsroot/libeio/eio.h	2009/06/06 17:25:13	1.19
+++ cvsroot/libeio/eio.h	2010/01/07 18:08:21	1.26
@@ -1,7 +1,7 @@
 /*
  * libeio API header
  *
- * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libeio@schmorp.de>
+ * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libeio@schmorp.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modifica-
@@ -60,6 +60,10 @@
 # define EIO_STRUCT_STAT struct stat
 #endif
 
+#ifndef EIO_STRUCT_STATVFS
+# define EIO_STRUCT_STATVFS struct statvfs
+#endif
+
 /* for readdir */
 
 /* eio_readdir flags */
@@ -78,22 +82,41 @@
   EIO_DT_UNKNOWN =  0,
   EIO_DT_FIFO    =  1,
   EIO_DT_CHR     =  2,
+  EIO_DT_MPC     =  3, /* multiplexed char device (v7+coherent) */
   EIO_DT_DIR     =  4,
+  EIO_DT_NAM     =  5, /* xenix special named file */
   EIO_DT_BLK     =  6,
+  EIO_DT_MPB     =  7, /* multiplexed block device (v7+coherent) */
   EIO_DT_REG     =  8,
+  EIO_DT_NWK     =  9, /* HP-UX network special */
+  EIO_DT_CMP     =  9, /* VxFS compressed */
   EIO_DT_LNK     = 10,
+  /*  DT_SHAD    = 11,*/
   EIO_DT_SOCK    = 12,
+  EIO_DT_DOOR    = 13, /* solaris door */
   EIO_DT_WHT     = 14,
-  EIO_DT_MAX     = 15 /* highest DT_VALUE ever, hopefully */
+  EIO_DT_MAX     = 15  /* highest DT_VALUE ever, hopefully */
 };
 
 struct eio_dirent {
-  char *name;
-  ino_t inode;
-  unsigned short namelen;
-  unsigned char type;
-  unsigned char score; /* internal use */
-  /* 0-4 bytes padding */
+  int nameofs; /* offset of null-terminated name string in (char *)req->ptr2 */
+  unsigned short namelen; /* size of filename without trailing 0 */
+  unsigned char type; /* one of EIO_DT_* */
+  signed char score; /* internal use */
+  ino_t inode; /* the inode number, if available, otherwise unspecified */
+};
+
+/* eio_msync flags */
+enum {
+  EIO_MS_ASYNC      = 1,
+  EIO_MS_INVALIDATE = 2,
+  EIO_MS_SYNC       = 4
+};
+
+/* eio_mtouch flags */
+
+enum {
+  EIO_MT_MODIFY     = 1
 };
 
 /* eio_sync_file_range flags */
@@ -114,6 +137,7 @@
   EIO_READ, EIO_WRITE,
   EIO_READAHEAD, EIO_SENDFILE,
   EIO_STAT, EIO_LSTAT, EIO_FSTAT,
+  EIO_STATVFS, EIO_FSTATVFS,
   EIO_TRUNCATE, EIO_FTRUNCATE,
   EIO_UTIME, EIO_FUTIME,
   EIO_CHMOD, EIO_FCHMOD,
@@ -137,8 +161,8 @@
   ssize_t result;  /* result of syscall, e.g. result = read (... */
   off_t offs;      /* read, write, truncate, readahead, sync_file_range: file offset */
   size_t size;     /* read, write, readahead, sendfile, msync, sync_file_range: length */
-  void *ptr1;      /* all applicable requests: pathname, old name */
-  void *ptr2;      /* all applicable requests: new name or memory buffer */
+  void *ptr1;      /* all applicable requests: pathname, old name; readdir: optional eio_dirents */
+  void *ptr2;      /* all applicable requests: new name or memory buffer; readdir: name strings */
   eio_tstamp nv1;  /* utime, futime: atime; busy: sleep time */
   eio_tstamp nv2;  /* utime, futime: mtime */
 
@@ -220,6 +244,7 @@
 eio_req *eio_read      (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data);
 eio_req *eio_write     (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data);
 eio_req *eio_fstat     (int fd, int pri, eio_cb cb, void *data); /* stat buffer=ptr2 allocated dynamically */
+eio_req *eio_fstatvfs  (int fd, int pri, eio_cb cb, void *data); /* stat buffer=ptr2 allocated dynamically */
 eio_req *eio_futime    (int fd, eio_tstamp atime, eio_tstamp mtime, int pri, eio_cb cb, void *data);
 eio_req *eio_ftruncate (int fd, off_t offset, int pri, eio_cb cb, void *data);
 eio_req *eio_fchmod    (int fd, mode_t mode, int pri, eio_cb cb, void *data);
@@ -238,6 +263,7 @@
 eio_req *eio_readlink  (const char *path, int pri, eio_cb cb, void *data); /* result=ptr2 allocated dynamically */
 eio_req *eio_stat      (const char *path, int pri, eio_cb cb, void *data); /* stat buffer=ptr2 allocated dynamically */
 eio_req *eio_lstat     (const char *path, int pri, eio_cb cb, void *data); /* stat buffer=ptr2 allocated dynamically */
+eio_req *eio_statvfs   (const char *path, int pri, eio_cb cb, void *data); /* stat buffer=ptr2 allocated dynamically */
 eio_req *eio_mknod     (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data);
 eio_req *eio_link      (const char *path, const char *new_path, int pri, eio_cb cb, void *data);
 eio_req *eio_symlink   (const char *path, const char *new_path, int pri, eio_cb cb, void *data);
@@ -258,13 +284,14 @@
 /* request api */
 
 /* true if the request was cancelled, useful in the invoke callback */
-#define EIO_CANCELLED(req) ((req)->flags & EIO_FLAG_CANCELLED)
+#define EIO_CANCELLED(req)   ((req)->flags & EIO_FLAG_CANCELLED)
 
-#define EIO_RESULT(req)    ((req)->result)
+#define EIO_RESULT(req)      ((req)->result)
 /* returns a pointer to the result buffer allocated by eio */
-#define EIO_BUF(req)       ((req)->ptr2)
-#define EIO_STAT_BUF(req)  ((EIO_STRUCT_STAT *)EIO_BUF(req))
-#define EIO_PATH(req)      ((char *)(req)->ptr1)
+#define EIO_BUF(req)         ((req)->ptr2)
+#define EIO_STAT_BUF(req)    ((EIO_STRUCT_STAT    *)EIO_BUF(req))
+#define EIO_STATVFS_BUF(req) ((EIO_STRUCT_STATVFS *)EIO_BUF(req))
+#define EIO_PATH(req)        ((char *)(req)->ptr1)
 
 /* submit a request for execution */
 void eio_submit (eio_req *req);