summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2008-07-02 19:35:02 +0000
committerRoland McGrath <roland@gnu.org>2008-07-02 19:35:02 +0000
commitd5a0160b583dbd08d77c999c2acc4b72c2a6d9db (patch)
treeaa8b2bb2a11412921cf6f6635ef8e57826097269
parent0a583b5419a785591ba9607f32e4bc0d18c838e2 (diff)
* sysdeps/mach/hurd/recv.c (__recv): Initialize NPORTS.cvs/fedora-glibc-20080703T1203
* sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise. * sysdeps/mach/hurd/recvmsg.c (__recvmsg): Likewise. * hurd/fd-read.c (_hurd_fd_read): Initialize NREAD. * hurd/get-host.c (_hurd_get_host_config): Likewise. * sysdeps/mach/hurd/dl-sysdep.c (__libc_read): Likewise.
-rw-r--r--ChangeLog9
-rw-r--r--hurd/fd-read.c1
-rw-r--r--hurd/get-host.c1
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c1
-rw-r--r--sysdeps/mach/hurd/recv.c2
-rw-r--r--sysdeps/mach/hurd/recvfrom.c2
-rw-r--r--sysdeps/mach/hurd/recvmsg.c2
7 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cce636e940..63be53efb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,15 @@
* sysdeps/mach/hurd/sendto.c (__sendfrom): Likewise.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Likewise.
+2008-03-04 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/hurd/recv.c (__recv): Initialize NPORTS.
+ * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise.
+ * sysdeps/mach/hurd/recvmsg.c (__recvmsg): Likewise.
+ * hurd/fd-read.c (_hurd_fd_read): Initialize NREAD.
+ * hurd/get-host.c (_hurd_get_host_config): Likewise.
+ * sysdeps/mach/hurd/dl-sysdep.c (__libc_read): Likewise.
+
2008-06-27 Ulrich Drepper <drepper@redhat.com>
[BZ #6657]
diff --git a/hurd/fd-read.c b/hurd/fd-read.c
index 55dbc24e93..388a4dbaf9 100644
--- a/hurd/fd-read.c
+++ b/hurd/fd-read.c
@@ -35,6 +35,7 @@ _hurd_fd_read (struct hurd_fd *fd, void *buf, size_t *nbytes, loff_t offset)
}
data = buf;
+ nread = *nbytes;
if (err = HURD_FD_PORT_USE (fd, _hurd_ctty_input (port, ctty, readfd)))
return err;
diff --git a/hurd/get-host.c b/hurd/get-host.c
index bebad892cf..3fe0b3ef78 100644
--- a/hurd/get-host.c
+++ b/hurd/get-host.c
@@ -51,6 +51,7 @@ _hurd_get_host_config (const char *item, char *buf, size_t buflen)
}
data = buf;
+ nread = buflen;
err = __io_read (config, &data, &nread, -1, buflen);
if (! err)
/* Check if there is more in the file we didn't read. */
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 668aaaf8b5..2440682903 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -367,6 +367,7 @@ __libc_read (int fd, void *buf, size_t nbytes)
mach_msg_type_number_t nread;
data = buf;
+ nread = nbytes;
err = __io_read ((mach_port_t) fd, &data, &nread, -1, nbytes);
if (err)
return __hurd_fail (err);
diff --git a/sysdeps/mach/hurd/recv.c b/sysdeps/mach/hurd/recv.c
index a01e6090d3..0cf6b7ce58 100644
--- a/sysdeps/mach/hurd/recv.c
+++ b/sysdeps/mach/hurd/recv.c
@@ -38,7 +38,7 @@ __recv (fd, buf, n, flags)
char *bufp = buf;
mach_msg_type_number_t nread = n;
mach_port_t *ports;
- mach_msg_type_number_t nports;
+ mach_msg_type_number_t nports = 0;
char *cdata = NULL;
mach_msg_type_number_t clen = 0;
diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c
index d30bc40c06..2aca5709df 100644
--- a/sysdeps/mach/hurd/recvfrom.c
+++ b/sysdeps/mach/hurd/recvfrom.c
@@ -41,7 +41,7 @@ __recvfrom (fd, buf, n, flags, addrarg, addr_len)
char *bufp = buf;
mach_msg_type_number_t nread = n;
mach_port_t *ports;
- mach_msg_type_number_t nports;
+ mach_msg_type_number_t nports = 0;
char *cdata = NULL;
mach_msg_type_number_t clen = 0;
struct sockaddr *addr = addrarg.__sockaddr__;
diff --git a/sysdeps/mach/hurd/recvmsg.c b/sysdeps/mach/hurd/recvmsg.c
index 15f9fb14d6..33897b8ce8 100644
--- a/sysdeps/mach/hurd/recvmsg.c
+++ b/sysdeps/mach/hurd/recvmsg.c
@@ -34,7 +34,7 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags)
char *data = NULL;
mach_msg_type_number_t len = 0;
mach_port_t *ports;
- mach_msg_type_number_t nports;
+ mach_msg_type_number_t nports = 0;
char *cdata = NULL;
mach_msg_type_number_t clen = 0;
size_t amount;