--- libaitsched/src/tasks.c	2012/08/02 11:37:08	1.10.2.7
+++ libaitsched/src/tasks.c	2012/08/02 12:19:29	1.10.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: tasks.c,v 1.10.2.7 2012/08/02 11:37:08 misho Exp $
+* $Id: tasks.c,v 1.10.2.8 2012/08/02 12:19:29 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -546,20 +546,28 @@ schedAIO(sched_root_task_t * __restrict root, sched_ta
  * @fd = file descriptor
  * @buffer = Buffer
  * @buflen = Buffer length
+ * @offset = Offset from start of file, if =-1 from current position
  * return: NULL error or !=NULL new queued task
  */
 inline sched_task_t *
 schedAIORead(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
-		void *buffer, size_t buflen)
+		void *buffer, size_t buflen, off_t offset)
 {
 	struct aiocb *acb;
-	off_t off = 0;
+	off_t off;
 
 	if (!root || !func || !buffer || !buflen)
 		return NULL;
-	else
-		memset(buffer, 0, buflen);
 
+	if (offset == (off_t) -1) {
+		off = lseek(fd, 0, SEEK_CUR);
+		if (off == -1) {
+			LOGERR;
+			return NULL;
+		}
+	} else
+		off = offset;
+
 	if (!(acb = malloc(sizeof(struct aiocb)))) {
 		LOGERR;
 		return NULL;
@@ -569,13 +577,7 @@ schedAIORead(sched_root_task_t * __restrict root, sche
 	acb->aio_fildes = fd;
 	acb->aio_nbytes = buflen;
 	acb->aio_buf = buffer;
-	off = lseek(fd, 0, SEEK_CUR);
-	if (off == -1) {
-		LOGERR;
-		free(acb);
-		return NULL;
-	} else
-		acb->aio_offset = off;
+	acb->aio_offset = off;
 	acb->aio_sigevent.sigev_notify = SIGEV_KEVENT;
 	acb->aio_sigevent.sigev_notify_kqueue = root->root_kq;
 	acb->aio_sigevent.sigev_value.sival_ptr = acb;
@@ -598,18 +600,28 @@ schedAIORead(sched_root_task_t * __restrict root, sche
  * @fd = file descriptor
  * @buffer = Buffer
  * @buflen = Buffer length
+ * @offset = Offset from start of file, if =-1 from current position
  * return: NULL error or !=NULL new queued task
  */
 inline sched_task_t *
 schedAIOWrite(sched_root_task_t * __restrict root, sched_task_func_t func, void *arg, int fd, 
-		void *buffer, size_t buflen)
+		void *buffer, size_t buflen, off_t offset)
 {
 	struct aiocb *acb;
-	off_t off = 0;
+	off_t off;
 
 	if (!root || !func || !buffer || !buflen)
 		return NULL;
 
+	if (offset == (off_t) -1) {
+		off = lseek(fd, 0, SEEK_CUR);
+		if (off == -1) {
+			LOGERR;
+			return NULL;
+		}
+	} else
+		off = offset;
+
 	if (!(acb = malloc(sizeof(struct aiocb)))) {
 		LOGERR;
 		return NULL;
@@ -619,13 +631,7 @@ schedAIOWrite(sched_root_task_t * __restrict root, sch
 	acb->aio_fildes = fd;
 	acb->aio_nbytes = buflen;
 	acb->aio_buf = buffer;
-	off = lseek(fd, 0, SEEK_CUR);
-	if (off == -1) {
-		LOGERR;
-		free(acb);
-		return NULL;
-	} else
-		acb->aio_offset = off;
+	acb->aio_offset = off;
 	acb->aio_sigevent.sigev_notify = SIGEV_KEVENT;
 	acb->aio_sigevent.sigev_notify_kqueue = root->root_kq;
 	acb->aio_sigevent.sigev_value.sival_ptr = acb;