2002-06-08 Roland McGrath <roland@frob.com>

	* hurd_types.defs (loff_t, ino64_t): New types, 64 bits.
	(off_t): Type removed.
	(off_array_t): Use loff_t instead of off_t as base type.
	* hurd_types.h (off_array_t): Likewise.
	[_FILE_OFFSET_BITS != 64] (io_statbuf_t, fsys_statfsbuf_t): Define
	using struct stat64/statfs64 instead of struct stat/statfs.
	* io.defs (io_identity): Use ino64_t for FILENO.
	* fs.defs (file_set_size): off_t -> loff_t
	* fs_notify.defs (file_changed): Likewise.
	* io.defs (io_write, io_read, io_seek): Likewise.
	* io_request.defs: Likewise for those RPCs' *_request variants.
	* io_reply.defs: Likewise for those RPCs' *_reply variants.
	* hurd_types.defs (size_t): Remove type.
	* fs.defs (dir_readdir): Use vm_size_t for AMOUNT.
	* socket.defs (socket_send, socket_recv): Likewise.
	* pfinet.defs (pfinet_siocgifconf): Likewise.
	* io.defs (io_write, io_read, io_readable): Likewise.
	* io_request.defs: Likewise for those RPCs' *_request variants.
	* io_reply.defs: Likewise for those RPCs' *_reply variants.

5 files changed, 25 insertions, 29 deletions

diff --git a/hurd/fs.defs b/hurd/fs.defs
index eed5f8ab..30156481 100644
--- a/hurd/fs.defs
+++ b/hurd/fs.defs
@@ -1,5 +1,5 @@
 /* Definitions for the filesystem interface.
-   Copyright (C) 1994,95,96,97,98,99, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994,95,96,97,98,99,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -108,7 +108,7 @@ routine file_utimes (
 routine file_set_size (
 	trunc_file: file_t;
 	RPT
-	new_size: off_t);
+	new_size: loff_t);
 
 /* Apply/manipulate advisory lock */
 routine file_lock (
@@ -235,7 +235,7 @@ routine dir_readdir (
 	entry: int;
 	nentries: int;
 	bufsiz: vm_size_t;
-	out amount: int);
+	out amount: vm_size_t);
 
 /* Create directory */
 routine dir_mkdir (
diff --git a/hurd/hurd_types.defs b/hurd/hurd_types.defs
index 99f043c1..3771c4a1 100644
--- a/hurd/hurd_types.defs
+++ b/hurd/hurd_types.defs
@@ -198,14 +198,14 @@ type mode_t = unsigned32;
 type retry_type = unsigned32;
 type pid_t = int32;
 type wait_status_t = int32;
-type off_t = int32;
-type size_t = unsigned32;
+type loff_t = int64;
+type ino64_t = int64;
 type file_changed_type_t = unsigned32;
 type dir_changed_type_t = unsigned32;
 
 type portarray_t = array[] of mach_port_send_t;
 type intarray_t = array[] of int;
-type off_array_t = array[] of off_t;
+type off_array_t = array[] of loff_t;
 
 type pidarray_t = array[] of pid_t;
 type procinfo_t = array[] of int;
diff --git a/hurd/io.defs b/hurd/io.defs
index dd4bb8db..2e68574c 100644
--- a/hurd/io.defs
+++ b/hurd/io.defs
@@ -1,5 +1,5 @@
 /* Definitions for generic IO interface
-   Copyright (C) 1991,93,94,95,96,99,2001 Free Software Foundation, Inc.
+   Copyright (C) 1991,93,94,95,96,99,2001,02 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -43,8 +43,8 @@ routine io_write (
 	io_object: io_t;
 	RPT
 	data: data_t SCP;
-	offset: off_t;
-	out amount: size_t);
+	offset: loff_t;
+	out amount: vm_size_t);
 
 /* Read data from an IO object.  If offset if -1, read from the object
    maintained file pointer.  If the object is not seekable, offset is
@@ -53,16 +53,16 @@ routine io_read (
 	io_object: io_t;
 	RPT
 	out data: data_t, dealloc;
-	offset: off_t;
-	amount: size_t);
+	offset: loff_t;
+	amount: vm_size_t);
 
 /* Change current read/write offset */
 routine io_seek (
 	io_object: io_t;
 	RPT
-	offset: off_t;
+	offset: loff_t;
 	whence: int;
-	out newp: off_t);
+	out newp: loff_t);
 
 /* Tell how much data can be read from the object without blocking for
    a "long time" (this should be the same meaning of "long time" used
@@ -70,7 +70,7 @@ routine io_seek (
 routine io_readable (
 	io_object: io_t;
 	RPT
-	out amount: size_t);
+	out amount: vm_size_t);
 
 /* These four routines modify the O_APPEND, O_ASYNC, O_FSYNC, and
    O_NONBLOCK bits for the IO object. In addition, io_get_openmodes
@@ -316,7 +316,7 @@ routine io_identity (
 	RPT
 	out idport: mach_port_send_t;
 	out fsidport: mach_port_send_t;
-	out fileno: int);
+	out fileno: ino64_t);
 
 /* Revoke the access of all descriptors except this one currently open
    on the specified object.  */
diff --git a/hurd/io_reply.defs b/hurd/io_reply.defs
index dfc48e24..b5daf27e 100644
--- a/hurd/io_reply.defs
+++ b/hurd/io_reply.defs
@@ -1,5 +1,5 @@
 /* Definitions for generic IO interface
-   Copyright (C) 1991,93,94,95,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1991,93,94,95,2000,01,02 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -34,7 +34,7 @@ type reply_port_t = polymorphic | MACH_MSG_TYPE_MAKE_SEND_ONCE
 simpleroutine io_write_reply (
 	reply: reply_port_t;
 	RETURN_CODE_ARG;
-	amount: int);
+	amount: vm_size_t);
 
 simpleroutine io_read_reply (
 	reply: reply_port_t;
@@ -44,12 +44,12 @@ simpleroutine io_read_reply (
 simpleroutine io_seek_reply (
 	reply: reply_port_t;
 	RETURN_CODE_ARG;
-	newp: off_t);
+	newp: loff_t);
 
 simpleroutine io_readable_reply (
 	reply: reply_port_t;
 	RETURN_CODE_ARG;
-	amount: int);
+	amount: vm_size_t);
 
 simpleroutine io_set_all_openmodes_reply (
 	reply: reply_port_t;
diff --git a/hurd/io_request.defs b/hurd/io_request.defs
index 366963f2..55a8a31b 100644
--- a/hurd/io_request.defs
+++ b/hurd/io_request.defs
@@ -1,5 +1,5 @@
 /* Definitions for generic IO interface
-   Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation
+   Copyright (C) 1991,93,94,95,2002 Free Software Foundation, Inc.
 
 This file is part of the GNU Hurd.
 
@@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-The GNU Hurd is distributed in the hope that it will be useful, 
+The GNU Hurd is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
@@ -35,18 +35,18 @@ simpleroutine io_write_request (
 		io_object: io_t;
 		reply: reply_port_t;
 		data: data_t;
-		offset: off_t);
+		offset: loff_t);
 
 simpleroutine io_read_request (
 		io_object: io_t;
 		reply: reply_port_t;
-		offset: off_t;
-		amount: int);
+		offset: loff_t;
+		amount: vm_size_t);
 
 simpleroutine io_seek_request (
 		io_object: io_t;
 		reply: reply_port_t;
-		offset: off_t;
+		offset: loff_t;
 		whence: int);
 
 simpleroutine io_readable_request (
@@ -160,7 +160,3 @@ simpleroutine io_readsleep_request (
 simpleroutine io_sigio_request (
 		io_object: io_t;
 		reply: reply_port_t);
-
-
-		
-