From ec4b0518a39f46354c0d75b4c3e2f507c9af261e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 20 Sep 1996 01:58:09 +0000 Subject: update from main archive 960919 Thu Sep 19 21:50:55 1996 Ulrich Drepper * sysdeps/posix/gettimeofday.c (__gettimeofday): Use localtime_r instead of localtime. Reported by Matthias Urlichs. * shlib-versions: Remove version number for libcrypt. * features.h: Define __USE_REENTRANT if _REENTRANT or _THREAD_SAFE. * libc-symbols.h: Define _REENTRANT while compiling libc. * sysdeps/unix/sysv/linux/i386/sysdep.S (__errno_location): Define even if !_LIBC_REENTRANT. * sysdeps/unix/sysv/linux/i386/sysdep.S (__errno_location): Likewise. * sysdeps/posix/cuserid.h: Remove prototype for geteuid(). De-ANSI-fy. * MakeTAGS ($P/libc.pot): Generate correctly formed header. * po/header.pot: Correct title line. * po/nl.po: Update. Thu Sep 19 18:59:55 1996 Ulrich Drepper * Makeconfig (soversions.mk): Prefer shared lib version numbers is add ons over version in libc itself. * sysdeps/unix/sysv/linux/i386/sysdep.S: Include . * sysdeps/unix/sysv/linux/i386/sysdep.h: Prevent multiple inclusion. * libio/iofgets.c: Use __flockfile and __funlockfile instead of _IO_flockfile and _IO_funlockfile resp. * locale/categories.def: Partly support for correct `era' handling in LC_TIME category. * locale/langinfo.h: Likewise. * locale/programs/ld-time.c: Likewise. * locale/localeinfo.h: Change comment a bit. * malloc/memalign.c: Don't use goto, not necessary anymore. 1996-09-18 Paul Eggert * time/mktime.c (ydhms_tm_diff): Work correctly even if year is negative, or if time_t is unsigned. * time/strftime.c (tm_diff): Work correctly even if tm_year is near INT_MIN. Tue Sep 17 16:14:34 1996 Andreas Schwab * sysdeps/m68k/fpu/__math.h (__inline_mathop): Changed to generate all three versions of the math function. (__inline_mathopf, __inline_mathopl): Removed. (__inline_functions): New temporary definition containing all non-trivial inline functions. Wed Sep 18 00:25:41 1996 Ulrich Drepper * time/strftime.c (strftime): The T_FMT_AMPM string may be empty. Tue Sep 17 20:27:18 1996 Ulrich Drepper * math/Makefile (extra-libs-others): Use $(extra-libs) instead of $(extra-libc). Tue Sep 17 17:09:44 1996 Ulrich Drepper * sysdeps/stub/fpu_control.h: Correct end of file comment. Tue Sep 17 05:39:18 1996 Ulrich Drepper * stdio-common/bug3.c, stdio-common/bug4.c, stdio-common/bug5.c, stdio-common/test-popen.c: Remove temporary files after test. * stdio-common/bug5.c: Use `system' instead of `execlp'. Patches by Andreas Jaeger. * stdio-common/bug5.c: Create string for `system' argument to make sure the input and output file names are really correct. Sun Sep 15 12:46:44 1996 Andreas Schwab * configure.in: If $os contains a hyphen add the part before the hyphen to $ostry. Sun Sep 15 18:14:02 1996 Andreas Schwab * sysdeps/m68k/fpu/__math.h (__ieee754_pow, __ieee754_powf, __ieee754_powl): Rename local variable i to __i. (__ieee754_atan2, __ieee754_atan2f, __ieee754_atan2l): New inline functions. * sysdeps/m68k/fpu/e_atan2.c, sysdeps/m68k/fpu/e_atan2f.c, sysdeps/m68k/fpu/e_atan2l.c: New files. 1996-09-15 Paul Eggert * manual/time.texi: Change `range X to Y' to `range X through Y', to avoid ambiguity in English. (strftime): Numbers that do not have a range indicated are not padded. Describe E and O modifiers. %g, %G, %u: New formats. %C, %y, %Y: Describe behavior on negative years. %e: Fix typo (was labeled %d). %l, %V: Fix typo in range. %M, %S, %U, %w, %W: Give ranges. %p: Clarify how noon and midnight are handled for AM and PM. %s: Clarify leap second handling. %r: Now locale-defined. %C, %D, %e, %h, %n, %r, %t, %T: Say that they are POSIX.2 extensions. %z: Say that it is a GNU extension. %Z: Wording fix. * time/strftime.c: (strftime): %V: Fix mishandling of week numbers near year boundaries. %g, %G: New formats (suggested by Arthur David Olson). %U, %W: Use inline expression instead of `week' function. %C, %y: Handle negative years portably. %C, %Y: Use width 1, since values can be arbitrarily wide. %r: Use T_FMT_AMPM format if _NL_CURRENT is defined. %u: New Posix.2 format. %w: Width is 1, not 2. (iso_week_days): New function, for %V, %G, %g. (week): Remove; it didn't handle %V correctly. (__isleap): New macro. (mbsinit): Use arg, to pacify GCC -Wall. 1996-09-13 Paul Eggert * time/strftime.c (strftime): If using the GNU C library, do not bother to check for multibyte encodings, since they're safe in formats. Otherwise: - Check for multibyte encodings when encountering any character that is not in the basic execution character set of the C Standard. - Use mbrlen (if available) instead of mblen, to avoid modifying mblen's internal state. - Do not assume that '%' cannot appear as the first character of a multibyte character sequence, since this is possible when not in the initial shift state. (HAVE_MBRLEN, MULTIBYTE_IS_FORMAT_SAFE): Define if _LIBC is defined. (DO_MULTIBYTE): New macro. (): Do not include. (): Include if HAVE_MBRLEN. (mbstate_t, mbrlen, mbsinit): Define if ! HAVE_MBRLEN. (mbstate_zero): New constant. 1996-09-12 Paul Eggert * time/strftime.c (strftime): Use an empty zone if it can't be determined; POSIX.2 requires this. Use plain `int' for pad and modifier (which now contain char value). Use plain `int' for number_value, to print negative values correctly. Use plain `int' for digits; there was no need to make it unsigned. Initialize subfmt consistently. Remove incorrect code for %EC and %Ey; they aren't implemented yet. For %O, if there is no alternate digit, output Ascii instead of "". Output the `%' of an unknown format; this is most likely the right thing to do if a multibyte string has been misparsed. Thu Sep 12 23:23:13 1996 Andreas Schwab * stdio-common/scanf7.c (main): Remove extra conversion from printf format string. Thu Sep 12 23:01:16 1996 Andreas Schwab * stdlib/test-canon.c (tests): Rename structure member from errno to error, all uses changed. Thu Sep 12 20:08:06 1996 Andreas Schwab * sysdeps/m68k/fpu/__math.h (__ldexp, __ldexpf, __ldexpl): Removed. * sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c, sysdeps/m68k/fpu/s_ldexpl.c: Removed, use generic implementation instead. * sysdeps/m68k/fpu/s_scalbn.c, sysdeps/m68k/fpu/s_scalbnf.c, sysdeps/m68k/fpu/s_scalbnl.c: Replaced with old contents of s_ldexp.c, s_ldexpf.c and s_ldexpl.c, resp., suitably adpted. * sysdeps/m68k/fpu/__math.h (__frexp, __frexpf, __frexpl): Return value must be in [0.5, 1), not [1, 2). Reported by Chris Lawrence. (__ilogb, __ilogbf, __ilogbl): Check for argument being zero. (__scalbn, __scalbnf, __scalbnl): Use second argument directly. Thu Sep 12 19:59:24 1996 Andreas Schwab * sysdeps/libm-ieee754/e_acoshl.c: Fix typos. * sysdeps/libm-ieee754/s_cbrtl.c: Remove unused variable. Thu Sep 12 19:59:24 1996 Andreas Schwab * sysdeps/libm-ieee754/e_acoshl.c: Fix typos. * sysdeps/libm-ieee754/s_cbrtl.c: Remove unused variable. Thu Sep 12 19:56:07 1996 Andreas Schwab * inet/herrno.c (__h_errno_location): Fix return type. Tue Sep 17 10:51:58 1996 Thomas Bushnell, n/BSG * malloc/memalign.c (memalign): Only acquire __libc_malloc_lock for actual modifications to global state. Fri Sep 13 01:21:36 1996 Thomas Bushnell, n/BSG * sysdeps/mach/Makefile (includes): Add -I$(common-objpfx)mach/. * sysdeps/mach/hurd/Makefile (includes): Add -I$(common-objpfx)hurd/. Reported by Marcus Daniels. * sysdeps/generic/schedbits.h (struct sched_param): Renamed from struct sched_params. * sysdeps/stub/sched_setp.c (__sched_setparam): struct sched_params -> struct sched_param. * sysdeps/stub/sched_getp.c (__sched_getparam): Likewise. * sysdeps/stub/sched_sets.c (__sched_setscheduler): Likewise. Thu Sep 12 23:58:25 1996 Thomas Bushnell, n/BSG * sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): Fix syntax error. * stdio-common/Makefile: Put lockfile in routines unconditionally. Define _MT_SAFE_IO if using for libio and compiling reentrant libc. * stdio-common/vfprintf.c (__flockfile, __funlockfile): Declare this always, not just if _LIBC_REENTRANT. (__funlockfile): Don't use weak_extern for this one; __libc_cleanup_region_end might be defined and the use of __funlockfile can't be protected the way the use of __flockfile can be. * sched.h: New file. Helper to access posix/sched.h. Thu Sep 12 12:33:52 1996 Thomas Bushnell, n/BSG * sysdeps/mach/hurd/dl-cache.c: Delete second copy of file accidentally added on. * sysdeps/stub/intr-msg.h: New file. * stdio-common/vfprintf.c: Include . * stdio-common/vfscanf.c: Include . * sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): New macro. (__libc_cleanup_region_end): New macro. --- ChangeLog | 251 ++++- MakeTAGS | 5 +- Makeconfig | 4 +- configure | 47 +- configure.in | 5 + features.h | 4 +- inet/herrno.c | 2 +- libc-symbols.h | 2 + libio/iofgets.c | 4 +- locale/categories.def | 5 +- locale/langinfo.h | 4 + locale/localeinfo.h | 2 +- locale/programs/ld-time.c | 42 +- manual/time.texi | 171 ++-- math/Makefile | 2 +- po/header.pot | 2 +- po/nl.po | 1612 ++++++++++++++++++++++++++++----- shlib-versions | 7 - stdio-common/Makefile | 6 + stdio-common/bug3.c | 4 +- stdio-common/bug4.c | 4 +- stdio-common/bug5.c | 13 +- stdio-common/scanf7.c | 2 +- stdio-common/test-popen.c | 6 +- stdlib/test-canon.c | 6 +- sysdeps/libm-ieee754/e_acoshl.c | 8 +- sysdeps/libm-ieee754/s_cbrtl.c | 1 - sysdeps/m68k/fpu/__math.h | 775 +++++----------- sysdeps/m68k/fpu/s_ldexp.c | 39 - sysdeps/m68k/fpu/s_ldexpf.c | 5 - sysdeps/m68k/fpu/s_ldexpl.c | 5 - sysdeps/m68k/fpu/s_scalbn.c | 38 + sysdeps/m68k/fpu/s_scalbnf.c | 4 + sysdeps/m68k/fpu/s_scalbnl.c | 4 + sysdeps/posix/cuserid.c | 13 +- sysdeps/posix/gettimeofday.c | 2 +- sysdeps/stub/fpu_control.h | 2 +- sysdeps/unix/sysv/linux/i386/sysdep.S | 12 +- sysdeps/unix/sysv/linux/i386/sysdep.h | 5 + sysdeps/unix/sysv/linux/m68k/sysdep.S | 2 - time/mktime.c | 18 +- time/strftime.c | 436 +++++---- 42 files changed, 2462 insertions(+), 1119 deletions(-) delete mode 100644 sysdeps/m68k/fpu/s_ldexp.c delete mode 100644 sysdeps/m68k/fpu/s_ldexpf.c delete mode 100644 sysdeps/m68k/fpu/s_ldexpl.c diff --git a/ChangeLog b/ChangeLog index 98eb138801..cfb7ae8026 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,9 +31,244 @@ Thu Sep 12 23:58:25 1996 Thomas Bushnell, n/BSG __funlockfile can't be protected the way the use of __flockfile can be. +Thu Sep 19 21:50:55 1996 Ulrich Drepper + + * sysdeps/posix/gettimeofday.c (__gettimeofday): Use localtime_r + instead of localtime. + Reported by Matthias Urlichs. + + * shlib-versions: Remove version number for libcrypt. + * features.h: Define __USE_REENTRANT if _REENTRANT or _THREAD_SAFE. + * libc-symbols.h: Define _REENTRANT while compiling libc. + + * sysdeps/unix/sysv/linux/i386/sysdep.S (__errno_location): + Define even if !_LIBC_REENTRANT. + * sysdeps/unix/sysv/linux/i386/sysdep.S (__errno_location): + Likewise. + + * sysdeps/posix/cuserid.h: Remove prototype for geteuid(). + De-ANSI-fy. + + * MakeTAGS ($P/libc.pot): Generate correctly formed header. + * po/header.pot: Correct title line. + * po/nl.po: Update. + +Thu Sep 19 18:59:55 1996 Ulrich Drepper + + * Makeconfig (soversions.mk): Prefer shared lib version numbers + is add ons over version in libc itself. + + * sysdeps/unix/sysv/linux/i386/sysdep.S: Include . + * sysdeps/unix/sysv/linux/i386/sysdep.h: Prevent multiple + inclusion. + + * libio/iofgets.c: Use __flockfile and __funlockfile instead of + _IO_flockfile and _IO_funlockfile resp. + + * locale/categories.def: Partly support for correct `era' handling + in LC_TIME category. + * locale/langinfo.h: Likewise. + * locale/programs/ld-time.c: Likewise. + * locale/localeinfo.h: Change comment a bit. + + * malloc/memalign.c: Don't use goto, not necessary anymore. + +1996-09-18 Paul Eggert + + * time/mktime.c (ydhms_tm_diff): Work correctly even if year + is negative, or if time_t is unsigned. + * time/strftime.c (tm_diff): Work correctly even if tm_year + is near INT_MIN. + +Tue Sep 17 16:14:34 1996 Andreas Schwab + + * sysdeps/m68k/fpu/__math.h (__inline_mathop): Changed to generate + all three versions of the math function. + (__inline_mathopf, __inline_mathopl): Removed. + (__inline_functions): New temporary definition containing all + non-trivial inline functions. + +Wed Sep 18 00:25:41 1996 Ulrich Drepper + + * time/strftime.c (strftime): The T_FMT_AMPM string may be empty. + +Tue Sep 17 20:27:18 1996 Ulrich Drepper + + * math/Makefile (extra-libs-others): Use $(extra-libs) instead + of $(extra-libc). + +Tue Sep 17 17:09:44 1996 Ulrich Drepper + + * sysdeps/stub/fpu_control.h: Correct end of file comment. + +Tue Sep 17 05:39:18 1996 Ulrich Drepper + + * stdio-common/bug3.c, stdio-common/bug4.c, stdio-common/bug5.c, + stdio-common/test-popen.c: Remove temporary files after test. + * stdio-common/bug5.c: Use `system' instead of `execlp'. + Patches by Andreas Jaeger. + + * stdio-common/bug5.c: Create string for `system' argument to + make sure the input and output file names are really correct. + +Sun Sep 15 12:46:44 1996 Andreas Schwab + + * configure.in: If $os contains a hyphen add the part before the + hyphen to $ostry. + +Sun Sep 15 18:14:02 1996 Andreas Schwab + + * sysdeps/m68k/fpu/__math.h (__ieee754_pow, __ieee754_powf, + __ieee754_powl): Rename local variable i to __i. + (__ieee754_atan2, __ieee754_atan2f, __ieee754_atan2l): New inline + functions. + * sysdeps/m68k/fpu/e_atan2.c, sysdeps/m68k/fpu/e_atan2f.c, + sysdeps/m68k/fpu/e_atan2l.c: New files. + +1996-09-15 Paul Eggert + + * manual/time.texi: Change `range X to Y' to `range X through + Y', to avoid ambiguity in English. + + (strftime): Numbers that do not have a range indicated are not padded. + Describe E and O modifiers. + %g, %G, %u: New formats. + %C, %y, %Y: Describe behavior on negative years. + %e: Fix typo (was labeled %d). + %l, %V: Fix typo in range. + %M, %S, %U, %w, %W: Give ranges. + %p: Clarify how noon and midnight are handled for AM and PM. + %s: Clarify leap second handling. + %r: Now locale-defined. + %C, %D, %e, %h, %n, %r, %t, %T: Say that they are POSIX.2 extensions. + %z: Say that it is a GNU extension. + %Z: Wording fix. + + * time/strftime.c: (strftime): + %V: Fix mishandling of week numbers near year boundaries. + %g, %G: New formats (suggested by Arthur David Olson). + %U, %W: Use inline expression instead of `week' function. + %C, %y: Handle negative years portably. + %C, %Y: Use width 1, since values can be arbitrarily wide. + %r: Use T_FMT_AMPM format if _NL_CURRENT is defined. + %u: New Posix.2 format. + %w: Width is 1, not 2. + (iso_week_days): New function, for %V, %G, %g. + (week): Remove; it didn't handle %V correctly. + (__isleap): New macro. + (mbsinit): Use arg, to pacify GCC -Wall. + +1996-09-13 Paul Eggert + + * time/strftime.c (strftime): + If using the GNU C library, do not bother to check for + multibyte encodings, since they're safe in formats. Otherwise: + - Check for multibyte encodings when encountering any character that + is not in the basic execution character set of the C Standard. + - Use mbrlen (if available) instead of mblen, to avoid modifying + mblen's internal state. + - Do not assume that '%' cannot appear as the first character of a + multibyte character sequence, since this is possible when not in the + initial shift state. + (HAVE_MBRLEN, MULTIBYTE_IS_FORMAT_SAFE): Define if _LIBC is defined. + (DO_MULTIBYTE): New macro. + (): Do not include. + (): Include if HAVE_MBRLEN. + (mbstate_t, mbrlen, mbsinit): Define if ! HAVE_MBRLEN. + (mbstate_zero): New constant. + +1996-09-12 Paul Eggert + + * time/strftime.c (strftime): + Use an empty zone if it can't be determined; POSIX.2 requires this. + Use plain `int' for pad and modifier (which now contain char value). + Use plain `int' for number_value, to print negative values correctly. + Use plain `int' for digits; there was no need to make it unsigned. + Initialize subfmt consistently. + Remove incorrect code for %EC and %Ey; they aren't implemented yet. + For %O, if there is no alternate digit, output Ascii instead of "". + Output the `%' of an unknown format; this is most likely the right + thing to do if a multibyte string has been misparsed. + +Thu Sep 12 23:23:13 1996 Andreas Schwab + + * stdio-common/scanf7.c (main): Remove extra conversion from + printf format string. + +Thu Sep 12 23:01:16 1996 Andreas Schwab + + * stdlib/test-canon.c (tests): Rename structure member from errno + to error, all uses changed. + +Thu Sep 12 20:08:06 1996 Andreas Schwab + + * sysdeps/m68k/fpu/__math.h (__ldexp, __ldexpf, __ldexpl): + Removed. + * sysdeps/m68k/fpu/s_ldexp.c, sysdeps/m68k/fpu/s_ldexpf.c, + sysdeps/m68k/fpu/s_ldexpl.c: Removed, use generic implementation + instead. + * sysdeps/m68k/fpu/s_scalbn.c, sysdeps/m68k/fpu/s_scalbnf.c, + sysdeps/m68k/fpu/s_scalbnl.c: Replaced with old contents of + s_ldexp.c, s_ldexpf.c and s_ldexpl.c, resp., suitably adpted. + + * sysdeps/m68k/fpu/__math.h (__frexp, __frexpf, __frexpl): + Return value must be in [0.5, 1), not [1, 2). Reported by Chris + Lawrence. + (__ilogb, __ilogbf, __ilogbl): Check for argument being zero. + (__scalbn, __scalbnf, __scalbnl): Use second argument directly. + +Thu Sep 12 19:59:24 1996 Andreas Schwab + + * sysdeps/libm-ieee754/e_acoshl.c: Fix typos. + * sysdeps/libm-ieee754/s_cbrtl.c: Remove unused variable. + +Thu Sep 12 19:59:24 1996 Andreas Schwab + + * sysdeps/libm-ieee754/e_acoshl.c: Fix typos. + * sysdeps/libm-ieee754/s_cbrtl.c: Remove unused variable. + +Thu Sep 12 19:56:07 1996 Andreas Schwab + + * inet/herrno.c (__h_errno_location): Fix return type. + +Tue Sep 17 10:51:58 1996 Thomas Bushnell, n/BSG + + * malloc/memalign.c (memalign): Only acquire __libc_malloc_lock + for actual modifications to global state. + +Fri Sep 13 01:21:36 1996 Thomas Bushnell, n/BSG + + * sysdeps/mach/Makefile (includes): Add -I$(common-objpfx)mach/. + * sysdeps/mach/hurd/Makefile (includes): Add + -I$(common-objpfx)hurd/. Reported by Marcus Daniels. + + * sysdeps/generic/schedbits.h (struct sched_param): Renamed from + struct sched_params. + * sysdeps/stub/sched_setp.c (__sched_setparam): struct + sched_params -> struct sched_param. + * sysdeps/stub/sched_getp.c (__sched_getparam): Likewise. + * sysdeps/stub/sched_sets.c (__sched_setscheduler): Likewise. + +Thu Sep 12 23:58:25 1996 Thomas Bushnell, n/BSG + + * sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): Fix + syntax error. + + * stdio-common/Makefile: Put lockfile in routines + unconditionally. + Define _MT_SAFE_IO if using for libio and compiling reentrant + libc. + + * stdio-common/vfprintf.c (__flockfile, __funlockfile): Declare + this always, not just if _LIBC_REENTRANT. + (__funlockfile): Don't use weak_extern for this one; + __libc_cleanup_region_end might be defined and the use of + __funlockfile can't be protected the way the use of __flockfile + can be. + Fri Sep 13 04:33:08 1996 Ulrich Drepper - * sched.h: New file. helper to access posix/sched.h. + * sched.h: New file. Helper to access posix/sched.h. * posix/sched.h: Change `sched_params' to `sched_param' to follow POSIX.4. @@ -76,6 +311,20 @@ Thu Sep 12 12:33:52 1996 Thomas Bushnell, n/BSG macro. (__libc_cleanup_region_end): New macro. +Thu Sep 12 12:33:52 1996 Thomas Bushnell, n/BSG + + * sysdeps/mach/hurd/dl-cache.c: Delete second copy of file + accidentally added on. + + * sysdeps/stub/intr-msg.h: New file. + + * stdio-common/vfprintf.c: Include . + * stdio-common/vfscanf.c: Include . + + * sysdeps/mach/libc-lock.h (__libc_cleanup_region_start): New + macro. + (__libc_cleanup_region_end): New macro. + Thu Sep 12 03:35:27 1996 Ulrich Drepper * sysdeps/unix/sysv/linux/i386/Dist: Remove init-first.h. diff --git a/MakeTAGS b/MakeTAGS index 336d63f483..a11ff9be48 100644 --- a/MakeTAGS +++ b/MakeTAGS @@ -166,9 +166,12 @@ $P/subdirs.pot: $(subdirs:%=$P/%.pot) include $(common-objpfx)version.mk # Combine all the messages into the final sorted template translation file. +# The following code requires GNU date. $P/libc.pot: $(all-pot) @rm -f $@.new - sed -e 's/VERSION/$(version)/' -e "s/DATE/`date +'%Y-%m-%d %k:%M'`/" \ + disp='set `date -R`; echo $$6'; \ + sed -e 's/VERSION/$(version)/' \ + -e "s/DATE/`date +'%Y-%m-%d %I:%M'$$disp/" \ po/header.pot > $@.new $(XGETTEXT) -d - --omit-header -n -s $^ >> $@.new mv -f $@.new $@ diff --git a/Makeconfig b/Makeconfig index 3134132fcc..8eb15d0c64 100644 --- a/Makeconfig +++ b/Makeconfig @@ -527,8 +527,8 @@ $(common-objpfx)soversions.mk: $(..)shlib-versions $(..)Makeconfig \ $(wildcard $(patsubst %, $(..)%/shlib-versions,\ $(add-ons))) \ $(common-objpfx)config.make - (file="$(..)shlib-versions \ - $(wildcard $(patsubst %,$(..)%/shlib-versions,$(add-ons)))"; \ + (file="$(wildcard $(patsubst %,$(..)%/shlib-versions,$(add-ons))) \ + $(..)shlib-versions"; \ for f in $$file; do \ sed 's/#.*$$//' $$f | while read conf versions; do \ test -n "$$versions" || continue; \ diff --git a/configure b/configure index 58c71b1dfc..dcbdebcc52 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # From configure.in CVSid # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.99 +# Generated automatically using autoconf version 2.10 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -355,7 +355,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.99" + echo "configure generated by autoconf version 2.10" exit 0 ;; -with-* | --with-*) @@ -717,9 +717,9 @@ NONE) esac host=`$ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 # We keep the original values in `$config_*' and never modify them, so we @@ -799,6 +799,11 @@ o=`echo $tail | sed 's/[0-9]*$//'` if test $o != $tail; then ostry="$ostry /$o" fi +# For linux-gnu, try linux-gnu, then linux. +o=`echo $tail | sed 's/-.*$//'` +if test $o != $tail; then + ostry="$ostry /$o" +fi # For unix/sysv/sysv4, try unix/sysv/sysv4, then unix/sysv, then unix. base= @@ -1085,9 +1090,9 @@ NONE) esac build=`$ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$build" 1>&6 if test $host != $build; then @@ -1170,13 +1175,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1185,13 +1190,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1333,7 +1338,7 @@ if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_friendly_stddef=yes else @@ -1456,7 +1461,7 @@ if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_have_initfini=yes else @@ -1494,7 +1499,7 @@ if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* libc_cv_asm_underscores=yes else @@ -1596,7 +1601,7 @@ __throw () {} EOF if { ac_try='${CC-cc} $CFLAGS -nostdlib -nostartfiles -Wl,--no-whole-archive - -o conftest conftest.c'; { (eval echo configure:1600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c'; { (eval echo configure:1605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_ld_no_whole_archive=yes else libc_cv_ld_no_whole_archive=no @@ -1617,7 +1622,7 @@ __throw () {} EOF if { ac_try='${CC-cc} $CFLAGS -nostdlib -nostartfiles -fno-exceptions - -o conftest conftest.c'; { (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c'; { (eval echo configure:1626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_gcc_no_exceptions=yes else libc_cv_gcc_no_exceptions=no @@ -1834,7 +1839,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.99" + echo "$CONFIG_STATUS generated by autoconf version 2.10" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; diff --git a/configure.in b/configure.in index da1853bdf0..df0de5d648 100644 --- a/configure.in +++ b/configure.in @@ -167,6 +167,11 @@ o=`echo $tail | sed 's/[0-9]*$//'` if test $o != $tail; then ostry="$ostry /$o" fi +# For linux-gnu, try linux-gnu, then linux. +o=`echo $tail | sed 's/-.*$//'` +if test $o != $tail; then + ostry="$ostry /$o" +fi # For unix/sysv/sysv4, try unix/sysv/sysv4, then unix/sysv, then unix. base= diff --git a/features.h b/features.h index 47a4124502..83977e9c95 100644 --- a/features.h +++ b/features.h @@ -29,6 +29,8 @@ Cambridge, MA 02139, USA. */ _BSD_SOURCE ANSI, POSIX, and 4.3BSD things. _SVID_SOURCE ANSI, POSIX, and SVID things. _GNU_SOURCE All of the above, plus GNU extensions. + _REENTRANT Select additionally reentrant object. + _THREAD_SAFE Same as _REENTRANT, often used by other systems. The `-ansi' switch to the GNU C compiler defines __STRICT_ANSI__. If none of these are defined, the default is all but _GNU_SOURCE. @@ -137,7 +139,7 @@ Cambridge, MA 02139, USA. */ #define __USE_GNU 1 #endif -#if defined (__USE_GNU) || defined (__USE_MISC) +#if defined (_REENTRANT) || defined (_THREAD_SAFE) #define __USE_REENTRANT 1 #endif diff --git a/inet/herrno.c b/inet/herrno.c index d20c96cb3c..ca92ec3b86 100644 --- a/inet/herrno.c +++ b/inet/herrno.c @@ -25,7 +25,7 @@ strong_alias (__h_errno, h_errno) /* When threaded, h_errno may be a per-process variable. */ #ifdef __USE_REENTRANT -int +int * weak_const_function __h_errno_location (void) { diff --git a/libc-symbols.h b/libc-symbols.h index c64d8826f7..370c631f20 100644 --- a/libc-symbols.h +++ b/libc-symbols.h @@ -48,6 +48,8 @@ Cambridge, MA 02139, USA. */ /* Enable declarations of GNU extensions, since we are compiling them. */ #define _GNU_SOURCE 1 +/* And we also need the data for the reentrant functions. */ +#define _REENTRANT 1 #include /* diff --git a/libio/iofgets.c b/libio/iofgets.c index 369251f22a..4d4ce5c726 100644 --- a/libio/iofgets.c +++ b/libio/iofgets.c @@ -35,8 +35,8 @@ _IO_fgets (buf, n, fp) CHECK_FILE (fp, NULL); if (n <= 0) return NULL; - __libc_cleanup_region_start (&_IO_funlockfile, fp); - _IO_flockfile (fp); + __libc_cleanup_region_start (&__funlockfile, fp); + __flockfile (fp); count = _IO_getline (fp, buf, n - 1, '\n', 1); if (count == 0 || (fp->_IO_file_flags & _IO_ERR_SEEN)) result = NULL; diff --git a/locale/categories.def b/locale/categories.def index 7c47fd4662..5e72319774 100644 --- a/locale/categories.def +++ b/locale/categories.def @@ -137,12 +137,15 @@ DEFINE_CATEGORY DEFINE_ELEMENT (D_FMT, "d_fmt", std, string) DEFINE_ELEMENT (T_FMT, "t_fmt", std, string) DEFINE_ELEMENT (T_FMT_AMPM, "t_fmt_ampm", std, string) - DEFINE_ELEMENT (ERA, "era", opt, string) + DEFINE_ELEMENT (ERA, "era", opt, stringarray, 0, 100)/*XXX*/ DEFINE_ELEMENT (ERA_YEAR, "era_year", opt, string) DEFINE_ELEMENT (ERA_D_FMT, "era_d_fmt", opt, string) DEFINE_ELEMENT (ALT_DIGITS, "alt_digits", opt, stringarray, 0, 100) DEFINE_ELEMENT (ERA_D_T_FMT, "era_d_t_fmt", opt, string) DEFINE_ELEMENT (ERA_T_FMT, "era_t_fmt", opt, string) + DEFINE_ELEMENT (_NL_TIME_ERA_NUM_ENTRIES, "time-era-num-entries", opt, word) + DEFINE_ELEMENT (_NL_TIME_ERA_ENTRIES_EB, "time-era-entries-eb", opt, string) + DEFINE_ELEMENT (_NL_TIME_ERA_ENTRIES_EL, "time-era-entries-el", opt, string) ), NO_POSTLOAD, NULL, NULL, NULL) diff --git a/locale/langinfo.h b/locale/langinfo.h index 90aee3d745..82bd51024a 100644 --- a/locale/langinfo.h +++ b/locale/langinfo.h @@ -101,6 +101,10 @@ typedef enum ERA_D_T_FMT, /* Date and time in alternate era format. */ ERA_T_FMT, /* Time in alternate era format. */ + _NL_TIME_ERA_NUM_ENTRIES, /* Number entries in the era arrays. */ + _NL_TIME_ERA_ENTRIES_EB, /* Structure with era entries in usable form.*/ + _NL_TIME_ERA_ENTRIES_EL, + _NL_NUM_LC_TIME, /* Number of indices in LC_TIME category. */ /* LC_COLLATE category: text sorting. diff --git a/locale/localeinfo.h b/locale/localeinfo.h index 7a035c8739..2b7c6faa84 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -64,7 +64,7 @@ enum coll_sort_rule sort_mask }; -/* We can map the types of the entries into four categories. */ +/* We can map the types of the entries into a few categories. */ enum value_type { none, diff --git a/locale/programs/ld-time.c b/locale/programs/ld-time.c index 00f288f69b..75f6021109 100644 --- a/locale/programs/ld-time.c +++ b/locale/programs/ld-time.c @@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA. */ void *xmalloc (size_t __n); +void *xrealloc (void *__p, size_t __n); /* The real definition of the struct for the LC_TIME locale. */ @@ -53,7 +54,8 @@ struct locale_time_t const char *d_fmt; const char *t_fmt; const char *t_fmt_ampm; - const char *era; + const char **era; + size_t era_num; const char *era_year; const char *era_d_t_fmt; const char *era_t_fmt; @@ -115,6 +117,7 @@ time_output (struct localedef_t *locale, const char *output_path) { struct locale_time_t *time = locale->categories[LC_TIME].time; struct iovec iov[2 + _NL_ITEM_INDEX (_NL_NUM_LC_TIME) + + (time->era_num > 0 ? time->era_num - 1 : 0) + time->cur_num_alt_digits]; struct locale_file data; u_int32_t idx[_NL_ITEM_INDEX (_NL_NUM_LC_TIME)]; @@ -203,22 +206,27 @@ time_output (struct localedef_t *locale, const char *output_path) iov[2 + cnt].iov_base = (void *) (time->t_fmt_ampm ?: ""); iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1; idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len; - ++cnt; + last_idx = ++cnt; - iov[2 + cnt].iov_base = (void *) (time->era ?: ""); - iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1; - idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len; - ++cnt; + idx[1 + last_idx] = idx[last_idx]; + for (num = 0; num < time->era_num; ++num, ++cnt) + { + iov[2 + cnt].iov_base = (void *) time->era[num]; + iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1; + } + ++last_idx; iov[2 + cnt].iov_base = (void *) (time->era_year ?: ""); iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1; - idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len; + idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len; ++cnt; + ++last_idx; iov[2 + cnt].iov_base = (void *) (time->era_d_fmt ?: ""); iov[2 + cnt].iov_len = strlen (iov[2 + cnt].iov_base) + 1; - idx[1 + cnt] = idx[cnt] + iov[2 + cnt].iov_len; - last_idx = ++cnt; + idx[1 + last_idx] = idx[last_idx] + iov[2 + cnt].iov_len; + ++cnt; + ++last_idx; idx[1 + last_idx] = idx[last_idx]; for (num = 0; num < time->cur_num_alt_digits; ++num, ++cnt) @@ -267,8 +275,7 @@ too many values for field `%s' in category `LC_TIME'"), \ time->cat[time->cur_num_##cat++] = ""; \ } \ else \ - time->cat[time->cur_num_##cat++] \ - = code->val.str.start; \ + time->cat[time->cur_num_##cat++] = code->val.str.start; \ break STRARR_ELEM (abday, 7); @@ -278,6 +285,18 @@ too many values for field `%s' in category `LC_TIME'"), \ STRARR_ELEM (am_pm, 2); STRARR_ELEM (alt_digits, 100); + case tok_era: + if (code->val.str.start == NULL) + lr_error (lr, _("unknown character in field `%s' of category `%s'"), + "era", "LC_TIME"); + else + { + ++time->era_num; + time->era = xrealloc (time->era, time->era_num * sizeof (char *)); + time->era[time->era_num - 1] = code->val.str.start; + } + break; + #define STR_ELEM(cat) \ case tok_##cat: \ if (time->cat != NULL) \ @@ -298,7 +317,6 @@ field `%s' in category `%s' declared more than once"), \ STR_ELEM (d_fmt); STR_ELEM (t_fmt); STR_ELEM (t_fmt_ampm); - STR_ELEM (era); STR_ELEM (era_year); STR_ELEM (era_d_t_fmt); STR_ELEM (era_d_fmt); diff --git a/manual/time.texi b/manual/time.texi index 9da23fbfb3..18224a5520 100644 --- a/manual/time.texi +++ b/manual/time.texi @@ -465,33 +465,34 @@ contains at least the following members, which can appear in any order: @table @code @item int tm_sec This is the number of seconds after the minute, normally in the range -@code{0} to @code{59}. (The actual upper limit is @code{60}, to allow +@code{0} through @code{59}. (The actual upper limit is @code{60}, to allow for leap seconds if leap second support is available.) @cindex leap second @item int tm_min -This is the number of minutes after the hour, in the range @code{0} to +This is the number of minutes after the hour, in the range @code{0} through @code{59}. @item int tm_hour -This is the number of hours past midnight, in the range @code{0} to +This is the number of hours past midnight, in the range @code{0} through @code{23}. @item int tm_mday -This is the day of the month, in the range @code{1} to @code{31}. +This is the day of the month, in the range @code{1} through @code{31}. @item int tm_mon -This is the number of months since January, in the range @code{0} to +This is the number of months since January, in the range @code{0} through @code{11}. @item int tm_year This is the number of years since @code{1900}. @item int tm_wday -This is the number of days since Sunday, in the range @code{0} to @code{6}. +This is the number of days since Sunday, in the range @code{0} through +@code{6}. @item int tm_yday -This is the number of days since January 1, in the range @code{0} to +This is the number of days since January 1, in the range @code{0} through @code{365}. @item int tm_isdst @@ -617,6 +618,7 @@ does so. @xref{Time Zone Functions}. @comment time.h @comment ANSI +@comment POSIX.2 @deftypefun size_t strftime (char *@var{s}, size_t @var{size}, const char *@var{template}, const struct tm *@var{brokentime}) This function is similar to the @code{sprintf} function (@pxref{Formatted Input}), but the conversion specifications that can appear in the format @@ -626,9 +628,9 @@ time conversion (@pxref{Locales}). Ordinary characters appearing in the @var{template} are copied to the output string @var{s}; this can include multibyte character sequences. -Conversion specifiers are introduced by a @samp{%} character. Now can -follow an optional flag which can be one of the following. These flags -only affect the output of numbers: +Conversion specifiers are introduced by a @samp{%} character, followed +by an optional flag which can be one of the following. These flags, +which are GNU extensions, affect only the output of numbers: @table @code @item _ @@ -638,9 +640,31 @@ The number is padded with spaces. The number is not padded at all. @end table -The default action is to pad the number with zeros. Following to the -flag comes the format specifier. The whole @samp{%} sequence is -replaced in the output string as follows: +The default action is to pad the number with zeros to keep it a constant +width. Numbers that do not have a range indicated below are never +padded, since there is no natural width for them. + +An optional modifier can follow the optional flag. The modifiers, which +are POSIX.2 extensions, are: + +@table @code +@item E +Use the locale's alternate representation for date and time. This +modifier applies to the @code{%c}, @code{%C}, @code{%x}, @code{%X}, +@code{%y} and @code{%Y} format specifiers. In a Japanese locale, for +example, @code{%Ex} might yield a date format based on the Japanese +Emperors' reigns. + +@item O +Use the locale's alternate numeric symbols for numbers. This modifier +applies only to numeric format specifiers. +@end table + +A modifier is ignored if no alternate representation is available. + +The conversion specifier ends with a format specifier taken from the +following list. The whole @samp{%} sequence is replaced in the output +string as follows: @table @code @item %a @@ -659,19 +683,38 @@ The full month name according to the current locale. The preferred date and time representation for the current locale. @item %C -The century of the year. +The century of the year. This is equivalent to the greatest integer not +greater than the year divided by 100. + +This format is a POSIX.2 extension. @item %d -The day of the month as a decimal number (range @code{01} to @code{31}). +The day of the month as a decimal number (range @code{01} through @code{31}). @item %D The date using the format @code{%m/%d/%y}. -This format is a GNU extension. +This format is a POSIX.2 extension. -@item %d +@item %e The day of the month like with @code{%d}, but padded with blank (range -@code{ 1} to @code{31}). +@code{ 1} through @code{31}). + +This format is a POSIX.2 extension. + +@item %g +The year corresponding to the ISO week number, but without the century +(range @code{00} through @code{99}). This has the same format and value +as @code{%y}, except that if the ISO week number (see @code{%V}) belongs +to the previous or next year, that year is used instead. + +This format is a GNU extension. + +@item %G +The year corresponding to the ISO week number. This has the same format +and value as @code{%Y}, except that if the ISO week number (see +@code{%V}) belongs to the previous or next year, that year is used +instead. This format is a GNU extension. @@ -679,50 +722,51 @@ This format is a GNU extension. The abbreviated month name according to the current locale. The action is the same as for @code{%b}. -This format is a GNU extension. +This format is a POSIX.2 extension. @item %H -The hour as a decimal number, using a 24-hour clock (range @code{00} to +The hour as a decimal number, using a 24-hour clock (range @code{00} through @code{23}). @item %I -The hour as a decimal number, using a 12-hour clock (range @code{01} to +The hour as a decimal number, using a 12-hour clock (range @code{01} through @code{12}). @item %j -The day of the year as a decimal number (range @code{001} to @code{366}). +The day of the year as a decimal number (range @code{001} through @code{366}). @item %k The hour as a decimal number, using a 24-hour clock like @code{%H}, but -padded with blank (range @code{ 0} to @code{23}). +padded with blank (range @code{ 0} through @code{23}). This format is a GNU extension. @item %l The hour as a decimal number, using a 12-hour clock like @code{%I}, but -padded with blank (range @code{ 0} to @code{12}). +padded with blank (range @code{ 1} through @code{12}). This format is a GNU extension. @item %m -The month as a decimal number (range @code{01} to @code{12}). +The month as a decimal number (range @code{01} through @code{12}). @item %M -The minute as a decimal number. +The minute as a decimal number (range @code{00} through @code{59}). @item %n A single @samp{\n} (newline) character. -This format is a GNU extension. +This format is a POSIX.2 extension. @item %p -Either @samp{am} or @samp{pm}, according to the given time value; or the -corresponding strings for the current locale. +Either @samp{AM} or @samp{PM}, according to the given time value; or the +corresponding strings for the current locale. Noon is treated as +@samp{PM} and midnight as @samp{AM}. @item %r -The time in decinal numbers using the format @code{%I:%M:%S %p}. +The complete time using the AM/PM format of the current locale. -This format is a GNU extension. +This format is a POSIX.2 extension. @item %R The hour and minute in decimal numbers using the format @code{%H:%M}. @@ -730,47 +774,58 @@ The hour and minute in decimal numbers using the format @code{%H:%M}. This format is a GNU extension. @item %s -The seconds since the epoch, i.e., 1970-01-01 00:00:00 UTC. Note -that this value is the number of seconds between the epoch and the -current date as defined by the @code{localtime} system call. +The number of seconds since the epoch, i.e., since 1970-01-01 00:00:00 UTC. +Leap seconds are not counted unless leap second support is available. This format is a GNU extension. @item %S -The second as a decimal number. +The second as a decimal number (range @code{00} through @code{60}). @item %t A single @samp{\t} (tabulator) character. -This format is a GNU extension. +This format is a POSIX.2 extension. @item %T The time using decimal numbers using the format @code{%H:%M:%S}. -This format is a GNU extension. +This format is a POSIX.2 extension. + +@item %u +The day of the week as a decimal number (range @code{1} through +@code{7}), Monday being @code{1}. + +This format is a POSIX.2 extension. @item %U -The week number of the current year as a decimal number, starting with -the first Sunday as the first day of the first week. All days preceding -the first Sunday in the year are considered to be in week @code{0}. +The week number of the current year as a decimal number (range @code{00} +through @code{53}), starting with the first Sunday as the first day of +the first week. Days preceding the first Sunday in the year are +considered to be in week @code{00}. @item %V -The @w{ISO 8601:1988} week number as a decimal number (range @code{00} -to @code{53}). ISO weeks start with Monday and end with Sunday. Week -01 of a year is the first week which has the majority of its days in -that year; this is equivalent to the week containing the year's first -Thursday, and it is also equivalent to the week containing January 4. -Week 01 of a year can contain days from the previous year. The week -before week 01 of a year is the last week (52 or 53) of the previous -year even if it contains days from the new year. +The @w{ISO 8601:1988} week number as a decimal number (range @code{01} +through @code{53}). ISO weeks start with Monday and end with Sunday. +Week @code{01} of a year is the first week which has the majority of its +days in that year; this is equivalent to the week containing the year's +first Thursday, and it is also equivalent to the week containing January +4. Week @code{01} of a year can contain days from the previous year. +The week before week @code{01} of a year is the last week (@code{52} or +@code{53}) of the previous year even if it contains days from the new +year. + +This format is a POSIX.2 extension. @item %w -The day of the week as a decimal number, Sunday being @code{0}. +The day of the week as a decimal number (range @code{0} through +@code{6}), Sunday being @code{0}. @item %W -The week number of the current year as a decimal number, starting with -the first Monday as the first day of the first week. All days preceding -the first Monday in the year are considered to be in week @code{0}. +The week number of the current year as a decimal number (range @code{00} +through @code{53}), starting with the first Monday as the first day of +the first week. All days preceding the first Monday in the year are +considered to be in week @code{00}. @item %x The preferred date representation for the current locale, but without the @@ -780,20 +835,22 @@ time. The preferred time representation for the current locale, but with no date. @item %y -The year as a decimal number, but without a century (range @code{00} to -@code{99}). +The year without a century as a decimal number (range @code{00} through +@code{99}). This is equivalent to the year modulo 100. @item %Y -The year as a decimal number, including the century. +The year as a decimal number, using the Gregorian calendar. Years +before the year @code{1} are numbered @code{0}, @code{-1}, and so on. @item %z @w{RFC 822}/@w{ISO 8601:1988} style numeric time zone (e.g., @code{-0600} or @code{+0100}), or nothing if no time zone is determinable. +This format is a GNU extension. + @item %Z -The time zone or name or abbreviation (empty if the time zone can't be -determined). +The time zone abbreviation (empty if the time zone can't be determined). @item %% A literal @samp{%} character. diff --git a/math/Makefile b/math/Makefile index 2c76633fb4..c7bacd03f8 100644 --- a/math/Makefile +++ b/math/Makefile @@ -32,7 +32,7 @@ aux := fpu_control setfpucw # Build the -lm library. extra-libs := libm -extra-libs-others = $(extra-libc) +extra-libs-others = $(extra-libs) libm-support = k_standard s_lib_version s_matherr s_signgam libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \ diff --git a/po/header.pot b/po/header.pot index db749fb132..ea05c22466 100644 --- a/po/header.pot +++ b/po/header.pot @@ -1,4 +1,4 @@ -# GNU libc message catalog of translations +# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. # diff --git a/po/nl.po b/po/nl.po index 7b860bdd26..dade331dd8 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: glibc 1.90\n" -"POT-Creation-Date: 1996-05-29 14:03\n" -"PO-Revision-Date: 1996-07-30 13:32 MET DST\n" +"Project-Id-Version: libc 1.94\n" +"POT-Creation-Date: 1996-09-08 3:45\n" +"PO-Revision-Date: 1996-09-17 14:30 MET DST\n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -43,27 +43,31 @@ msgstr "" msgid " program vers proto port\n" msgstr "" -#: time/zic.c:423 +#: time/zic.c:425 #, c-format msgid " (rule from \"%s\", line %d)" -msgstr " (rule uit \"%s\", regel %d)" +msgstr " (voorwaarde uit \"%s\", regel %d)" -#: time/zic.c:420 +#: locale/programs/ld-collate.c:360 locale/programs/ld-ctype.c:1233 +msgid " done\n" +msgstr " klaar\n" + +#: time/zic.c:422 #, c-format msgid "\"%s\", line %d: %s" msgstr "\"%s\", regel %d: %s" -#: time/zic.c:908 +#: time/zic.c:946 #, c-format msgid "\"Zone %s\" line and -l option are mutually exclusive" msgstr "\"Zone %s\" regel en -l optie gaan niet samen" -#: time/zic.c:916 +#: time/zic.c:954 #, c-format msgid "\"Zone %s\" line and -p option are mutually exclusive" msgstr "\"Zone %s\" regel en -p optie gaan niet samen" -#: time/zic.c:721 +#: time/zic.c:759 #, c-format msgid "%s in ruleless zone" msgstr "%s in regelloze zone" @@ -88,96 +92,101 @@ msgstr "%s%sOnbekend signaal %d\n" msgid "%s, line %d: " msgstr "%s, regel %d: " -#: time/zic.c:2035 +#: time/zic.c:2140 #, c-format msgid "%s: %d did not sign extend correctly\n" msgstr "%s: %d heeft `extend' niet juist gesigneerd\n" -#: time/zic.c:1339 +#: locale/programs/charmap.c:176 +#, c-format +msgid "%s: must be greater than \n" +msgstr "%s: moet groter zijn dan \n" + +#: time/zic.c:1431 #, c-format msgid "%s: Can't create %s: %s\n" msgstr "%s: Kan %s niet aanmaken: %s\n" -#: time/zic.c:2014 +#: time/zic.c:2119 #, c-format msgid "%s: Can't create directory %s: %s\n" msgstr "%s: Kan directory %s niet aanmaken: %s\n" -#: time/zic.c:600 +#: time/zic.c:613 #, c-format msgid "%s: Can't link from %s to %s: %s\n" msgstr "%s: Kan niet verwijzing van %s naar %s: %s\n" -#: time/zic.c:746 +#: time/zic.c:784 #, c-format msgid "%s: Can't open %s: %s\n" msgstr "%s: Kan %s niet openen: %s\n" -#: time/zic.c:814 +#: time/zic.c:852 #, c-format msgid "%s: Error closing %s: %s\n" msgstr "%s: Fout bij sluiten %s: %s\n" -#: time/zic.c:808 +#: time/zic.c:846 #, c-format msgid "%s: Error reading %s\n" msgstr "%s: Fout bij lezen %s\n" -#: time/zic.c:1404 +#: time/zic.c:1495 #, c-format msgid "%s: Error writing %s\n" msgstr "%s: Fout bij schrijven %s\n" -#: time/zdump.c:257 +#: time/zdump.c:258 #, c-format msgid "%s: Error writing standard output " msgstr "%s: Fout bij schrijven standaarduitvoer " -#: time/zic.c:793 +#: time/zic.c:831 #, c-format msgid "%s: Leap line in non leap seconds file %s\n" msgstr "%s: Schrikkelregel in niet schrikkelseconde bestand %s (FIXME)\n" -#: time/zic.c:360 +#: time/zic.c:362 #, c-format msgid "%s: Memory exhausted: %s\n" msgstr "%s: Niet meer geheugen beschikbaar: %s\n" -#: time/zic.c:515 +#: time/zic.c:528 #, c-format msgid "%s: More than one -L option specified\n" msgstr "%s: Meer dan een -L optie gegeven\n" -#: time/zic.c:475 +#: time/zic.c:488 #, c-format msgid "%s: More than one -d option specified\n" msgstr "%s: Meer dan een -d optie gegeven\n" -#: time/zic.c:485 +#: time/zic.c:498 #, c-format msgid "%s: More than one -l option specified\n" msgstr "%s: Meer dan een -l optie gegeven\n" -#: time/zic.c:495 +#: time/zic.c:508 #, c-format msgid "%s: More than one -p option specified\n" msgstr "%s: Meer dan een -p optie gegeven\n" -#: time/zic.c:505 +#: time/zic.c:518 #, c-format msgid "%s: More than one -y option specified\n" msgstr "%s: Meer dan een -y optie gegeven\n" -#: posix/getconf.c:149 -#, c-format -msgid "%s: Unrecognized variable `%s'\n" -msgstr "%s: Onbekende variabele `%s'\n" - -#: time/zic.c:1741 +#: time/zic.c:1846 #, c-format msgid "%s: command was '%s', result was %d\n" msgstr "%s: commando was '%s', resultaat was %d\n" +#: locale/programs/charmap.c:593 locale/programs/locfile.c:878 +#, c-format +msgid "%s: error in state machine" +msgstr "%s: fout in state machine" + #: posix/getopt.c:686 #, c-format msgid "%s: illegal option -- %c\n" @@ -218,15 +227,20 @@ msgstr "%s: optie vereist een argument -- %c\n" msgid "%s: output would overwrite %s\n" msgstr "%s: uitvoer zal %s overschrijven\n" -#: time/zic.c:800 zic.c:1212 zic.c:1232 +#: time/zic.c:838 time/zic.c:1249 time/zic.c:1269 #, c-format msgid "%s: panic: Invalid l_value %d\n" msgstr "%s: paniek: Onjuiste `l_value' %d\n" +#: locale/programs/charmap.c:600 +#, c-format +msgid "%s: premature end of file" +msgstr "%s: voorbarig einde van bestand" + #: sunrpc/rpc_main.c:152 #, c-format msgid "%s: unable to open " -msgstr "%s: kan niet openen " +msgstr "%s: niet in staat te openen " #: posix/getopt.c:660 #, c-format @@ -238,10 +252,11 @@ msgstr "%s: onbekende optie `%c%s'\n" msgid "%s: unrecognized option `--%s'\n" msgstr "%s: onbekende optie `--%s'\n" -#: time/zic.c:432 +#: time/zic.c:447 #, c-format msgid "" -"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d directory ]\n" +"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d " +"directory ]\n" "\t[ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n" msgstr "" "%s: gebruik is %s [ -s ] [ -v ] \n" @@ -262,10 +277,14 @@ msgstr "(onbekende authenticatie (FIXME) fout - %d)" msgid "(unknown)" msgstr "(onbekend)" -#: catgets/gencat.c:242 +#: catgets/gencat.c:244 msgid "*standard input*" msgstr "*standaardinvoer*" +#: stdio-common/../sysdeps/gnu/errlist.c:766 +msgid ".lib section in a.out corrupted" +msgstr ".lib deel in a.out corrupt" + #: inet/rcmd.c:325 msgid ".rhosts fstat failed" msgstr ".rhosts fstat faalde" @@ -282,7 +301,7 @@ msgstr ".rhosts is geen gewoon bestand" msgid ".rhosts writeable by other than owner" msgstr ".rhosts overschrijfbaar door anderen dan de eigenaar" -#: clnt_perr.c:133 sunrpc/clnt_perr.c:112 +#: sunrpc/clnt_perr.c:112 sunrpc/clnt_perr.c:133 #, c-format msgid "; low version = %lu, high version = %lu" msgstr "; low versie = %lu, high versie = %lu (FIXME)" @@ -291,41 +310,100 @@ msgstr "; low versie = %lu, high versie = %lu (FIXME)" msgid "; why = " msgstr "; waarom = " +#: locale/programs/ld-ctype.c:325 +#, c-format +msgid " character must not be in class `%s'" +msgstr " karakter mag geen onderdeel zijn van klasse `%s'" + +#: locale/programs/ld-ctype.c:316 +#, c-format +msgid " character not in class `%s'" +msgstr " karakter geen onderdeel van klasse `%s'" + +#. TRANS The experienced user will know what is wrong. +#. TRANS @c This error code is a joke. Its perror text is part of the joke. +#. TRANS @c Don't change it. +#: stdio-common/../sysdeps/gnu/errlist.c:591 msgid "?" -msgstr "?" +msgstr "" +#: stdio-common/../sysdeps/gnu/errlist.c:762 +msgid "Accessing a corrupted shared library" +msgstr "Benaderen van een corrupte gezamelijk bibliotheek" + +#. TRANS The requested socket address is already in use. @xref{Socket Addresses}. +#: stdio-common/../sysdeps/gnu/errlist.c:354 msgid "Address already in use" msgstr "Address is al in gebruik" -msgid "Address family not supported by protocol family" -msgstr "Adres familie niet ondersteund door protocol familie" +#. TRANS The address family specified for a socket is not supported; it is +#. TRANS inconsistent with the protocol being used on the socket. @xref{Sockets}. +#: stdio-common/../sysdeps/gnu/errlist.c:349 +msgid "Address family not supported by protocol" +msgstr "Adres familie niet ondersteund door protocol" + +#: stdio-common/../sysdeps/gnu/errlist.c:714 +msgid "Advertise error" +msgstr "Advertise (FIXME) fout" msgid "Alarm clock" msgstr "Alarmklok" +#. TRANS Argument list too long; used when the arguments passed to a new program +#. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a +#. TRANS File}) occupy too much memory space. This condition never arises in the +#. TRANS GNU system. +#: stdio-common/../sysdeps/gnu/errlist.c:57 msgid "Argument list too long" msgstr "Argumentenlijst is te lang" +#: stdio-common/../sysdeps/gnu/errlist.c:770 +msgid "Attempting to link in too many shared libraries" +msgstr "Probeer in te veel gezamelijke bibliotheken te linken" + #: sunrpc/clnt_perr.c:276 msgid "Authentication OK" msgstr "Authenticatie OK" +#. TRANS ??? +#: stdio-common/../sysdeps/gnu/errlist.c:549 msgid "Authentication error" msgstr "Authenticatie fout" +#. TRANS Bad address; an invalid pointer was detected. +#. TRANS In the GNU system, this error never happens; you get a signal instead. +#: stdio-common/../sysdeps/gnu/errlist.c:102 msgid "Bad address" msgstr "Onjuist adres" +#. TRANS Bad file descriptor; for example, I/O on a descriptor that has been +#. TRANS closed or reading from a descriptor open only for writing (or vice +#. TRANS versa). +#: stdio-common/../sysdeps/gnu/errlist.c:70 msgid "Bad file descriptor" msgstr "Onjuiste bestandsbeschrijver" +#: stdio-common/../sysdeps/gnu/errlist.c:682 +msgid "Bad font file format" +msgstr "Onjuist lettertype bestandsformaat" + +#. TRANS A file that isn't a block special file was given in a situation that +#. TRANS requires one. For example, trying to mount an ordinary file as a file +#. TRANS system in Unix gives this error. +#: stdio-common/../sysdeps/gnu/errlist.c:109 msgid "Block device required" msgstr "Blokapparaat vereist" -#: sunrpc/pmap_rmt.c:336 +#: sunrpc/pmap_rmt.c:335 msgid "Broadcast select problem" msgstr "Broadcast selectie probleem (FIXME)" +#. TRANS Broken pipe; there is no process reading from the other end of a pipe. +#. TRANS Every library function that returns this error code also generates a +#. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled +#. TRANS or blocked. Thus, your program will never actually see @code{EPIPE} +#. TRANS unless it has handled or blocked @code{SIGPIPE}. +#: stdio-common/../sysdeps/gnu/errlist.c:222 msgid "Broken pipe" msgstr "Onderbroken pijp" @@ -335,20 +413,32 @@ msgstr "Bus fout" msgid "CPU time limit exceeded" msgstr "CPU tijdlimiet overschreden" -msgid "Can't assign requested address" -msgstr "Kan gevraagde adres niet toewijzen" - -msgid "Can't send after socket shutdown" -msgstr "Kan niet zenden na `socket shutdown'" +#: stdio-common/../sysdeps/gnu/errlist.c:758 +msgid "Can not access a needed shared library" +msgstr "Kan geen toegang verkrijgen tot benodigde gezamelijk bibliotheekbestand" +#. TRANS No memory available. The system cannot allocate more virtual memory +#. TRANS because its capacity is full. +#: stdio-common/../sysdeps/gnu/errlist.c:91 msgid "Cannot allocate memory" msgstr "Kan geen geheugen aanspreken" -#: sunrpc/pmap_rmt.c:254 +#. TRANS The requested socket address is not available; for example, you tried +#. TRANS to give a socket a name that doesn't match the local host name. +#. TRANS @xref{Socket Addresses}. +#: stdio-common/../sysdeps/gnu/errlist.c:361 +msgid "Cannot assign requested address" +msgstr "Kan gevraagde adres niet toewijzen" + +#: sunrpc/pmap_rmt.c:253 msgid "Cannot create socket for broadcast rpc" msgstr "Kan geen `socket' maken voor `broadcast' rpc" -#: sunrpc/pmap_rmt.c:348 +#: stdio-common/../sysdeps/gnu/errlist.c:774 +msgid "Cannot exec a shared library directly" +msgstr "Kan geen gezamelijke bibliotheek rechtstreeks uitvoeren" + +#: sunrpc/pmap_rmt.c:347 msgid "Cannot receive reply to broadcast" msgstr "Kan geen antwoord ontvangen om te zenden" @@ -356,13 +446,22 @@ msgstr "Kan geen antwoord ontvangen om te zenden" msgid "Cannot register service" msgstr "Kan service niet registreren" -#: sunrpc/pmap_rmt.c:312 +#. TRANS The socket has already been shut down. +#: stdio-common/../sysdeps/gnu/errlist.c:422 +msgid "Cannot send after transport endpoint shutdown" +msgstr "Kan niet zenden na transport eindpunt `shutdown'" + +#: sunrpc/pmap_rmt.c:311 msgid "Cannot send broadcast packet" msgstr "Kan broadcast pakket niet verzenden" -#: sunrpc/pmap_rmt.c:260 +#: sunrpc/pmap_rmt.c:259 msgid "Cannot set socket option SO_BROADCAST" -msgstr "" +msgstr "Kan socket optie SO_BROADCAST niet instellen" + +#: stdio-common/../sysdeps/gnu/errlist.c:622 +msgid "Channel number out of range" +msgstr "Kanaal nummer buiten domein" msgid "Child exited" msgstr "Kind is er mee opgehouden (FIXME)" @@ -371,33 +470,80 @@ msgstr "Kind is er mee opgehouden (FIXME)" msgid "Client credential too weak" msgstr "Klant credential is te zwak (FIXME)" +#: stdio-common/../sysdeps/gnu/errlist.c:722 +msgid "Communication error on send" +msgstr "Communicatie fout bij zenden" + +#. TRANS Go home and have a glass of warm, dairy-fresh milk. +#: stdio-common/../sysdeps/gnu/errlist.c:601 msgid "Computer bought the farm" msgstr "Computer heeft de boerderij gekocht" +#: locale/programs/ld-ctype.c:1196 +msgid "Computing table size for character classes might take a while..." +msgstr "Berekenen tabelgrootte voor karakterklassen kan even duren..." + +#: locale/programs/ld-collate.c:327 +msgid "Computing table size for collation information might take a while..." +msgstr "Berekenen tabelgrootte voor collation informatie kan even duren..." + +#. TRANS A remote host refused to allow the network connection (typically because +#. TRANS it is not running the requested service). +#: stdio-common/../sysdeps/gnu/errlist.c:439 msgid "Connection refused" msgstr "Connectie gewijgerd" +#. TRANS A network connection was closed for reasons outside the control of the +#. TRANS local host, such as by the remote machine rebooting or an unrecoverable +#. TRANS protocol violation. +#: stdio-common/../sysdeps/gnu/errlist.c:389 msgid "Connection reset by peer" msgstr "Connectie reset door `peer'" +#. TRANS A socket operation with a specified timeout received no response during +#. TRANS the time