summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-04-20 04:56:49 +0000
committerUlrich Drepper <drepper@redhat.com>2008-04-20 04:56:49 +0000
commit0073dd2d49c6c8a2a4b82f71b2172fe361dac26a (patch)
tree127971f349bb65957e144c2ae54cb0f3df00a8a6
parentc52137d39101515cacb67a2bcd43b77bd06284e0 (diff)
downloadglibc-0073dd2d49c6c8a2a4b82f71b2172fe361dac26a.tar.gz
* resolv/res_mkquery.c (__res_nopt): Use NS_PUT16 instead of ns_put16.
-rw-r--r--ChangeLog4
-rw-r--r--resolv/res_mkquery.c12
-rw-r--r--sysdeps/unix/sysv/linux/times.c54
3 files changed, 62 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d7aac2c7e..6355676a5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-19 Ulrich Drepper <drepper@redhat.com>
+
+ * resolv/res_mkquery.c (__res_nopt): Use NS_PUT16 instead of ns_put16.
+
2008-04-15 Ulrich Drepper <drepper@redhat.com>
[BZ #5209]
diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index 3fa597fecd..416bf1c32b 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -238,17 +238,13 @@ __res_nopt(res_state statp,
*cp++ = 0; /* "." */
- ns_put16(T_OPT, cp); /* TYPE */
- cp += INT16SZ;
- ns_put16(anslen & 0xffff, cp); /* CLASS = UDP payload size */
- cp += INT16SZ;
+ NS_PUT16(T_OPT, cp); /* TYPE */
+ NS_PUT16(anslen & 0xffff, cp); /* CLASS = UDP payload size */
*cp++ = NOERROR; /* extended RCODE */
*cp++ = 0; /* EDNS version */
/* XXX Once we support DNSSEC we change the flag value here. */
- ns_put16(flags, cp);
- cp += INT16SZ;
- ns_put16(0, cp); /* RDLEN */
- cp += INT16SZ;
+ NS_PUT16(flags, cp);
+ NS_PUT16(0, cp); /* RDLEN */
hp->arcount = htons(ntohs(hp->arcount) + 1);
return cp - buf;
diff --git a/sysdeps/unix/sysv/linux/times.c b/sysdeps/unix/sysv/linux/times.c
new file mode 100644
index 0000000000..2759683b0b
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/times.c
@@ -0,0 +1,54 @@
+/* Copyright (C) 2008 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ 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.
+
+ 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
+ Lesser General Public License for more details.
+
+ 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. */
+
+#include <errno.h>
+#include <sys/times.h>
+#include <sysdep.h>
+
+
+clock_t
+__times (struct tms *buf)
+{
+ INTERNAL_SYSCALL_DECL (err);
+ clock_t ret = INTERNAL_SYSCALL (times, err, 1, buf);
+ if (INTERNAL_SYSCALL_ERROR_P (ret, err)
+ && __builtin_expect (INTERNAL_SYSCALL_ERRNO (ret, err) == -EFAULT, 0))
+ {
+ /* This might be an error or not. For architectures which have
+ no separate return value and error indicators we cannot
+ distinguish a return value of -1 from an error. Do it the
+ hard way. We crash applications which pass in an invalid BUF
+ pointer. */
+#define touch(v) \
+ do { \
+ clock_t temp = v; \
+ asm volatile ("" : "+r" (temp)); \
+ v = temp; \
+ } while (0)
+ touch (buf->tms_utime);
+ touch (buf->tms_stime);
+ touch (buf->tms_cutime);
+ touch (buf->tms_cstime);
+
+ /* If we come here the memory is valid and the kernel did not
+ return an EFAULT error. Return the value given by the kernel. */
+ }
+
+ return ret;
+}
+weak_alias (__times, times)