* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Don't append
options after $(build-module), which is no longer a single command.
(LDFLAGS-link-rpcuserlibs): New variable to hold those options.
(LDFLAGS-libmachuser-link.so, LDFLAGS-libhurduser-link.so): New
variables using it. Reported by Mark Kettenis <kettenis@gnu.org>.
2001-03-11 Roland McGrath <roland@frob.com>
* elf/rtld.c (dl_main): Add cast to quiet warning.
* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
* iconv/gconv_conf.c (__gconv_get_path): Likewise.
(__gconv_read_conf): Likewise.
* iconv/gconv_db.c (gen_steps): Likewise.
(__gconv_find_transform): Likewise.
* locale/programs/charmap-dir.c (fopen_uncompressed): Likewise.
(fopen_uncompressed): Use const in second argument's type.
2001-03-11 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/dl-sysdep.c (__writev): New function.
* mach/mach_error.h: Fix ancient #endif syntax.
* hurd/hurdmalloc.c: Likewise.
* sysdeps/generic/atomicity.h (exchange_and_add, atomic_add,
compare_and_swap): Add volatile qualifier to first arg, to bring
these prototypes in line with all the other implementations.
Add a #warning to remind the builder that these are not atomic.
2001-03-04 Roland McGrath <roland@frob.com>
* hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Use innermore first
member of TEMP_F so its type is _IO_FILE * as expected.
* hurd/fopenport.c (seekio): Conditionalize type of POS argument
on [USE_IN_LIBIO]. Check the value for overflow, since for libio
it might exceed off_t's range.
2001-02-25 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Use prototype.
* sysdeps/unix/bsd/getpt.c (__posix_openpt): Likewise.
* sysdeps/mach/hurd/i386/intr-msg.h (SYSCALL_EXAMINE): Make this a
macro instead of an inline function,
(MSG_EXAMINE): Likewise.
* hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Remove extraneous ##.
* hurd/get-host.c: Include <string.h> for decls of built-ins.
* hurd/hurdchdir.c: Likewise.
* sysdeps/mach/hurd/i386/sigreturn.c: Likweise.
* sysdeps/mach/hurd/opendir.c: Likewise.
* mach/mach_init.c: Include <unistd.h> for _exit decl.
* mach/errsystems.awk: Give output file a trailing newline.
* mach/Machrules (MIG): Prepend CC='${CC}' to the mig command, so that
the script will use our compiler for the cpp stage.
With --enable-all-warnings we get a whole bunch of warnings,
and these are just a few fixes; there are more needed to silence it.
* mach/mach/mig_support.h (__mig_strncpy, mig_strncpy): Add extern
decls before extern inline defns to quiet gcc warning.
* hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp): Likewise.
* sysdeps/mach/i386/machine-sp.h (__thread_stack_pointer): Likewise.
2001-04-01 13:04:31 +08:00
|
|
|
|
/* Copyright (C) 1994,95,97,2000,01 Free Software Foundation, Inc.
|
1997-02-15 12:31:36 +08:00
|
|
|
|
This file is part of the GNU C Library.
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
1997-02-15 12:31:36 +08:00
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 12:58:11 +08:00
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
1997-02-15 12:31:36 +08:00
|
|
|
|
The GNU C Library 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
|
2001-07-06 12:58:11 +08:00
|
|
|
|
Lesser General Public License for more details.
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
2001-07-06 12:58:11 +08:00
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
License along with the GNU C Library; if not, write to the Free
|
|
|
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
|
02111-1307 USA. */
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
|
|
|
|
#include <hurd.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
|
|
/* Read up to N chars into BUF from COOKIE.
|
|
|
|
|
Return how many chars were read, 0 for EOF or -1 for error. */
|
|
|
|
|
static ssize_t
|
|
|
|
|
readio (void *cookie, char *buf, size_t n)
|
|
|
|
|
{
|
|
|
|
|
mach_msg_type_number_t nread;
|
|
|
|
|
error_t err;
|
|
|
|
|
char *bufp = buf;
|
|
|
|
|
|
|
|
|
|
nread = n;
|
|
|
|
|
if (err = __io_read ((io_t) cookie, &bufp, &nread, -1, n))
|
|
|
|
|
return __hurd_fail (err);
|
|
|
|
|
|
|
|
|
|
if (bufp != buf)
|
|
|
|
|
{
|
|
|
|
|
memcpy (buf, bufp, nread);
|
|
|
|
|
__vm_deallocate (__mach_task_self (),
|
|
|
|
|
(vm_address_t) bufp, (vm_size_t) nread);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return nread;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write up to N chars from BUF to COOKIE.
|
|
|
|
|
Return how many chars were written or -1 for error. */
|
|
|
|
|
static ssize_t
|
|
|
|
|
writeio (void *cookie, const char *buf, size_t n)
|
|
|
|
|
{
|
|
|
|
|
mach_msg_type_number_t wrote;
|
|
|
|
|
error_t err;
|
|
|
|
|
|
|
|
|
|
if (err = __io_write ((io_t) cookie, buf, n, -1, &wrote))
|
|
|
|
|
return __hurd_fail (err);
|
|
|
|
|
|
|
|
|
|
return wrote;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Move COOKIE's file position *POS bytes, according to WHENCE.
|
|
|
|
|
The current file position is stored in *POS.
|
|
|
|
|
Returns zero if successful, nonzero if not. */
|
|
|
|
|
static int
|
* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Don't append
options after $(build-module), which is no longer a single command.
(LDFLAGS-link-rpcuserlibs): New variable to hold those options.
(LDFLAGS-libmachuser-link.so, LDFLAGS-libhurduser-link.so): New
variables using it. Reported by Mark Kettenis <kettenis@gnu.org>.
2001-03-11 Roland McGrath <roland@frob.com>
* elf/rtld.c (dl_main): Add cast to quiet warning.
* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
* iconv/gconv_conf.c (__gconv_get_path): Likewise.
(__gconv_read_conf): Likewise.
* iconv/gconv_db.c (gen_steps): Likewise.
(__gconv_find_transform): Likewise.
* locale/programs/charmap-dir.c (fopen_uncompressed): Likewise.
(fopen_uncompressed): Use const in second argument's type.
2001-03-11 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/dl-sysdep.c (__writev): New function.
* mach/mach_error.h: Fix ancient #endif syntax.
* hurd/hurdmalloc.c: Likewise.
* sysdeps/generic/atomicity.h (exchange_and_add, atomic_add,
compare_and_swap): Add volatile qualifier to first arg, to bring
these prototypes in line with all the other implementations.
Add a #warning to remind the builder that these are not atomic.
2001-03-04 Roland McGrath <roland@frob.com>
* hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Use innermore first
member of TEMP_F so its type is _IO_FILE * as expected.
* hurd/fopenport.c (seekio): Conditionalize type of POS argument
on [USE_IN_LIBIO]. Check the value for overflow, since for libio
it might exceed off_t's range.
2001-02-25 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Use prototype.
* sysdeps/unix/bsd/getpt.c (__posix_openpt): Likewise.
* sysdeps/mach/hurd/i386/intr-msg.h (SYSCALL_EXAMINE): Make this a
macro instead of an inline function,
(MSG_EXAMINE): Likewise.
* hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Remove extraneous ##.
* hurd/get-host.c: Include <string.h> for decls of built-ins.
* hurd/hurdchdir.c: Likewise.
* sysdeps/mach/hurd/i386/sigreturn.c: Likweise.
* sysdeps/mach/hurd/opendir.c: Likewise.
* mach/mach_init.c: Include <unistd.h> for _exit decl.
* mach/errsystems.awk: Give output file a trailing newline.
* mach/Machrules (MIG): Prepend CC='${CC}' to the mig command, so that
the script will use our compiler for the cpp stage.
With --enable-all-warnings we get a whole bunch of warnings,
and these are just a few fixes; there are more needed to silence it.
* mach/mach/mig_support.h (__mig_strncpy, mig_strncpy): Add extern
decls before extern inline defns to quiet gcc warning.
* hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp): Likewise.
* sysdeps/mach/i386/machine-sp.h (__thread_stack_pointer): Likewise.
2001-04-01 13:04:31 +08:00
|
|
|
|
seekio (void *cookie,
|
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
|
|
|
_IO_off64_t *pos,
|
|
|
|
|
#else
|
|
|
|
|
fpos_t *pos,
|
|
|
|
|
#endif
|
|
|
|
|
int whence)
|
1995-02-18 09:27:10 +08:00
|
|
|
|
{
|
2000-03-10 16:45:53 +08:00
|
|
|
|
off_t res;
|
* sysdeps/mach/hurd/Makefile ($(link-rpcuserlibs)): Don't append
options after $(build-module), which is no longer a single command.
(LDFLAGS-link-rpcuserlibs): New variable to hold those options.
(LDFLAGS-libmachuser-link.so, LDFLAGS-libhurduser-link.so): New
variables using it. Reported by Mark Kettenis <kettenis@gnu.org>.
2001-03-11 Roland McGrath <roland@frob.com>
* elf/rtld.c (dl_main): Add cast to quiet warning.
* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
* iconv/gconv_conf.c (__gconv_get_path): Likewise.
(__gconv_read_conf): Likewise.
* iconv/gconv_db.c (gen_steps): Likewise.
(__gconv_find_transform): Likewise.
* locale/programs/charmap-dir.c (fopen_uncompressed): Likewise.
(fopen_uncompressed): Use const in second argument's type.
2001-03-11 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/dl-sysdep.c (__writev): New function.
* mach/mach_error.h: Fix ancient #endif syntax.
* hurd/hurdmalloc.c: Likewise.
* sysdeps/generic/atomicity.h (exchange_and_add, atomic_add,
compare_and_swap): Add volatile qualifier to first arg, to bring
these prototypes in line with all the other implementations.
Add a #warning to remind the builder that these are not atomic.
2001-03-04 Roland McGrath <roland@frob.com>
* hurd/vpprintf.c (vpprintf) [USE_IN_LIBIO]: Use innermore first
member of TEMP_F so its type is _IO_FILE * as expected.
* hurd/fopenport.c (seekio): Conditionalize type of POS argument
on [USE_IN_LIBIO]. Check the value for overflow, since for libio
it might exceed off_t's range.
2001-02-25 Roland McGrath <roland@frob.com>
* sysdeps/mach/hurd/sysd-stdio.c (__stdio_reopen): Use prototype.
* sysdeps/unix/bsd/getpt.c (__posix_openpt): Likewise.
* sysdeps/mach/hurd/i386/intr-msg.h (SYSCALL_EXAMINE): Make this a
macro instead of an inline function,
(MSG_EXAMINE): Likewise.
* hurd/hurd/ioctl.h (_HURD_HANDLE_IOCTLS_1): Remove extraneous ##.
* hurd/get-host.c: Include <string.h> for decls of built-ins.
* hurd/hurdchdir.c: Likewise.
* sysdeps/mach/hurd/i386/sigreturn.c: Likweise.
* sysdeps/mach/hurd/opendir.c: Likewise.
* mach/mach_init.c: Include <unistd.h> for _exit decl.
* mach/errsystems.awk: Give output file a trailing newline.
* mach/Machrules (MIG): Prepend CC='${CC}' to the mig command, so that
the script will use our compiler for the cpp stage.
With --enable-all-warnings we get a whole bunch of warnings,
and these are just a few fixes; there are more needed to silence it.
* mach/mach/mig_support.h (__mig_strncpy, mig_strncpy): Add extern
decls before extern inline defns to quiet gcc warning.
* hurd/hurd/threadvar.h (__hurd_threadvar_location_from_sp): Likewise.
* sysdeps/mach/i386/machine-sp.h (__thread_stack_pointer): Likewise.
2001-04-01 13:04:31 +08:00
|
|
|
|
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);
|
1995-02-18 09:27:10 +08:00
|
|
|
|
if (error)
|
|
|
|
|
return __hurd_fail (error);
|
2000-03-10 16:45:53 +08:00
|
|
|
|
*pos = res;
|
1995-02-18 09:27:10 +08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Close the file associated with COOKIE.
|
|
|
|
|
Return 0 for success or -1 for failure. */
|
|
|
|
|
static int
|
|
|
|
|
closeio (void *cookie)
|
|
|
|
|
{
|
|
|
|
|
error_t error = __mach_port_deallocate (__mach_task_self (),
|
|
|
|
|
(mach_port_t) cookie);
|
|
|
|
|
if (error)
|
|
|
|
|
return __hurd_fail (error);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-10 16:45:53 +08:00
|
|
|
|
#ifndef USE_IN_LIBIO
|
|
|
|
|
#define cookie_io_functions_t __io_functions
|
|
|
|
|
#endif
|
|
|
|
|
static const cookie_io_functions_t funcsio =
|
|
|
|
|
{ readio, writeio, seekio, closeio };
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Open a stream on PORT. MODE is as for fopen. */
|
|
|
|
|
|
|
|
|
|
FILE *
|
2000-03-10 16:45:53 +08:00
|
|
|
|
fopenport (mach_port_t port, const char *mode)
|
1995-02-18 09:27:10 +08:00
|
|
|
|
{
|
|
|
|
|
int pflags;
|
2000-03-10 16:45:53 +08:00
|
|
|
|
int needflags;
|
1995-02-18 09:27:10 +08:00
|
|
|
|
error_t err;
|
|
|
|
|
|
2000-03-10 16:45:53 +08:00
|
|
|
|
const char *m = mode;
|
|
|
|
|
|
|
|
|
|
switch (*m++)
|
|
|
|
|
{
|
|
|
|
|
case 'r':
|
|
|
|
|
needflags = O_READ;
|
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
needflags = O_WRITE;
|
|
|
|
|
break;
|
|
|
|
|
case 'a':
|
|
|
|
|
needflags = O_WRITE|O_APPEND;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
if (m[0] == '+' || (m[0] == 'b' && m[1] == '+'))
|
|
|
|
|
needflags |= O_RDWR;
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
|
|
|
|
/* Verify the PORT is valid allows the access MODE specifies. */
|
|
|
|
|
|
|
|
|
|
if (err = __io_get_openmodes (port, &pflags))
|
|
|
|
|
return __hurd_fail (err), NULL;
|
|
|
|
|
|
|
|
|
|
/* Check the access mode. */
|
2000-03-10 16:45:53 +08:00
|
|
|
|
if ((pflags & needflags) != needflags)
|
1995-02-18 09:27:10 +08:00
|
|
|
|
{
|
|
|
|
|
errno = EBADF;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-10 16:45:53 +08:00
|
|
|
|
return fopencookie ((void *) port, mode, funcsio);
|
1995-02-18 09:27:10 +08:00
|
|
|
|
}
|