--- libeio/eio.h	2008/05/11 19:11:05	1.5
+++ libeio/eio.h	2008/05/12 00:31:43	1.6
@@ -12,6 +12,10 @@
 # define EIO_COMMON void *data
 #endif
 
+#ifndef EIO_STRUCT_STAT
+# define EIO_STRUCT_STAT struct stat
+#endif
+
 enum {
   EIO_QUIT,
   EIO_OPEN, EIO_CLOSE, EIO_DUP2,
@@ -110,11 +114,15 @@
 /*****************************************************************************/
 /* high-level request API */
 
+eio_req *eio_nop       (eio_cb cb); /* does nothing except go through the whole process */
+eio_req *eio_busy      (eio_tstamp delay, eio_cb cb); /* ties a thread for this long, simulating busyness */
+eio_req *eio_sync      (eio_cb cb);
 eio_req *eio_fsync     (int fd, eio_cb cb);
 eio_req *eio_fdatasync (int fd, eio_cb cb);
+eio_req *eio_close     (int fd, eio_cb cb);
 eio_req *eio_readahead (int fd, off_t offset, size_t length, eio_cb cb);
-eio_req *eio_read      (int fd, off_t offset, size_t length, void *data, eio_cb cb);
-eio_req *eio_write     (int fd, off_t offset, size_t length, void *data, eio_cb cb);
+eio_req *eio_read      (int fd, void *data, size_t length, off_t offset, eio_cb cb);
+eio_req *eio_write     (int fd, void *data, size_t length, off_t offset, eio_cb cb);
 eio_req *eio_fstat     (int fd, eio_cb cb); /* stat buffer=ptr2 allocated dynamically */
 eio_req *eio_futime    (int fd, eio_tstamp atime, eio_tstamp mtime, eio_cb cb);
 eio_req *eio_ftruncate (int fd, off_t offset, eio_cb cb);
@@ -123,20 +131,21 @@
 eio_req *eio_dup2      (int fd, int fd2, eio_cb cb);
 eio_req *eio_sendfile  (int out_fd, int in_fd, off_t in_offset, size_t length, eio_cb cb);
 eio_req *eio_open      (const char *path, int flags, mode_t mode, eio_cb cb);
-eio_req *eio_readlink  (const char *path, eio_cb cb); /* result=ptr2 allocated dynamically */
-eio_req *eio_stat      (const char *path, eio_cb cb); /* stat buffer=ptr2 allocated dynamically */
-eio_req *eio_lstat     (const char *path, eio_cb cb); /* stat buffer=ptr2 allocated dynamically */
 eio_req *eio_utime     (const char *path, eio_tstamp atime, eio_tstamp mtime, eio_cb cb);
 eio_req *eio_truncate  (const char *path, off_t offset, eio_cb cb);
 eio_req *eio_chown     (const char *path, uid_t uid, gid_t gid, eio_cb cb);
 eio_req *eio_chmod     (const char *path, mode_t mode, eio_cb cb);
 eio_req *eio_mkdir     (const char *path, mode_t mode, eio_cb cb);
-eio_req *eio_unlink    (const char *path, eio_cb cb);
-eio_req *eio_rmdir     (const char *path, eio_cb cb);
 eio_req *eio_readdir   (const char *path, eio_cb cb); /* result=ptr2 allocated dynamically */
+eio_req *eio_rmdir     (const char *path, eio_cb cb);
+eio_req *eio_unlink    (const char *path, eio_cb cb);
+eio_req *eio_readlink  (const char *path, eio_cb cb); /* result=ptr2 allocated dynamically */
+eio_req *eio_stat      (const char *path, eio_cb cb); /* stat buffer=ptr2 allocated dynamically */
+eio_req *eio_lstat     (const char *path, eio_cb cb); /* stat buffer=ptr2 allocated dynamically */
 eio_req *eio_mknod     (const char *path, mode_t mode, dev_t dev, eio_cb cb);
-eio_req *eio_busy      (eio_tstamp delay, eio_cb cb); /* ties a thread for this long, simulating busyness */
-eio_req *eio_nop       (eio_cb cb); /* does nothing except go through the whole process */
+eio_req *eio_link      (const char *path, const char *new_path, eio_cb cb);
+eio_req *eio_symlink   (const char *path, const char *new_path, eio_cb cb);
+eio_req *eio_rename    (const char *path, const char *new_path, eio_cb cb);
 
 /* for groups */
 eio_req *eio_grp       (eio_cb cb);
@@ -145,6 +154,20 @@
 void eio_grp_add       (eio_req *grp, eio_req *req);
 void eio_grp_cancel    (eio_req *grp); /* cancels all sub requests but not the group */
 
+/* cancel a request as soon fast as possible */
+void eio_cancel (eio_req *req);
+/* destroy a request that has never been submitted */
+void eio_destroy (eio_req *req);
+
+/* true if the request was cancelled, useful in the invoke callback */
+#define EIO_CANCELLED(req) ((req)->flags & EIO_FLAG_CANCELLED)
+
+#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)
+
 /*****************************************************************************/
 /* low-level request API */
 
@@ -155,20 +178,13 @@
   (req)->finish  = (finish_cb);		\
   (req)->destroy = (destroy_cb)
 
-/* true if the request was cancelled, useful in the invoke callback */
-#define EIO_CANCELLED(req) ((req)->flags & EIO_FLAG_CANCELLED)
-
 /* submit a request for execution */
 void eio_submit (eio_req *req);
-/* cancel a request as soon fast as possible */
-void eio_cancel (eio_req *req);
-/* destroy a request that has never been submitted */
-void eio_destroy (eio_req *req);
 
 /*****************************************************************************/
 /* convinience functions */
 
-/*ssize_t eio_sendfile (int ofd, int ifd, off_t offset, size_t count)*/
+ssize_t eio_sendfile_sync (int ofd, int ifd, off_t offset, size_t count);
 
 #endif