2005-02-22 Jakub Jelinek <jakub@redhat.com>

	[BZ #769]
	* nscd/nscd-client.h: Include sys/uio.h.
	(__readall, __readvall, writeall): New prototypes.
	* nscd/connections.c (writeall): New function.
	(handle_request): Use it.
	* nscd/aicache.c (addhstaiX): Likewise.
	* nscd/initgrcache.c (addinitgroupsX): Likewise.
	* nscd/hstcache.c (cache_addhst): Likewise.
	* nscd/grpcache.c (cache_addgr): Likewise.
	* nscd/pwdcache.c (cache_addpw): Likewise.
	* nscd/nscd_helper.c (__readall, __readvall): New functions.
	* nscd/nscd_getai.c (__nscd_getai): Use them.
	* nscd/nscd_getpw_r.c (__nscd_getpw_r): Likewise.
	* nscd/nscd_getgr_r.c (__nscd_getgr_r): Likewise.
	* nscd/nscd_gethst_r.c (__nscd_gethst_r): Likewise.
	* nscd/nscd_initgroups.c (__nscd_getgrouplist): Likewise.

diff --git a/nscd/aicache.c b/nscd/aicache.c
index 4e0496ff44be0d3ac9f1ca23a916d9be2962ff90..6c03cb87542cc75b22c809adf6b17125b2c61a4c 100644 (file)
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -365,7 +365,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
                     wait.  */
                  assert (fd != -1);
 
-                 TEMP_FAILURE_RETRY (write (fd, &dataset->resp, total));
+                 writeall (fd, &dataset->resp, total);
                }
 
              goto out;

diff --git a/nscd/connections.c b/nscd/connections.c
index f22d72e265247cbeb40107804ed4469a7ec8519a..850ddfa67d55cd1588e6b36818e13c838445ee38 100644 (file)
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -181,13 +181,28 @@ static int sock;
 unsigned long int client_queued;
 
 
+ssize_t
+writeall (int fd, const void *buf, size_t len)
+{
+  size_t n = len;
+  ssize_t ret;
+  do
+    {
+      ret = TEMP_FAILURE_RETRY (write (fd, buf, n));
+      if (ret <= 0)
+       break;
+      buf = (const char *) buf + ret;
+      n -= ret;
+    }
+  while (n > 0);
+  return ret < 0 ? ret : len - n;
+}
+
+
 /* Initialize database information structures.  */
 void
 nscd_init (void)
 {
-  struct sockaddr_un sock_addr;
-  size_t cnt;
-
   /* Secure mode and unprivileged mode are incompatible */
   if (server_user != NULL && secure_in_use)
     {
@@ -204,7 +219,7 @@ nscd_init (void)
     /* No configuration for this value, assume a default.  */
     nthreads = 2 * lastdb;
 
-  for (cnt = 0; cnt < lastdb; ++cnt)
+  for (size_t cnt = 0; cnt < lastdb; ++cnt)
     if (dbs[cnt].enabled)
       {
        pthread_rwlock_init (&dbs[cnt].lock, NULL);
@@ -500,6 +515,7 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
       exit (1);
     }
   /* Bind a name to the socket.  */
+  struct sockaddr_un sock_addr;
   sock_addr.sun_family = AF_UNIX;
   strcpy (sock_addr.sun_path, _PATH_NSCDSOCKET);
   if (bind (sock, (struct sockaddr *) &sock_addr, sizeof (sock_addr)) < 0)
@@ -688,7 +704,7 @@ cannot handle old request version %d; current version is %d"),
       if (cached != NULL)
        {
          /* Hurray it's in the cache.  */
-         if (TEMP_FAILURE_RETRY (write (fd, cached->data, cached->recsize))
+         if (writeall (fd, cached->data, cached->recsize)
              != cached->recsize
              && __builtin_expect (debug_level, 0) > 0)
            {

diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index 3cfad653e40093bec41a746592168bb8d2639375..7b6e223f17bce396346bfef4686a87d84f56f6e8 100644 (file)
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -292,7 +292,7 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
             unnecessarily let the receiver wait.  */
          assert (fd != -1);
 
-         written = TEMP_FAILURE_RETRY (write (fd, &dataset->resp, total));
+         written = writeall (fd, &dataset->resp, total);
        }
 
       /* Add the record to the database.  But only if it has not been

diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 754f7a6615700e84b23cbe421c24c7df1fe848b7..53a3e47b5d43b7fefe846f4d310aaa5008863eaf 100644 (file)
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -327,7 +327,7 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
             unnecessarily keep the receiver waiting.  */
          assert (fd != -1);
 
-         written = TEMP_FAILURE_RETRY (write (fd, &dataset->resp, total));
+         written = writeall (fd, &dataset->resp, total);
        }
 
       /* Add the record to the database.  But only if it has not been

diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
index b46433716b534f6d98bc1fa78248f1cf53898553..5f114bb010b4105cd4117e5f7500874101a807cd 100644 (file)
--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
@@ -343,7 +343,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
             unnecessarily let the receiver wait.  */
          assert (fd != -1);
 
-         written = TEMP_FAILURE_RETRY (write (fd, &dataset->resp, total));
+         written = writeall (fd, &dataset->resp, total);
        }
 
 

diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
index d49cb8136ce158300e6247582d125a4ed685fff1..53bb4f4f152409bdf8a8153a0deb4c9baec786ad 100644 (file)
--- a/nscd/nscd-client.h
+++ b/nscd/nscd-client.h
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <atomic.h>
 #include <nscd-types.h>
+#include <sys/uio.h>
 
 
 /* Version number of the daemon interface */
@@ -309,4 +310,13 @@ extern const struct datahead *__nscd_cache_search (request_type type,
                                                   size_t keylen,
                                                   const struct mapped_database *mapped);
 
+/* Wrappers around read, readv and write that only read/write less than LEN
+   bytes on error or EOF.  */
+extern ssize_t __readall (int fd, void *buf, size_t len)
+  attribute_hidden;
+extern ssize_t __readvall (int fd, const struct iovec *iov, int iovcnt)
+  attribute_hidden;
+extern ssize_t writeall (int fd, const void *buf, size_t len)
+  attribute_hidden;
+
 #endif /* nscd.h */

diff --git a/nscd/nscd_getai.c b/nscd/nscd_getai.c
index cfb3fe27013c854bd9722a8a1f4414242c39a117..ad7664ca231a46621c7acfed2392ecb6125b01a6 100644 (file)
--- a/nscd/nscd_getai.c
+++ b/nscd/nscd_getai.c
@@ -119,8 +119,7 @@ __nscd_getai (const char *key, struct nscd_ai_result **result, int *h_errnop)
       if (respdata == NULL)
        {
          /* Read the data from the socket.  */
-         if ((size_t) TEMP_FAILURE_RETRY (__read (sock, resultbuf + 1,
-                                                  datalen)) == datalen)
+         if ((size_t) __readall (sock, resultbuf + 1, datalen) == datalen)
            {
              retval = 0;
              *result = resultbuf;

diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c
index 282912db3e5dee8d731ceadc44c38ef0426f1528..a025cf53ca0b45bf7dfdfeabd85d03f3a4e67b8a 100644 (file)
--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@@ -202,7 +202,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
          total_len = vec[0].iov_len + vec[1].iov_len;
 
          /* Get this data.  */
-         size_t n = TEMP_FAILURE_RETRY (__readv (sock, vec, 2));
+         size_t n = __readvall (sock, vec, 2);
          if (__builtin_expect (n != total_len, 0))
            goto out_close;
        }
@@ -232,8 +232,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
       retval = 0;
       if (gr_name == NULL)
        {
-         size_t n = TEMP_FAILURE_RETRY (__read (sock, resultbuf->gr_mem[0],
-                                                total_len));
+         size_t n = __readall (sock, resultbuf->gr_mem[0], total_len);
          if (__builtin_expect (n != total_len, 0))
            {
              /* The `errno' to some value != ERANGE.  */

diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
index 2d6fdb06271c92ade49cdadf0918c27b5ca90816..e13e2ed106d979203cfaa534393af5e76943b1a5 100644 (file)
--- a/nscd/nscd_gethst_r.c
+++ b/nscd/nscd_gethst_r.c
@@ -299,8 +299,7 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type,
              ++n;
            }
 
-         if ((size_t) TEMP_FAILURE_RETRY (__readv (sock, vec, n))
-             != total_len)
+         if ((size_t) __readvall (sock, vec, n) != total_len)
            goto out_close;
        }
       else
@@ -329,9 +328,8 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type,
       /* And finally read the aliases.  */
       if (addr_list == NULL)
        {
-         if ((size_t) TEMP_FAILURE_RETRY (__read (sock,
-                                                  resultbuf->h_aliases[0],
-                                                  total_len)) == total_len)
+         if ((size_t) __readall (sock, resultbuf->h_aliases[0], total_len)
+             == total_len)
            {
              retval = 0;
              *result = resultbuf;

diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index fe5fb43ca1001265125450b82deb1b0ace80f1b1..d492b67f7898458aec707b65a538e23cd9cdb3bd 100644 (file)
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -172,7 +172,7 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
       retval = 0;
       if (pw_name == NULL)
        {
-         ssize_t nbytes = TEMP_FAILURE_RETRY (__read (sock, buffer, total));
+         ssize_t nbytes = __readall (sock, buffer, total);
 
          if (__builtin_expect (nbytes != total, 0))
            {

diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index 0e16cb8aeb6b5b21fd04898c67a4c0706b641c2d..12c10664af3ec6ffbeb2c5f00023ad473ff6b64e 100644 (file)
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -34,6 +34,64 @@
 #include "nscd-client.h"
 
 
+ssize_t
+__readall (int fd, void *buf, size_t len)
+{
+  size_t n = len;
+  ssize_t ret;
+  do
+    {
+      ret = TEMP_FAILURE_RETRY (__read (fd, buf, n));
+      if (ret <= 0)
+       break;
+      buf = (char *) buf + ret;
+      n -= ret;
+    }
+  while (n > 0);
+  return ret < 0 ? ret : len - n;
+}
+
+
+ssize_t
+__readvall (int fd, const struct iovec *iov, int iovcnt)
+{
+  ssize_t ret = TEMP_FAILURE_RETRY (__readv (fd, iov, iovcnt));
+  if (ret <= 0)
+    return ret;
+
+  size_t total = 0;
+  for (int i = 0; i < iovcnt; ++i)
+    total += iov[i].iov_len;
+
+  if (ret < total)
+    {
+      struct iovec iov_buf[iovcnt];
+      ssize_t r = ret;
+
+      struct iovec *iovp = memcpy (iov_buf, iov, iovcnt * sizeof (*iov));
+      do
+       {
+         while (iovp->iov_len <= r)
+           {
+             r -= iovp->iov_len;
+             --iovcnt;
+             ++iovp;
+           }
+         iovp->iov_base = (char *) iovp->iov_base + r;
+         iovp->iov_len -= r;
+         r = TEMP_FAILURE_RETRY (__readv (fd, iovp, iovcnt));
+         if (r <= 0)
+           break;
+         ret += r;
+       }
+      while (ret < total);
+      if (r < 0)
+       ret = r;
+    }
+  return ret;
+}
+
+
 static int
 open_socket (void)
 {

diff --git a/nscd/nscd_initgroups.c b/nscd/nscd_initgroups.c
index a25f1fbcd7696488e8a0aae23ac5ccac8459739e..947414eb9e08d697370b1305d06087ba712c6676 100644 (file)
--- a/nscd/nscd_initgroups.c
+++ b/nscd/nscd_initgroups.c
@@ -110,9 +110,8 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size,
       if (respdata == NULL)
        {
          /* Read the data from the socket.  */
-         if ((size_t) TEMP_FAILURE_RETRY (__read (sock, *groupsp,
-                                                  initgr_resp->ngrps
-                                                  * sizeof (gid_t)))
+         if ((size_t) __readall (sock, *groupsp, initgr_resp->ngrps
+                                                 * sizeof (gid_t))
              == initgr_resp->ngrps * sizeof (gid_t))
            retval = initgr_resp->ngrps;
        }

diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
index 49fc71491cc42796c79bb387bccae4f5ae9b76e8..010cf0c65bd7cf5c6699d0c7cbb079cfa9526710 100644 (file)
--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
@@ -287,7 +287,7 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
             unnecessarily let the receiver wait.  */
          assert (fd != -1);
 
-         written = TEMP_FAILURE_RETRY (write (fd, &dataset->resp, total));
+         written = writeall (fd, &dataset->resp, total);
        }