1999-06-23 Roland McGrath <roland@baalperazim.frob.com>

	* sysdeps/mach/hurd/read.c (__libc_read): Just call __pread with
	OFFSET argument of (off_t) -1.
	* sysdeps/mach/hurd/write.c (__libc_write): Just call __pwrite with
	OFFSET argument of (off_t) -1.

	* sysdeps/mach/hurd/pwrite.c: New file.
	* sysdeps/mach/hurd/pread.c: New file.

	* hurd/fd-read.c (_hurd_fd_read): Take new parameter OFFSET and
	pass it in the RPC instead of always -1.
	* hurd/fd-write.c (_hurd_fd_write): Likewise.
	* hurd/hurd/fd.h: Update decls.

3 files changed, 13 insertions, 10 deletions

diff --git a/hurd/fd-read.c b/hurd/fd-read.c
index 8bfc03a..d78cf5c 100644
--- a/hurd/fd-read.c
+++ b/hurd/fd-read.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993,94,95,97,99 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
 #include <string.h>
 
 error_t
-_hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes)
+_hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes, off_t offset)
 {
   error_t err;
   char *data;
@@ -31,7 +31,7 @@ _hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes)
 
   error_t readfd (io_t port)
     {
-      return __io_read (port, &data, &nread, -1, *nbytes);
+      return __io_read (port, &data, &nread, offset, *nbytes);
     }
 
   data = buf;
diff --git a/hurd/fd-write.c b/hurd/fd-write.c
index 288ce6b..0af5829 100644
--- a/hurd/fd-write.c
+++ b/hurd/fd-write.c
@@ -1,5 +1,5 @@
 /* _hurd_fd_write -- write to a file descriptor; handles job control et al.
-   Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1993,94,95,97,99 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,14 +23,15 @@
 #include <hurd/fd.h>
 
 error_t
-_hurd_fd_write (struct hurd_fd *fd, const void *buf, size_t *nbytes)
+_hurd_fd_write (struct hurd_fd *fd,
+		const void *buf, size_t *nbytes, off_t offset)
 {
   error_t err;
   mach_msg_type_number_t wrote;
 
   error_t writefd (io_t port)
     {
-      return __io_write (port, buf, *nbytes, -1, &wrote);
+      return __io_write (port, buf, *nbytes, offset, &wrote);
     }
 
   err = HURD_FD_PORT_USE (fd, _hurd_ctty_output (port, ctty, writefd));
diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h
index aa48f21..7e5a978 100644
--- a/hurd/hurd/fd.h
+++ b/hurd/hurd/fd.h
@@ -1,5 +1,5 @@
 /* File descriptors.
-   Copyright (C) 1993,94,95,96,97,98 Free Software Foundation, Inc.
+   Copyright (C) 1993,94,95,96,97,98, 99 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -208,12 +208,14 @@ extern struct hurd_fd *_hurd_new_fd (io_t port, io_t ctty);
 
 extern error_t _hurd_fd_close (struct hurd_fd *fd);
 
-/* Read and write data from a file descriptor; just like `read' and `write'.
+/* Read and write data from a file descriptor; just like `read' and `write'
+   if OFFSET is -1, or like `pread' and `pwrite' if OFFSET is not -1.
    If successful, stores the amount actually read or written in *NBYTES.  */
 
-extern error_t _hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes);
+extern error_t _hurd_fd_read (struct hurd_fd *fd,
+			      void *buf, size_t *nbytes, off_t offset);
 extern error_t _hurd_fd_write (struct hurd_fd *fd,
-			       const void *buf, size_t *nbytes);
+			       const void *buf, size_t *nbytes, off_t offset);
 
 
 /* Call *RPC on PORT and/or CTTY; if a call on CTTY returns EBACKGROUND,