diff options
26 files changed, 438 insertions, 45 deletions
diff --git a/libc/ChangeLog b/libc/ChangeLog index c0dcf2de3..0ea85f907 100644 --- a/libc/ChangeLog +++ b/libc/ChangeLog @@ -1,3 +1,77 @@ +2008-07-06 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * sysdeps/mach/hurd/open.c: Include <stdio.h>. + (__open_2): New function. + (__open64_2): New alias to __open_2. + * sysdeps/mach/hurd/openat.c: Include <stdio.h>. + (__openat_2): New function. + (__openat64_2): New alias to __openat_2. + +2008-07-06 Ulrich Drepper <drepper@redhat.com> + + [BZ #6723] + * time/mktime.c (__mktime_internal): Normalize tp->tm_isdst value. + +2008-07-01 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * sysdeps/unix/bsd/bsd4.4/bits/socket.h: Define MSG_NOSIGNAL. + * hurd/hurd/fd.h (__hurd_sockfail): Add extern inline function. + * sysdeps/mach/hurd/recv.c (__recv): Use __hurd_sockfail instead of + __hurd_dfail. + * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise. + * sysdeps/mach/hurd/recvmsg.c (__recvmsg): Likewise. + * sysdeps/mach/hurd/send.c (__send): Likewise. + * 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] + * time/strptime_l.c: Don't clear s.era_cnt after successful match + of %EY. + Patch by Petr Baudis. + +2008-06-26 Ulrich Drepper <drepper@redhat.com> + + * resolv/res_debug.c (__p_type_syms): Add ns_t_dname entry. + Patch by Peter Jones <pjones@redhat.com>. + +2008-06-25 Ulrich Drepper <drepper@redhat.com> + + [BZ #6654] + * stdlib/canonicalize.c (__realpath): readlink can write too much + into the buffer on platforms without PATH_MAX. + +2008-06-17 Carlos O'Donell <carlos@codesourcery.com> + + [BZ #6653] + * posix/tst-regex.c (main): Rename to... + (do_test): ... this. Remove cmdline option processing. + (TIMEOUT): Define. + (TEST_FUNCTION): Define. + (CMDLINE_OPTIONS): Define. + +2008-06-25 Ulrich Drepper <drepper@redhat.com> + + [BZ #5210] + * configure.in: Add -Werror to -fstack-protector test to catch + unsupported architectures. + Patch by Gilles Esponasse <g.esp@free.fr>. + +2008-06-17 Joseph Myers <joseph@codesourcery.com> + + * stdlib/tst-setcontext.c: Set back_in_main before exit if + getcontext returns ENOSYS. + 2008-06-18 Ulrich Drepper <drepper@redhat.com> * nscd/connections.c (main_loop_poll): Fix test for read error. diff --git a/libc/configure b/libc/configure index 2b7f0da0e..0f08d121b 100755 --- a/libc/configure +++ b/libc/configure @@ -5926,7 +5926,7 @@ else int foo; main () { return 0;} EOF -if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fstack-protector +if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Werror -fstack-protector -o conftest conftest.c 1>&5' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 diff --git a/libc/configure.in b/libc/configure.in index 3129ba9fd..4af921126 100644 --- a/libc/configure.in +++ b/libc/configure.in @@ -1632,7 +1632,7 @@ cat > conftest.c <<EOF int foo; main () { return 0;} EOF -if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fstack-protector +if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Werror -fstack-protector -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD]) then libc_cv_ssp=yes diff --git a/libc/hurd/fd-read.c b/libc/hurd/fd-read.c index 55dbc24e9..388a4dbaf 100644 --- a/libc/hurd/fd-read.c +++ b/libc/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/libc/hurd/get-host.c b/libc/hurd/get-host.c index bebad892c..3fe0b3ef7 100644 --- a/libc/hurd/get-host.c +++ b/libc/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/libc/hurd/hurd/fd.h b/libc/hurd/hurd/fd.h index 08d4407e8..d1aa867cb 100644 --- a/libc/hurd/hurd/fd.h +++ b/libc/hurd/hurd/fd.h @@ -27,6 +27,7 @@ #include <hurd/hurd_types.h> #include <hurd/port.h> +#include <sys/socket.h> /* Structure representing a file descriptor. */ @@ -179,6 +180,18 @@ __hurd_dfail (int fd, error_t err) errno = _hurd_fd_error (fd, err); return -1; } + +/* Likewise, but do not raise SIGPIPE on EPIPE if flags contain + MSG_NOSIGNAL. */ + +_HURD_FD_H_EXTERN_INLINE int +__hurd_sockfail (int fd, int flags, error_t err) +{ + if (!(flags & MSG_NOSIGNAL) || err != EPIPE) + err = _hurd_fd_error (fd, err); + errno = err; + return -1; +} /* Set up *FD to have PORT its server port, doing appropriate ctty magic. Does no locking or unlocking. */ diff --git a/libc/localedata/ChangeLog b/libc/localedata/ChangeLog index 1863ce0ce..1d3e10fc3 100644 --- a/libc/localedata/ChangeLog +++ b/libc/localedata/ChangeLog @@ -1,3 +1,23 @@ +2008-06-27 Ulrich Drepper <drepper@redhat.com> + + * tst-strptime.c (do_test): Add test of %EY. + +2008-06-25 Ulrich Drepper <drepper@redhat.com> + + * tst-strptime.c (do_test): Add test for parsing era year + representation. + + [BZ #5911] + * locales/es_CR: Define first_weekday and first_workday. + + [BZ #5814] + * locales/fi_FI: Fix separator for hours, minutes, and seconds. + +2008-06-24 Ulrich Drepper <drepper@redhat.com> + + * locales/iso14651_t1_common: Add support for Gurumukhi script. + Patch by Pravin Satpute <psatpute@redhat.com>. + 2008-05-21 Ulrich Drepper <drepper@redhat.com> * locales/iso14651_t1_common: Remove U0C0D entry added for Telugu. diff --git a/libc/localedata/locales/es_CR b/libc/localedata/locales/es_CR index 753b22b05..d582a20d9 100644 --- a/libc/localedata/locales/es_CR +++ b/libc/localedata/locales/es_CR @@ -113,6 +113,8 @@ t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U002 date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0025><U005A><U0020><U0025><U0059>" +first_weekday 1 +first_workday 2 END LC_TIME LC_PAPER diff --git a/libc/localedata/locales/fi_FI b/libc/localedata/locales/fi_FI index 9ffe8f103..a7920acb1 100644 --- a/libc/localedata/locales/fi_FI +++ b/libc/localedata/locales/fi_FI @@ -193,13 +193,15 @@ mon "<U0074><U0061><U006D><U006D><U0069><U006B><U0075><U0075>";/ "<U006D><U0061><U0072><U0072><U0061><U0073><U006B><U0075><U0075>";/ "<U006A><U006F><U0075><U006C><U0075><U006B><U0075><U0075>" d_t_fmt "<U0025><U0061><U0020><U0025><U0065><U002E><U0020><U0025><U0042>/ -<U0074><U0061><U0020><U0025><U0059><U0020><U0025><U0054>" +<U0074><U0061><U0020><U0025><U0059><U0020><U0025><U0048><U002E><U0025>/ +<U004D><U002E><U0025><U0053>" d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>" -t_fmt "<U0025><U0054>" +t_fmt "<U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>" am_pm "";"" t_fmt_ampm "" date_fmt "<U0025><U0061><U0020><U0025><U002D><U0064><U002E><U0025>/ -<U002D><U006D><U002E><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U007A>" +<U002D><U006D><U002E><U0025><U0059><U0020><U0025><U0048><U002E><U0025>/ +<U004D><U002E><U0025><U0053><U0020><U0025><U007A>" first_weekday 2 % Monday first_workday 2 % Monday END LC_TIME diff --git a/libc/localedata/locales/iso14651_t1_common b/libc/localedata/locales/iso14651_t1_common index fcbd897f0..35c0af0b2 100644 --- a/libc/localedata/locales/iso14651_t1_common +++ b/libc/localedata/locales/iso14651_t1_common @@ -63,6 +63,7 @@ script <GEORGIAN> script <DEVANAGARI> script <GUJARATI> script <TELUGU> +script <GURUMUKHI> # Déclaration des symboles internes / Declaration of internal symbols # @@ -742,6 +743,79 @@ collating-symbol <t-halant> collating-symbol <t-lenghtmark> collating-symbol <t-ailenghtmark> +#<GURUMUKHI> +# +# pm - denotes panjabi matras +# pvw - panjabi denotes vowels +# pavd - denotes panjabi vowel modifier +# PNKT - Punjabi Nukta + +# defning symbols +collating-symbol <PNKT> +collating-symbol <adi-shakti> +collating-symbol <onkar> +collating-symbol <ura> +collating-symbol <pavw-u> +collating-symbol <pavw-uu> +collating-symbol <pavw-o> +collating-symbol <pavw-a> +collating-symbol <pavw-aa> +collating-symbol <pavw-ai> +collating-symbol <pavw-au> +collating-symbol <iri> +collating-symbol <pavw-i> +collating-symbol <pavw-ii> +collating-symbol <pavw-e> +collating-symbol <pa-sa> +collating-symbol <pa-ha> +collating-symbol <pa-udatta> +collating-symbol <pa-ka> +collating-symbol <pa-kha> +collating-symbol <pa-ga> +collating-symbol <pa-gha> +collating-symbol <pa-nga> +collating-symbol <pa-ca> +collating-symbol <pa-cha> +collating-symbol <pa-ja> +collating-symbol <pa-jha> +collating-symbol <pa-nya> +collating-symbol <pa-tta> +collating-symbol <pa-ttha> +collating-symbol <pa-dda> +collating-symbol <pa-ddha> +collating-symbol <pa-nna> +collating-symbol <pa-ta> +collating-symbol <pa-tha> +collating-symbol <pa-da> +collating-symbol <pa-dha> +collating-symbol <pa-na> +collating-symbol <pa-pa> +collating-symbol <pa-pha> +collating-symbol <pa-ba> +collating-symbol <pa-bha> +collating-symbol <pa-ma> +collating-symbol <pa-ya> +collating-symbol <sign-yakash> +collating-symbol <pa-ra> +collating-symbol <pa-la> +collating-symbol <pa-va> +collating-symbol <pa-rra> +collating-symbol <pam-aa> +collating-symbol <pam-i> +collating-symbol <pam-ii> +collating-symbol <pam-u> +collating-symbol <pam-uu> +collating-symbol <pam-e> +collating-symbol <pam-ai> +collating-symbol <pam-o> +collating-symbol <pam-au> +collating-symbol <pavd-adakbindi> +collating-symbol <pavd-bindi> +collating-symbol <pavd-visarg> +collating-symbol <tippi> +collating-symbol <adak> +collating-symbol <pa-halant> + # Ordre des symboles internes / Order of internal symbols # # SYMB. N° @@ -1413,6 +1487,76 @@ collating-symbol <t-ailenghtmark> <t-lenghtmark> <t-ailenghtmark> +# +# <GURUMUKHI> +# +# collation weights in order + +<PNKT> +<adak> +<adi-shakti> +<onkar> +<ura> +<pavw-u> +<pavw-uu> +<pavw-o> +<pavw-a> +<pavw-aa> +<pavw-ai> +<pavw-au> +<iri> +<pavw-i> +<pavw-ii> +<pavw-e> +<pa-sa> +<pa-ha> +<pa-udatta> +<pa-ka> +<pa-kha> +<pa-ga> +<pa-gha> +<pa-nga> +<pa-ca> +<pa-cha> +<pa-ja> +<pa-jha> +<pa-nya> +<pa-tta> +<pa-ttha> +<pa-dda> +<pa-ddha> +<pa-nna> +<pa-ta> +<pa-tha> +<pa-da> +<pa-dha> +<pa-na> +<pa-pa> +<pa-pha> +<pa-ba> +<pa-bha> +<pa-ma> +<pa-ya> +<sign-yakash> +<pa-ra> +<pa-la> +<pa-va> +<pa-rra> +<pam-aa> +<pam-i> +<pam-ii> +<pam-u> +<pam-uu> +<pam-e> +<pam-ai> +<pam-o> +<pam-au> +<pavd-adakbindi> +<pavd-bindi> +<pavd-visarg> +<tippi> +<pa-halant> + order_start <SPECIAL>;forward;backward;forward;forward,position # # Tout caractère non précisément défini sera considéré comme caractère spécial @@ -3472,6 +3616,88 @@ order_start <TELUGU>;forward;forward;forward;forward,position <U0C55> <t-lenghtmark>;<BAS>;<MIN>;IGNORE <U0C56> <t-ailenghtmark>;<BAS>;<MIN>;IGNORE +order_start <GURUMUKHI>;forward;forward;forward;forward,position +<U0A66> <0>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0A67> <1>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0A68> <2>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0A69> <3>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0A6A> <4>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0A6B> <5>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0A6C> <6>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0A6D> <7>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0A6E> <8>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U0A6F> <9>;"<BAS><NUM>";"<MIN><MIN>";IGNORE +<U262c> <adi-shakti>;<BAS>;<MIN>;IGNORE +<U0A74> <onkar>;<BAS>;<MIN>;IGNORE +<U0A73> <ura>;<BAS>;<MIN>;IGNORE +<U0A09> <pavw-u> ;<BAS>;<MIN>;IGNORE +<U0A0A> <pavw-uu>;<BAS>;<MIN>;IGNORE +<U0A13> <pavw-o>;<BAS>;<MIN>;IGNORE +<U0A05> <pavw-a> ;<BAS>;<MIN>;IGNORE +<U0A06> <pavw-aa> ;<BAS>;<MIN>;IGNORE +<U0A10> <pavw-ai>;<BAS>;<MIN>;IGNORE +<U0A14> <pavw-au>;<BAS>;<MIN>;IGNORE +<U0A72> <iri>;<BAS>;<MIN>;IGNORE +<U0A07> <pavw-i> ;<BAS>;<MIN>;IGNORE +<U0A08> <pavw-ii> ;<BAS>;<MIN>;IGNORE +<U0A0F> <pavw-e>;<BAS>;<MIN>;IGNORE +<U0A38> <pa-sa>;<BAS>;<MIN>;IGNORE +<U0A36> <pa-sa>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE +<U0A39> <pa-ha>;<BAS>;<MIN>;IGNORE +<U0A51> <pa-udatta>;<BAS>;<MIN>;IGNORE +<U0A15> <pa-ka>;<BAS>;<MIN>;IGNORE +<U0A16> <pa-kha>;<BAS>;<MIN>;IGNORE +<U0A59> <pa-kha>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE +<U0A17> <pa-ga>;<BAS>;<MIN>;IGNORE +<U0A5A> <pa-ga>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE +<U0A18> <pa-gha>;<BAS>;<MIN>;IGNORE +<U0A19> <pa-nga>;<BAS>;<MIN>;IGNORE +<U0A1A> <pa-ca>;<BAS>;<MIN>;IGNORE +<U0A1B> <pa-cha>;<BAS>;<MIN>;IGNORE +<U0A1C> <pa-ja>;<BAS>;<MIN>;IGNORE +<U0A5B> <pa-ja>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE +<U0A1D> <pa-jha>;<BAS>;<MIN>;IGNORE +<U0A1E> <pa-nya>;<BAS>;<MIN>;IGNORE +<U0A1F> <pa-tta>;<BAS>;<MIN>;IGNORE +<U0A20> <pa-ttha>;<BAS>;<MIN>;IGNORE +<U0A21> <pa-dda>;<BAS>;<MIN>;IGNORE +<U0A22> <pa-ddha>;<BAS>;<MIN>;IGNORE +<U0A23> <pa-nna>;<BAS>;<MIN>;IGNORE +<U0A24> <pa-ta>;<BAS>;<MIN>;IGNORE +<U0A25> <pa-tha>;<BAS>;<MIN>;IGNORE +<U0A26> <pa-da>;<BAS>;<MIN>;IGNORE +<U0A27> <pa-dha>;<BAS>;<MIN>;IGNORE +<U0A28> <pa-na>;<BAS>;<MIN>;IGNORE +<U0A2A> <pa-pa>;<BAS>;<MIN>;IGNORE +<U0A2B> <pa-pha>;<BAS>;<MIN>;IGNORE +<U0A5E> <pa-pha>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE +<U0A2C> <pa-ba>;<BAS>;<MIN>;IGNORE +<U0A2D> <pa-bha>;<BAS>;<MIN>;IGNORE +<U0A2E> <pa-ma>;<BAS>;<MIN>;IGNORE +<U0A2F> <pa-ya>;<BAS>;<MIN>;IGNORE +<U0A75> <sign-yakash>;<BAS>;<MIN>;IGNORE +<U0A30> <pa-ra>;<BAS>;<MIN>;IGNORE +<U0A32> <pa-la>;<BAS>;<MIN>;IGNORE +<U0A33> <pa-la>;"<BAS><PNKT>";"<MIN><MIN>";IGNORE +<U0A35> <pa-va>;<BAS>;<MIN>;IGNORE +<U0A5C> <pa-rra>;<BAS>;<MIN>;IGNORE +<U0A3E> <pam-aa>;<BAS>;<MIN>;IGNORE +<U0A3F> <pam-i>;<BAS>;<MIN>;IGNORE +<U0A40> <pam-ii>;<BAS>;<MIN>;IGNORE +<U0A41> <pam-u>;<BAS>;<MIN>;IGNORE +<U0A42> <pam-uu>;<BAS>;<MIN>;IGNORE +<U0A47> <pam-e>;<BAS>;<MIN>;IGNORE +<U0A48> <pam-ai>;<BAS>;<MIN>;IGNORE +<U0A4B> <pam-o>;<BAS>;<MIN>;IGNORE +<U0A4C> <pam-au>;<BAS>;<MIN>;IGNORE +<U0A01> <pavd-adakbindi>;<BAS>;<MIN>;IGNORE +<U0A02> <pavd-bindi>;<BAS>;<MIN>;IGNORE +<U0A03> <pavd-visarg>;<BAS>;<MIN>;IGNORE +<U0A70> <tippi>;<BAS>;<MIN>;IGNORE +<U0A4D> <pa-halant>;<BAS>;<MIN>;IGNORE +<U0A3C> IGNORE;<PNKT>;<MIN>;IGNORE +<U0A71> IGNORE;<adak>;<MIN>;IGNORE + order_end END LC_COLLATE diff --git a/libc/localedata/tst-strptime.c b/libc/localedata/tst-strptime.c index b5ab232d7..bc2c7f1b6 100644 --- a/libc/localedata/tst-strptime.c +++ b/libc/localedata/tst-strptime.c @@ -1,22 +1,53 @@ #include <locale.h> #include <time.h> #include <stdio.h> +#include <string.h> static int do_test (void) { + int result = 0; + if (setlocale (LC_ALL, "vi_VN.TCVN5712-1") == NULL) { puts ("cannot set locale"); return 1; } struct tm tm; + memset (&tm, '\0', sizeof (tm)); /* This is November in Vietnamese encoded using TCVN5712-1. */ static const char s[] = "\ -\x54\x68\xb8\x6e\x67\x20\x6d\xad\xea\x69\x20\x6d\xe9\x74"; +\x54\x68\xb8\x6e\x67\x20\x6d\xad\xea\x69\x20\x6d\xe9\x74\0"; char *r = strptime (s, "%b", &tm); printf ("r = %p, r-s = %tu, tm.tm_mon = %d\n", r, r - s, tm.tm_mon); - return r == NULL || r - s != 14 || tm.tm_mon != 10; + result = r == NULL || r - s != 14 || tm.tm_mon != 10; + + if (setlocale (LC_ALL, "ja_JP.UTF-8") == NULL) + { + puts ("cannot set locale"); + return 1; + } + static const char s2[] = "\ +\x32\x35\x20\x30\x36\x20\xe5\xb9\xb3\xe6\x88\x90\x32\x30\0"; + memset (&tm, '\0', sizeof (tm)); + r = strptime (s2, "%d %m %EC%Ey", &tm); + printf ("\ +r = %p, r-s2 = %tu, tm.tm_mday = %d, tm.tm_mon = %d, tm.tm_year = %d\n", + r, r - s2, tm.tm_mday, tm.tm_mon, tm.tm_year); + result |= (r == NULL || r - s2 != 14 || tm.tm_mday != 25 || tm.tm_mon != 5 + || tm.tm_year != 108); + + static const char s3[] = "\ +\x32\x35\x20\x30\x36\x20\xe5\xb9\xb3\xe6\x88\x90\x32\x30\xe5\xb9\xb4\0"; + memset (&tm, '\0', sizeof (tm)); + r = strptime (s3, "%d %m %EY", &tm); + printf ("\ +r = %p, r-s3 = %tu, tm.tm_mday = %d, tm.tm_mon = %d, tm.tm_year = %d\n", + r, r - s3, tm.tm_mday, tm.tm_mon, tm.tm_year); + result |= (r == NULL || r - s3 != 17 || tm.tm_mday != 25 || tm.tm_mon != 5 + || tm.tm_year != 108); + + return result; } #define TEST_FUNCTION do_test () diff --git a/libc/posix/tst-regex.c b/libc/posix/tst-regex.c index 6a71e1239..a7fba698f 100644 --- a/libc/posix/tst-regex.c +++ b/libc/posix/tst-regex.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2003, 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 @@ -55,8 +55,8 @@ static int run_test_backwards (const char *expr, const char *mem, size_t memlen, int icase, int expected); -int -main (int argc, char *argv[]) +static int +do_test (void) { const char *file; int fd; @@ -66,16 +66,9 @@ main (int argc, char *argv[]) char *outmem; size_t inlen; size_t outlen; - static const struct option options[] = - { - {"timing",no_argument, &timing, 1 }, - {NULL, 0, NULL, 0 } - }; mtrace (); - while (getopt_long (argc, argv, "", options, NULL) >= 0); - /* Make the content of the file available in memory. */ file = "../ChangeLog.8"; fd = open (file, O_RDONLY); @@ -506,3 +499,10 @@ run_test_backwards (const char *expr, const char *mem, size_t memlen, expect. */ return cnt != expected; } + +/* If --timing is used we will need a larger timout. */ +#define TIMEOUT 50 +#define CMDLINE_OPTIONS \ + {"timing", no_argument, &timing, 1 }, +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/libc/resolv/res_debug.c b/libc/resolv/res_debug.c index cd69d4f4d..76fd34bf3 100644 --- a/libc/resolv/res_debug.c +++ b/libc/resolv/res_debug.c @@ -439,6 +439,7 @@ const struct res_sym __p_type_syms[] = { {ns_t_nimloc, "NIMLOC", "NIMROD locator (unimplemented)"}, {ns_t_srv, "SRV", "server selection"}, {ns_t_atma, "ATMA", "ATM address (unimplemented)"}, + {ns_t_dname, "DNAME", "Non-terminal DNAME (for IPv6)"}, {ns_t_tsig, "TSIG", "transaction signature"}, {ns_t_ixfr, "IXFR", "incremental zone transfer"}, {ns_t_axfr, "AXFR", "zone transfer"}, diff --git a/libc/stdlib/canonicalize.c b/libc/stdlib/canonicalize.c index 19808b50d..67e4d0553 100644 --- a/libc/stdlib/canonicalize.c +++ b/libc/stdlib/canonicalize.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2002, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1996-2002,2004,2005,2006,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 @@ -173,7 +173,7 @@ __realpath (const char *name, char *resolved) goto error; } - n = __readlink (rpath, buf, path_max); + n = __readlink (rpath, buf, path_max - 1); if (n < 0) goto error; buf[n] = '\0'; diff --git a/libc/sysdeps/mach/hurd/dl-sysdep.c b/libc/sysdeps/mach/hurd/dl-sysdep.c index 668aaaf8b..244068290 100644 --- a/libc/sysdeps/mach/hurd/dl-sysdep.c +++ b/libc/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/libc/sysdeps/mach/hurd/open.c b/libc/sysdeps/mach/hurd/open.c index bdfed5e31..519789f22 100644 --- a/libc/sysdeps/mach/hurd/open.c +++ b/libc/sysdeps/mach/hurd/open.c @@ -19,6 +19,7 @@ #include <errno.h> #include <fcntl.h> #include <stdarg.h> +#include <stdio.h> #include <hurd.h> #include <hurd/fd.h> @@ -52,8 +53,20 @@ weak_alias (__libc_open, __open) libc_hidden_weak (__open) weak_alias (__libc_open, open) +int +__open_2 (file, oflag) + const char *file; + int oflag; +{ + if (oflag & O_CREAT) + __fortify_fail ("invalid open call: O_CREAT without mode"); + + return __open (file, oflag); +} + /* open64 is just the same as open for us. */ weak_alias (__libc_open, __libc_open64) weak_alias (__libc_open, __open64) libc_hidden_weak (_open64) weak_alias (__libc_open, open64) +strong_alias (__open_2, __open64_2) diff --git a/libc/sysdeps/mach/hurd/openat.c b/libc/sysdeps/mach/hurd/openat.c index 1faf857e1..f0a3404cd 100644 --- a/libc/sysdeps/mach/hurd/openat.c +++ b/libc/sysdeps/mach/hurd/openat.c @@ -21,6 +21,7 @@ #include <fcntl.h> #include <stdarg.h> #include <stddef.h> +#include <stdio.h> #include <sys/stat.h> #include <hurd.h> #include <hurd/fd.h> @@ -56,7 +57,20 @@ __openat (fd, file, oflag) libc_hidden_def (__openat) weak_alias (__openat, openat) +int +__openat_2 (fd, file, oflag) + int fd; + const char *file; + int oflag; +{ + if (oflag & O_CREAT) + __fortify_fail ("invalid openat call: O_CREAT without mode"); + + return __openat (fd, file, oflag); +} + /* openat64 is just the same as openat for us. */ weak_alias (__openat, __openat64) libc_hidden_weak (__openat64) weak_alias (__openat, openat64) +strong_alias (__openat_2, __openat64_2) diff --git a/libc/sysdeps/mach/hurd/recv.c b/libc/sysdeps/mach/hurd/recv.c index b001729d1..0cf6b7ce5 100644 --- a/libc/sysdeps/mach/hurd/recv.c +++ b/libc/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; @@ -48,7 +48,7 @@ __recv (fd, buf, n, flags) &cdata, &clen, &flags, n))) - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); __mach_port_deallocate (__mach_task_self (), addrport); __vm_deallocate (__mach_task_self (), (vm_address_t) cdata, clen); diff --git a/libc/sysdeps/mach/hurd/recvfrom.c b/libc/sysdeps/mach/hurd/recvfrom.c index d5c73f444..2aca5709d 100644 --- a/libc/sysdeps/mach/hurd/recvfrom.c +++ b/libc/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__; @@ -52,7 +52,7 @@ __recvfrom (fd, buf, n, flags, addrarg, addr_len) &cdata, &clen, &flags, n))) - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); /* Get address data for the returned address port if requested. */ if (addr != NULL) @@ -74,7 +74,7 @@ __recvfrom (fd, buf, n, flags, addrarg, addr_len) if (err) { __mach_port_deallocate (__mach_task_self (), addrport); - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); } if (*addr_len > buflen) diff --git a/libc/sysdeps/mach/hurd/recvmsg.c b/libc/sysdeps/mach/hurd/recvmsg.c index c6874e8bd..33897b8ce 100644 --- a/libc/sysdeps/mach/hurd/recvmsg.c +++ b/libc/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; @@ -63,7 +63,7 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags) &ports, &nports, &cdata, &clen, &message->msg_flags, amount))) - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); if (message->msg_name != NULL) { @@ -84,7 +84,7 @@ __libc_recvmsg (int fd, struct msghdr *message, int flags) if (err) { __mach_port_deallocate (__mach_task_self (), aport); - return __hurd_dfail (fd, err); + return __hurd_sockfail (fd, flags, err); } if (message->msg_namelen > buflen) diff --git a/libc/sysdeps/mach/hurd/send.c b/libc/sysdeps/mach/hurd/send.c index 4810cd68c..bb45c5069 100644 --- a/libc/sysdeps/mach/hurd/send.c +++ b/libc/sysdeps/mach/hurd/send.c @@ -38,7 +38,7 @@ __send (fd, buf, n, flags) NULL, MACH_MSG_TYPE_COPY_SEND, 0, NULL, 0, &wrote)); - return err ? __hurd_dfail (fd, err) : wrote; + return err ? __hurd_sockfail (fd, flags, err) : wrote; } libc_hidden_def (__send) weak_alias (__send, send) diff --git a/libc/sysdeps/mach/hurd/sendmsg.c b/libc/sysdeps/mach/hurd/sendmsg.c index 5fdfd734e..a9d1c8c1d 100644 --- a/libc/sysdeps/mach/hurd/sendmsg.c +++ b/libc/sysdeps/mach/hurd/sendmsg.c @@ -149,7 +149,7 @@ __libc_sendmsg (int fd, const struct msghdr *message, int flags) if (dealloc) __vm_deallocate (__mach_task_self (), data.addr, len); - return err ? __hurd_dfail (fd, err) : amount; + return err ? __hurd_sockfail (fd, flags, err) : amount; } weak_alias (__libc_sendmsg, sendmsg) diff --git a/libc/sysdeps/mach/hurd/sendto.c b/libc/sysdeps/mach/hurd/sendto.c index 0a6912a3b..478a5c9a4 100644 --- a/libc/sysdeps/mach/hurd/sendto.c +++ b/libc/sysdeps/mach/hurd/sendto.c @@ -79,7 +79,7 @@ __sendto (int fd, err; })); - return err ? __hurd_dfail (fd, err) : wrote; + return err ? __hurd_sockfail (fd, flags, err) : wrote; } weak_alias (__sendto, sendto) diff --git a/libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h b/libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h index 67db4d846..2ccd01d01 100644 --- a/libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h +++ b/libc/sysdeps/unix/bsd/bsd4.4/bits/socket.h @@ -171,8 +171,10 @@ enum #define MSG_CTRUNC MSG_CTRUNC MSG_WAITALL = 0x40, /* Wait for full request or error. */ #define MSG_WAITALL MSG_WAITALL - MSG_DONTWAIT = 0x80 /* This message should be nonblocking. */ + MSG_DONTWAIT = 0x80, /* This message should be nonblocking. */ #define MSG_DONTWAIT MSG_DONTWAIT + MSG_NOSIGNAL = 0x0400 /* Do not generate SIGPIPE on EPIPE. */ +#define MSG_NOSIGNAL MSG_NOSIGNAL }; diff --git a/libc/time/mktime.c b/libc/time/mktime.c index e299375a1..e47d69615 100644 --- a/libc/time/mktime.c +++ b/libc/time/mktime.c @@ -1,5 +1,5 @@ /* Convert a `struct tm' to a time_t value. - Copyright (C) 1993-1999, 2002-2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2002-2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert <eggert@twinsun.com>. @@ -293,7 +293,9 @@ __mktime_internal (struct tm *tp, int mday = tp->tm_mday; int mon = tp->tm_mon; int year_requested = tp->tm_year; - int isdst = tp->tm_isdst; + /* Normalize the value. */ + int isdst = ((tp->tm_isdst >> (8 * sizeof (tp->tm_isdst) - 1)) + | (tp->tm_isdst != 0)); /* 1 if the previous probe was DST. */ int dst2; diff --git a/libc/time/strptime_l.c b/libc/time/strptime_l.c index c089b30ef..58741b78b 100644 --- a/libc/time/strptime_l.c +++ b/libc/time/strptime_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2004, 2005, 2007, 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 @@ -34,22 +34,13 @@ #endif -#ifndef __P -# if defined __GNUC__ || (defined __STDC__ && __STDC__) -# define __P(args) args -# else -# define __P(args) () -# endif /* GCC. */ -#endif /* Not __P. */ - - #if ! HAVE_LOCALTIME_R && ! defined localtime_r # ifdef _LIBC # define localtime_r __localtime_r # else /* Approximate localtime_r as best we can in its absence. */ # define localtime_r my_localtime_r -static struct tm *localtime_r __P ((const time_t *, struct tm *)); +static struct tm *localtime_r (const time_t *, struct tm *); static struct tm * localtime_r (t, tp) const time_t *t; @@ -956,7 +947,6 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM) else { s.decided = loc; - s.era_cnt = -1; break; } |