diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-10-30 17:58:03 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-10-30 17:58:03 +0000 |
commit | bcc37abc0abd384886ad532b3e13c3c9579da0c1 (patch) | |
tree | e67f114b1e2098264a6737bdb79cfaa248b4e0b2 /libc/nscd | |
parent | 7bda88f34e2e6e190fe3d0ab32750f8a2cb89a2d (diff) |
Merge changes between r9152 and r9169 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@9170 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nscd')
-rw-r--r-- | libc/nscd/aicache.c | 6 | ||||
-rw-r--r-- | libc/nscd/dbg_log.c | 17 | ||||
-rw-r--r-- | libc/nscd/grpcache.c | 6 | ||||
-rw-r--r-- | libc/nscd/hstcache.c | 2 | ||||
-rw-r--r-- | libc/nscd/initgrcache.c | 6 | ||||
-rw-r--r-- | libc/nscd/pwdcache.c | 6 |
6 files changed, 26 insertions, 17 deletions
diff --git a/libc/nscd/aicache.c b/libc/nscd/aicache.c index 524c0a63a..992357d2f 100644 --- a/libc/nscd/aicache.c +++ b/libc/nscd/aicache.c @@ -453,13 +453,13 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, { assert (db->wr_fd != -1); assert ((char *) &dataset->resp > (char *) db->data); - assert ((char *) &dataset->resp - (char *) db->head + total + assert ((char *) dataset - (char *) db->head + total <= (sizeof (struct database_pers_head) + db->head->module * sizeof (ref_t) + db->head->data_size)); ssize_t written; written = sendfileall (fd, db->wr_fd, (char *) &dataset->resp - - (char *) db->head, total); + - (char *) db->head, dataset->head.recsize); # ifndef __ASSUME_SENDFILE if (written == -1 && errno == ENOSYS) goto use_write; @@ -470,7 +470,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req, use_write: # endif #endif - writeall (fd, &dataset->resp, total); + writeall (fd, &dataset->resp, dataset->head.recsize); } goto out; diff --git a/libc/nscd/dbg_log.c b/libc/nscd/dbg_log.c index 5e192c97d..fa99dac88 100644 --- a/libc/nscd/dbg_log.c +++ b/libc/nscd/dbg_log.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998, 2000, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (c) 1998, 2000, 2004, 2005, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998. @@ -53,14 +53,23 @@ void dbg_log (const char *fmt,...) { va_list ap; - char msg[512], msg2[512]; + char msg2[512]; va_start (ap, fmt); - vsnprintf (msg2, sizeof (msg), fmt, ap); + vsnprintf (msg2, sizeof (msg2), fmt, ap); if (debug_level > 0) { - snprintf (msg, sizeof (msg), "%d: %s%s", getpid (), msg2, + time_t t = time (NULL); + + struct tm now; + localtime_r (&t, &now); + + char buf[256]; + strftime (buf, sizeof (buf), "%c", &now); + + char msg[512]; + snprintf (msg, sizeof (msg), "%s - %d: %s%s", buf, getpid (), msg2, msg2[strlen (msg2) - 1] == '\n' ? "" : "\n"); if (dbgout) { diff --git a/libc/nscd/grpcache.c b/libc/nscd/grpcache.c index 184d53898..bd101c675 100644 --- a/libc/nscd/grpcache.c +++ b/libc/nscd/grpcache.c @@ -295,14 +295,14 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req, { assert (db->wr_fd != -1); assert ((char *) &dataset->resp > (char *) db->data); - assert ((char *) &dataset->resp - (char *) db->head + assert ((char *) dataset - (char *) db->head + total <= (sizeof (struct database_pers_head) + db->head->module * sizeof (ref_t) + db->head->data_size)); written = sendfileall (fd, db->wr_fd, (char *) &dataset->resp - - (char *) db->head, total); + - (char *) db->head, dataset->head.recsize); # ifndef __ASSUME_SENDFILE if (written == -1 && errno == ENOSYS) goto use_write; @@ -313,7 +313,7 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req, use_write: # endif #endif - written = writeall (fd, &dataset->resp, total); + written = writeall (fd, &dataset->resp, dataset->head.recsize); } /* Add the record to the database. But only if it has not been diff --git a/libc/nscd/hstcache.c b/libc/nscd/hstcache.c index 51e227396..228f6fd8a 100644 --- a/libc/nscd/hstcache.c +++ b/libc/nscd/hstcache.c @@ -337,7 +337,7 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req, { assert (db->wr_fd != -1); assert ((char *) &dataset->resp > (char *) db->data); - assert ((char *) &dataset->resp - (char *) db->head + assert ((char *) dataset - (char *) db->head + total <= (sizeof (struct database_pers_head) + db->head->module * sizeof (ref_t) diff --git a/libc/nscd/initgrcache.c b/libc/nscd/initgrcache.c index c33aaf315..8195b6609 100644 --- a/libc/nscd/initgrcache.c +++ b/libc/nscd/initgrcache.c @@ -350,14 +350,14 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, { assert (db->wr_fd != -1); assert ((char *) &dataset->resp > (char *) db->data); - assert ((char *) &dataset->resp - (char *) db->head + assert ((char *) dataset - (char *) db->head + total <= (sizeof (struct database_pers_head) + db->head->module * sizeof (ref_t) + db->head->data_size)); written = sendfileall (fd, db->wr_fd, (char *) &dataset->resp - - (char *) db->head, total); + - (char *) db->head, dataset->head.recsize); # ifndef __ASSUME_SENDFILE if (written == -1 && errno == ENOSYS) goto use_write; @@ -368,7 +368,7 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, use_write: # endif #endif - written = writeall (fd, &dataset->resp, total); + written = writeall (fd, &dataset->resp, dataset->head.recsize); } diff --git a/libc/nscd/pwdcache.c b/libc/nscd/pwdcache.c index 2338e7e1e..75f2221e8 100644 --- a/libc/nscd/pwdcache.c +++ b/libc/nscd/pwdcache.c @@ -290,14 +290,14 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, { assert (db->wr_fd != -1); assert ((char *) &dataset->resp > (char *) db->data); - assert ((char *) &dataset->resp - (char *) db->head + assert ((char *) dataset - (char *) db->head + total <= (sizeof (struct database_pers_head) + db->head->module * sizeof (ref_t) + db->head->data_size)); written = sendfileall (fd, db->wr_fd, (char *) &dataset->resp - - (char *) db->head, total); + - (char *) db->head, dataset->head.recsize ); # ifndef __ASSUME_SENDFILE if (written == -1 && errno == ENOSYS) goto use_write; @@ -308,7 +308,7 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, use_write: # endif #endif - written = writeall (fd, &dataset->resp, total); + written = writeall (fd, &dataset->resp, dataset->head.recsize); } |