From 34992338178abc47897f10ce4fb12d204e682b14 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 7 Jan 1999 09:55:57 +0000 Subject: Update. 1999-01-07 Ulrich Drepper * sysdeps/i386/bits/select.h (__FD_ZERO): Remove early clobbers from c and D register output. 1999-01-07 Philip Blundell * sysdeps/unix/sysv/linux/arm/sigcontextinfo.h: Fix bug in last change. 1999-01-07 Ulrich Drepper * sysdeps/unix/sysv/linux/alpha/bits/types.h: Correct type for __fsfilcnt_t. Patch by Bruce Elliott . 1999-01-05 Andreas Schwab * manual/conf.texi: Remove pointers from first @node. Move old @node spec inside comment. * manual/lang.texi: Likewise. * manual/libc-texinfo.sh: Also find `@node.*Top' in a comment. * manual/stdio.texi: Fix typo. 1999-01-04 Andreas Schwab * wcsmbs/btowc.c: Accept all values in the range [SCHAR_MIN .. UCHAR_MAX]. Local var buf renamed to result and its type changed from char[] to wchar_t to get proper alignment. * posix/fnmatch.c: Also cast the arguments of the other ctype functions to unsigned char. 1999-01-07 Ulrich Drepper * Rules: Add rules for empty.{o,os,op} back. --- ChangeLog | 35 ++++++++++++++++++++++++++++ Rules | 7 ++++++ linuxthreads/ChangeLog | 5 ++++ linuxthreads/linuxthreads.texi | 3 ++- manual/conf.texi | 5 ++-- manual/lang.texi | 5 ++-- manual/libc-texinfo.sh | 8 +++---- manual/stdio.texi | 2 +- manual/texis | 1 + posix/fnmatch.c | 28 +++++++++++----------- sysdeps/i386/bits/select.h | 4 ++-- sysdeps/unix/sysv/linux/alpha/bits/types.h | 4 ++-- sysdeps/unix/sysv/linux/arm/sigcontextinfo.h | 2 +- wcsmbs/btowc.c | 15 ++++++------ 14 files changed, 88 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3580f4a..eef1b4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +1999-01-07 Ulrich Drepper + + * sysdeps/i386/bits/select.h (__FD_ZERO): Remove early clobbers + from c and D register output. + +1999-01-07 Philip Blundell + + * sysdeps/unix/sysv/linux/arm/sigcontextinfo.h: Fix bug in last change. + +1999-01-07 Ulrich Drepper + + * sysdeps/unix/sysv/linux/alpha/bits/types.h: Correct type for + __fsfilcnt_t. Patch by Bruce Elliott . + +1999-01-05 Andreas Schwab + + * manual/conf.texi: Remove pointers from first @node. Move old + @node spec inside comment. + * manual/lang.texi: Likewise. + * manual/libc-texinfo.sh: Also find `@node.*Top' in a comment. + * manual/stdio.texi: Fix typo. + +1999-01-04 Andreas Schwab + + * wcsmbs/btowc.c: Accept all values in the range [SCHAR_MIN + .. UCHAR_MAX]. Local var buf renamed to result and its type + changed from char[] to wchar_t to get proper alignment. + + * posix/fnmatch.c: Also cast the arguments of the other ctype + functions to unsigned char. + +1999-01-07 Ulrich Drepper + + * Rules: Add rules for empty.{o,os,op} back. + 1999-01-05 Ulrich Drepper * Makerules (common-mostlyclean): Add missing parentheses. diff --git a/Rules b/Rules index 0ddf39e..6688c15 100644 --- a/Rules +++ b/Rules @@ -172,6 +172,13 @@ before-compile: $(before-compile) $(common-objpfx)dummy.o: $(common-objpfx)dummy.c $(before-compile); $(compile-command.c) +define o-iterator-doit +$(common-objpfx)empty$o: $(common-objpfx)empty.c $(before-compile); + $$(compile-command.c) +endef +object-suffixes-left := $(object-suffixes) +include $(o-iterator) + # There's no good place to put this - here will do. # The dependencies are wrong if it's run from the top level. ifeq ($(filter %posix, $(sysdirs)),) diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 82b805c..e890df9 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +1999-01-05 Andreas Schwab + + * linuxthreads.texi: Remove pointers from first @node. Move old + @node spec inside comment. + 1998-12-31 Ulrich Drepper * sysdeps/pthread/bits/stdio-lock.h: Define _IO_lock_lock and diff --git a/linuxthreads/linuxthreads.texi b/linuxthreads/linuxthreads.texi index 5bab1a1..63657eb 100644 --- a/linuxthreads/linuxthreads.texi +++ b/linuxthreads/linuxthreads.texi @@ -1,4 +1,5 @@ -@node POSIX Threads, , Top, Top +@node POSIX Threads +@c @node POSIX Threads, , Top, Top @chapter POSIX Threads @c %MENU% The standard threads library diff --git a/manual/conf.texi b/manual/conf.texi index eabbce6..6131893 100644 --- a/manual/conf.texi +++ b/manual/conf.texi @@ -1,5 +1,6 @@ -@c This node must have no next pointer. -@node System Configuration, , System Information, Top +@c This node must have no pointers. +@node System Configuration +@c @node System Configuration, , System Information, Top @c %MENU% Parameters describing operating system limits @chapter System Configuration Parameters diff --git a/manual/lang.texi b/manual/lang.texi index 6e90bfd..4162d7f 100644 --- a/manual/lang.texi +++ b/manual/lang.texi @@ -1,5 +1,6 @@ -@c This node must not have a prev pointer. -@node Language Features, Library Summary, , Top +@c This node must have no pointers. +@node Language Features +@c @node Language Features, Library Summary, , Top @c %MENU% C language features provided by the library @appendix C Language Facilities in the Library diff --git a/manual/libc-texinfo.sh b/manual/libc-texinfo.sh index 7f26f8e..321b955 100644 --- a/manual/libc-texinfo.sh +++ b/manual/libc-texinfo.sh @@ -19,8 +19,8 @@ build_menu () { } collect_nodes () { - grep '^@node.*Top' "$@" /dev/null | cut -d, -f-2 | - sed 's/, /:/; s/:@node /:/; s/ /_/g; s/:/ /g' | + egrep '^(@c )?@node.*Top' "$@" /dev/null | cut -d, -f-2 | + sed 's/@c //; s/, /:/; s/:@node /:/; s/ /_/g; s/:/ /g' | $AWK '{ file[$2] = $1; nnode[$2] = $3 } END { for (x in file) if (file[x] != "") @@ -34,8 +34,8 @@ if [ -n "$2" ]; then { echo; echo 'Add-ons'; echo; } >&4 - grep '^@node.*Top' `echo $2 /dev/null | tr ' ' '\n' | sort` | - cut -d, -f1 | sed 's/@node //' | build_menu + egrep '^(@c )?@node.*Top' `echo $2 /dev/null | tr ' ' '\n' | sort` | + cut -d, -f1 | sed 's/@c //;s/@node //' | build_menu fi diff --git a/manual/stdio.texi b/manual/stdio.texi index 99a7116..cf615e4 100644 --- a/manual/stdio.texi +++ b/manual/stdio.texi @@ -1,5 +1,5 @@ @node I/O on Streams, Low-Level I/O, I/O Overview, Top -@c %MENU% Hign-level, portable I/O facilities +@c %MENU% High-level, portable I/O facilities @chapter Input/Output on Streams @c fix an overfull: @tex diff --git a/manual/texis b/manual/texis index 4459561..c62c558 100644 --- a/manual/texis +++ b/manual/texis @@ -66,6 +66,7 @@ users.texi \ db.c.texi \ sysinfo.texi \ conf.texi \ +../crypt/crypt.texi \ ../linuxthreads/linuxthreads.texi \ lang.texi \ add.c.texi \ diff --git a/posix/fnmatch.c b/posix/fnmatch.c index 0f0648b..dc389ef 100644 --- a/posix/fnmatch.c +++ b/posix/fnmatch.c @@ -239,7 +239,7 @@ fnmatch (pattern, string, flags) c = *p++; for (;;) { - unsigned int fn = FOLD (*n); + unsigned char fn = FOLD ((unsigned char) *n); if (!(flags & FNM_NOESCAPE) && c == '\\') { @@ -283,21 +283,21 @@ fnmatch (pattern, string, flags) /* Invalid character class name. */ return FNM_NOMATCH; - if (__iswctype (__btowc (*n), wt)) + if (__iswctype (__btowc ((unsigned char) *n), wt)) goto matched; # else - if ((STREQ (str, "alnum") && ISALNUM (*n)) - || (STREQ (str, "alpha") && ISALPHA (*n)) - || (STREQ (str, "blank") && ISBLANK (*n)) - || (STREQ (str, "cntrl") && ISCNTRL (*n)) - || (STREQ (str, "digit") && ISDIGIT (*n)) - || (STREQ (str, "graph") && ISGRAPH (*n)) - || (STREQ (str, "lower") && ISLOWER (*n)) - || (STREQ (str, "print") && ISPRINT (*n)) - || (STREQ (str, "punct") && ISPUNCT (*n)) - || (STREQ (str, "space") && ISSPACE (*n)) - || (STREQ (str, "upper") && ISUPPER (*n)) - || (STREQ (str, "xdigit") && ISXDIGIT (*n))) + if ((STREQ (str, "alnum") && ISALNUM ((unsigned char) *n)) + || (STREQ (str, "alpha") && ISALPHA ((unsigned char) *n)) + || (STREQ (str, "blank") && ISBLANK ((unsigned char) *n)) + || (STREQ (str, "cntrl") && ISCNTRL ((unsigned char) *n)) + || (STREQ (str, "digit") && ISDIGIT ((unsigned char) *n)) + || (STREQ (str, "graph") && ISGRAPH ((unsigned char) *n)) + || (STREQ (str, "lower") && ISLOWER ((unsigned char) *n)) + || (STREQ (str, "print") && ISPRINT ((unsigned char) *n)) + || (STREQ (str, "punct") && ISPUNCT ((unsigned char) *n)) + || (STREQ (str, "space") && ISSPACE ((unsigned char) *n)) + || (STREQ (str, "upper") && ISUPPER ((unsigned char) *n)) + || (STREQ (str, "xdigit") && ISXDIGIT ((unsigned char) *n))) goto matched; # endif } diff --git a/sysdeps/i386/bits/select.h b/sysdeps/i386/bits/select.h index d31792d..0d1b71b 100644 --- a/sysdeps/i386/bits/select.h +++ b/sysdeps/i386/bits/select.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 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 @@ -28,7 +28,7 @@ int __d0, __d1; \ __asm__ __volatile__ ("cld; rep; stosl" \ : "=m" (__FDS_BITS (fdsp)[__FDELT (__FD_SETSIZE)]), \ - "=&c" (__d0), "=&D" (__d1) \ + "=c" (__d0), "=D" (__d1) \ : "a" (0), "1" (sizeof (__fd_set) \ / sizeof (__fd_mask)), \ "2" (&__FDS_BITS (fdsp)[0]) \ diff --git a/sysdeps/unix/sysv/linux/alpha/bits/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h index d71599c..0bc6cf6 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/types.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,94,95,96,97,98,99 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 @@ -63,7 +63,7 @@ typedef __int32_t __blkcnt_t; /* Type to count nr disk blocks. */ typedef __int64_t __blkcnt64_t; /* "" (LFS) */ typedef __uint32_t __fsblkcnt_t; /* Type to count file system blocks. */ typedef __uint64_t __fsblkcnt64_t; /* "" (LFS) */ -typedef __uint64_t __fsfilcnt_t; /* Type to count file system inodes. */ +typedef __uint32_t __fsfilcnt_t; /* Type to count file system inodes. */ typedef __uint64_t __fsfilcnt64_t; /* "" (LFS) */ typedef __uint32_t __id_t; /* General type for IDs. */ diff --git a/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h b/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h index 089be69..d92c9fa 100644 --- a/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h +++ b/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h @@ -17,7 +17,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define SIGCONTEXT int signal, int _a2, int _a3, int _a4, union k_sigcontext +#define SIGCONTEXT int _a2, int _a3, int _a4, union k_sigcontext #define GET_PC(ctx) ((void *)((ctx.v20.magic == SIGCONTEXT_2_0_MAGIC) ? \ ctx.v20.reg.ARM_pc : ctx.v21.arm_pc)) diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c index b6a6828..bac99e8 100644 --- a/wcsmbs/btowc.c +++ b/wcsmbs/btowc.c @@ -1,6 +1,6 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper, + Contributed by Ulrich Drepper , 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -22,13 +22,14 @@ #include #include #include +#include wint_t __btowc (c) int c; { - char buf[sizeof (wchar_t)]; + wchar_t result; struct gconv_step_data data; char inbuf[1]; const char *inptr = inbuf; @@ -37,11 +38,11 @@ __btowc (c) /* If the parameter does not fit into one byte or it is the EOF value we can give the answer now. */ - if (c < -128 || c > 127 || c == EOF) + if (c < SCHAR_MIN || c > UCHAR_MAX || c == EOF) return WEOF; /* Tell where we want the result. */ - data.outbuf = (char *) buf; + data.outbuf = (char *) &result; data.outbufend = data.outbuf + sizeof (wchar_t); data.invocation_counter = 0; data.internal_use = 1; @@ -62,8 +63,8 @@ __btowc (c) /* The conversion failed. */ if (status != GCONV_OK && status != GCONV_FULL_OUTPUT && status != GCONV_EMPTY_INPUT) - return WEOF; + result = WEOF; - return *(wchar_t *)buf; + return result; } weak_alias (__btowc, btowc) -- cgit v1.1