diff options
| author | Roland McGrath <roland@gnu.org> | 2002-06-13 21:26:39 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-06-13 21:26:39 +0000 |
| commit | 48d0548e88e4c06722165a969fccfbd429dff2f0 (patch) | |
| tree | 58f199816ae4b798281e0f4ba5c6bee7df5e8e7d /trans/hello-mt.c | |
| parent | 541dbfcc1fdfa6e35177a805c7a0ab890f821de3 (diff) | |
| download | hurd-48d0548e88e4c06722165a969fccfbd429dff2f0.tar.gz hurd-48d0548e88e4c06722165a969fccfbd429dff2f0.tar.bz2 hurd-48d0548e88e4c06722165a969fccfbd429dff2f0.zip | |
2002-06-13 Roland McGrath <roland@frob.com>
* firmlink.c (trivfs_S_io_read): Fix type of DATA argument.
* streamio.c (trivfs_S_io_read): Likewise.
(trivfs_S_io_write): Likewise.
* hello.c (trivfs_S_io_read): Likewise.
* hello-mt.c (trivfs_S_io_read): Likewise.
* null.c (trivfs_S_io_read): Likewise.
(trivfs_S_io_write): Likewise.
(trivfs_S_file_set_size): Add reply port args.
* hello.c (trivfs_S_io_read): off_t -> loff_t
* hello-mt.c (trivfs_S_io_read): Likewise.
* streamio.c (trivfs_S_io_read, trivfs_S_io_write): Likewise.
(trivfs_S_file_sync): Add missing arg.
Diffstat (limited to 'trans/hello-mt.c')
| -rw-r--r-- | trans/hello-mt.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/trans/hello-mt.c b/trans/hello-mt.c index 83278e1b..cc338f92 100644 --- a/trans/hello-mt.c +++ b/trans/hello-mt.c @@ -1,5 +1,5 @@ /* hello-mt.c - A trivial single-file translator, multithreaded version - Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1998,99,2001,02 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -123,8 +123,8 @@ close_hook (struct trivfs_peropen *peropen) error_t trivfs_S_io_read (struct trivfs_protid *cred, mach_port_t reply, mach_msg_type_name_t reply_type, - vm_address_t *data, mach_msg_type_number_t *data_len, - off_t offs, mach_msg_type_number_t amount) + char **data, mach_msg_type_number_t *data_len, + loff_t offs, mach_msg_type_number_t amount) { struct open *op; @@ -154,8 +154,13 @@ trivfs_S_io_read (struct trivfs_protid *cred, { /* Possibly allocate a new buffer. */ if (*data_len < amount) - *data = (vm_address_t) mmap (0, amount, PROT_READ|PROT_WRITE, - MAP_ANON, 0, 0); + *data = mmap (0, amount, PROT_READ|PROT_WRITE, MAP_ANON, 0, 0); + if (*data == MAP_FAILED) + { + mutex_unlock (&op->lock); + rwlock_reader_unlock (&contents_lock); + return ENOMEM; + } /* Copy the constant data into the buffer. */ memcpy ((char *) *data, contents + offs, amount); |