From 337738b77123cbfed07d53c9408eb74109856d0a Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 11 Jun 2002 23:04:51 +0000 Subject: * sysdeps/mach/hurd/xstat64.c: Conditionalize entire contents of the file on [!RTLD_STAT64]. * sysdeps/mach/hurd/fxstat64.c: Likewise. * sysdeps/mach/hurd/tmpfile.c (tmpfile64): Define as alias of tmpfile. (__fdopen): Use INTUSE. * sysdeps/mach/hurd/tmpfile64.c: New file, empty placeholder. * stdio-common/tmpfile64.c: File removed. * sysdeps/generic/tmpfile64.c: New file. * sysdeps/generic/tmpfile.c (GEN_THIS): New macro, define to __GT_FILE if not already defined. (tmpfile): Use it in place of __GT_FILE. * include/unistd.h: Declare __chown_internal. * sysdeps/mach/hurd/sendfile64.c (sendfile64): Do real work here. * sysdeps/mach/hurd/sendfile.c (sendfile): Call that. 2002-06-09 Roland McGrath Update to new Hurd RPC interfaces supporting 64-bit file sizes. * sysdeps/mach/hurd/configure.in: Check for with value of HURD_INTERFACE_VERSION >= 20020609. * sysdeps/mach/hurd/configure: Regenerated. * shlib-versions (.*-.*-gnu-gnu.*): Set libhurduser=0.3. * sysdeps/mach/hurd/xstatconv.c (xstat64_conv): Rewritten to convert a struct stat64 into a struct stat and return 0 or -1 with errno set to EOVERFLOW. * sysdeps/mach/hurd/statfsconv.c (statfs64_conv): Likewise for struct statfs64 to struct statfs. * sysdeps/mach/hurd/xstat.c (__xstat): Use converter and call ... * sysdeps/mach/hurd/xstat64.c (__xstat64): ... this, real work here. * sysdeps/mach/hurd/fxstat.c (__fxstat): Likewise. * sysdeps/mach/hurd/fxstat64.c (__fxstat64): Likewise. * sysdeps/mach/hurd/lxstat.c (__lxstat): Likewise. * sysdeps/mach/hurd/lxstat64.c (__lxstat64): Likewise. * sysdeps/mach/hurd/statfs.c (__statfs): Likewise. * sysdeps/mach/hurd/statfs64.c (__statfs64): Likewise. * sysdeps/mach/hurd/fstatfs.c (__fstatfs): Likewise. * sysdeps/mach/hurd/fstatfs64.c (__fstatfs64): Likewise. * sysdeps/mach/hurd/pwrite64.c (__libc_pwrite64): Do real work here. * sysdeps/mach/hurd/pwrite.c (__libc_pwrite): Call that. * sysdeps/mach/hurd/pread64.c (__libc_pread64): Do real work here. * sysdeps/mach/hurd/pread.c (__libc_pread): Call that. * sysdeps/mach/hurd/lseek64.c (__libc_lseek64): Do real work here. * sysdeps/mach/hurd/lseek.c (__libc_lseek): Call that. * sysdeps/mach/hurd/readdir64.c (__readdir64): Do real work here. * sysdeps/mach/hurd/readdir.c (__readdir): Call that. * sysdeps/mach/hurd/readdir64_r.c (__readdir64_r): Do real work here. * sysdeps/mach/hurd/readdir_r.c (__readdir64_r): Call that. * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Use struct stat64 for io_stat argument. * sysdeps/mach/hurd/readlink.c (__readlink): Likewise. * hurd/fopenport.c (seekio): Remove EOVERFLOW check, pass POS directly to io_seek. * hurd/fd-read.c (_hurd_fd_read): Use loff_t for OFFSET argument. * hurd/fd-write.c (_hurd_fd_write): Likewise. * hurd/hurd/fd.h: Update decls. * sysdeps/mach/hurd/getcwd.c (_hurd_canonicalize_directory_name_internal): Use ino64_t and struct dirent64. * sysdeps/mach/hurd/dl-sysdep.c (open_file): Use struct stat64. (__xstat): Renamed to __xstat64, use struct stat64 for argument. (__fxstat): Renamed to __fxstat64, use struct stat64 for argument. (__lseek): Renamed to __libc_lseek64, use off64_t for argument. 2002-06-08 Roland McGrath * sysdeps/mach/hurd/dirstream.h (struct __dirstream): Use size_t instead of unsigned long int for __allocation and __size members. 2002-05-19 Ulrich Drepper --- hurd/fd-read.c | 4 ++-- hurd/fd-write.c | 4 ++-- hurd/fopenport.c | 21 +++------------------ hurd/hurd/fd.h | 7 ++++--- hurd/lookup-retry.c | 4 ++-- 5 files changed, 13 insertions(+), 27 deletions(-) (limited to 'hurd') diff --git a/hurd/fd-read.c b/hurd/fd-read.c index 2e2cd16cdf..55dbc24e93 100644 --- a/hurd/fd-read.c +++ b/hurd/fd-read.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,94,95,97,99 Free Software Foundation, Inc. +/* Copyright (C) 1993,94,95,97,99,2002 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 error_t -_hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes, off_t offset) +_hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes, loff_t offset) { error_t err; char *data; diff --git a/hurd/fd-write.c b/hurd/fd-write.c index 23dcbe3a27..b6958177b0 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,94,95,97,99 Free Software Foundation, Inc. + Copyright (C) 1993,94,95,97,99,2002 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 @@ -24,7 +24,7 @@ error_t _hurd_fd_write (struct hurd_fd *fd, - const void *buf, size_t *nbytes, off_t offset) + const void *buf, size_t *nbytes, loff_t offset) { error_t err; mach_msg_type_number_t wrote; diff --git a/hurd/fopenport.c b/hurd/fopenport.c index 869b3917bf..5dcb5ab30a 100644 --- a/hurd/fopenport.c +++ b/hurd/fopenport.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994,95,97,2000,01 Free Software Foundation, Inc. +/* Copyright (C) 1994,95,97,2000,01,02 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 @@ -70,23 +70,8 @@ seekio (void *cookie, #endif int whence) { - off_t res; - error_t error; - - /* XXX We don't really support large files on the Hurd. So if POS - doesn't fit in an `off_t', we'll return `-1' and set errno. EOVERFLOW - probably isn't the right error value, but seems appropriate here. */ - if ((off_t) *pos != *pos) - { - __set_errno (EOVERFLOW); - return -1; - } - - error = __io_seek ((file_t) cookie, *pos, whence, &res); - if (error) - return __hurd_fail (error); - *pos = res; - return 0; + error_t err = __io_seek ((file_t) cookie, *pos, whence, pos); + return err ? __hurd_fail (err) : 0; } /* Close the file associated with COOKIE. diff --git a/hurd/hurd/fd.h b/hurd/hurd/fd.h index 55c6a0e32a..198791b807 100644 --- a/hurd/hurd/fd.h +++ b/hurd/hurd/fd.h @@ -1,5 +1,6 @@ /* File descriptors. - Copyright (C) 1993,94,95,96,97,98,99,2000,01 Free Software Foundation, Inc. + Copyright (C) 1993,94,95,96,97,98,99,2000,01,02 + 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 @@ -214,9 +215,9 @@ extern error_t _hurd_fd_close (struct hurd_fd *fd); 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, off_t offset); + void *buf, size_t *nbytes, loff_t offset); extern error_t _hurd_fd_write (struct hurd_fd *fd, - const void *buf, size_t *nbytes, off_t offset); + const void *buf, size_t *nbytes, loff_t offset); /* Call *RPC on PORT and/or CTTY; if a call on CTTY returns EBACKGROUND, diff --git a/hurd/lookup-retry.c b/hurd/lookup-retry.c index 736f5e583a..f6f77a6120 100644 --- a/hurd/lookup-retry.c +++ b/hurd/lookup-retry.c @@ -1,5 +1,5 @@ /* hairy bits of Hurd file name lookup - Copyright (C) 1992,93,94,95,96,97,99,2001 Free Software Foundation, Inc. + Copyright (C) 1992,93,94,95,96,97,99,2001,02 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 @@ -136,7 +136,7 @@ __hurd_file_name_lookup_retry (error_t (*use_init_port) we follow root-owned symlinks; if that is deemed undesireable, we can add a final check for that one exception to our general translator-based rule. */ - struct stat st; + struct stat64 st; err = __io_stat (*result, &st); if (!err && (st.st_mode & (S_IPTRANS|S_IATRANS))) -- cgit 1.4.1