--- libeio/eio.h	2009/06/06 17:25:13	1.19
+++ libeio/eio.h	2009/06/15 05:34:49	1.24
@@ -78,22 +78,28 @@
   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_sync_file_range flags */
@@ -137,8 +143,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 */