Add rules to run scripts/begin-end-check.pl.

diff --git a/Makefile b/Makefile
index 734687cf3dc88fef1cf82d5314646209ba425ec0..4535ab40354d05eaf297d8bf08631bb07c36b7d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -241,7 +241,7 @@ check-data := $(firstword $(wildcard \
                $(foreach M,$(config-machine) $(base-machine),\
                          scripts/data/c++-types-$M-$(config-os).data)))
 ifneq (,$(check-data))
-$(objpfx)c++-types-check.out: $(check-data)
+$(objpfx)c++-types-check.out: $(check-data) scripts/check-c++-types.sh
        scripts/check-c++-types.sh $^ $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@
 else
 $(objpfx)c++-types-check.out:
@@ -250,6 +250,56 @@ $(objpfx)c++-types-check.out:
 endif
 endif
 
+ifneq ($(PERL),no)
+installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \
+                   crypt/crypt.h ctype/ctype.h debug/execinfo.h \
+                   dirent/dirent.h dlfcn/dlfcn.h elf/elf.h elf/link.h \
+                   gmon/sys/gmon.h gmon/sys/gmon_out.h gmon/sys/profil.h \
+                   grp/grp.h iconv/iconv.h iconv/gconv.h \
+                   $(wildcard inet/netinet/*.h) \
+                   $(wildcard inet/arpa/*.h inet/protocols/*.h) \
+                   inet/aliases.h inet/ifaddrs.h inet/netinet/ip6.h \
+                   inet/netinet/icmp6.h intl/libintl.h io/sys/stat.h \
+                   io/sys/statfs.h io/sys/vfs.h io/sys/statvfs.h \
+                   io/fcntl.h io/sys/fcntl.h io/poll.h io/sys/poll.h \
+                   io/utime.h io/ftw.h io/fts.h io/sys/sendfile.h \
+                   libio/stdio.h libio/libio.h locale/locale.h \
+                   locale/langinfo.h locale/xlocale.h login/utmp.h \
+                   login/lastlog.h login/pty.h malloc/malloc.h \
+                   malloc/obstack.h malloc/mcheck.h math/math.h \
+                   math/complex.h math/fenv.h math/tgmath.h misc/sys/uio.h \
+                   $(wildcard nis/rpcsvc/*.h) nptl_db/thread_db.h \
+                   nptl/sysdeps/pthread/pthread.h nptl/semaphore.h \
+                   nss/nss.h posix/sys/utsname.h posix/sys/times.h \
+                   posix/sys/wait.h posix/sys/types.h posix/unistd.h \
+                   posix/glob.h posix/regex.h posix/wordexp.h posix/fnmatch.h\
+                   posix/getopt.h posix/tar.h posix/sys/unistd.h \
+                   posix/sched.h posix/re_comp.h posix/wait.h \
+                   posix/cpio.h posix/spawn.h pwd/pwd.h resolv/resolv.h \
+                   resolv/netdb.h $(wildcard resolv/arpa/*.h) \
+                   resource/sys/resource.h resource/sys/vlimit.h \
+                   resource/sys/vtimes.h resource/ulimit.h rt/aio.h \
+                   rt/mqueue.h setjmp/setjmp.h shadow/shadow.h \
+                   signal/signal.h signal/sys/signal.h socket/sys/socket.h \
+                   socket/sys/un.h stdio-common/printf.h \
+                   stdio-common/stdio_ext.h stdlib/stdlib.h stdlib/alloca.h \
+                   stdlib/monetary.h stdlib/fmtmsg.h stdlib/ucontext.h \
+                   sysdeps/generic/inttypes.h sysdeps/generic/stdint.h \
+                   stdlib/errno.h stdlib/sys/errno.h string/string.h \
+                   string/strings.h string/memory.h string/endian.h \
+                   string/argz.h string/envz.h string/byteswap.h \
+                   $(wildcard sunrpc/rpc/*.h sunrpc/rpcsvc/*.h) \
+                   sysvipc/sys/ipc.h sysvipc/sys/msg.h sysvipc/sys/sem.h \
+                   sysvipc/sys/shm.h termios/termios.h \
+                   termios/sys/termios.h termios/sys/ttychars.h time/time.h \
+                   time/sys/time.h time/sys/timeb.h wcsmbs/wchar.h \
+                   wctype/wctype.h
+
+tests: $(objpfx)begin-end-check.out
+$(objpfx)begin-end-check.out: scripts/begin-end-check.pl
+       $(PERL) scripts/begin-end-check.pl $(installed-headers) > $@
+endif
+
 # The realclean target is just like distclean for the parent, but we want
 # the subdirs to know the difference in case they care.
 realclean distclean: parent-clean

diff --git a/scripts/begin-end-check.pl b/scripts/begin-end-check.pl
new file mode 100644 (file)
index 0000000..1616931
--- /dev/null
+++ b/scripts/begin-end-check.pl
@@ -0,0 +1,47 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+# Check __BEGIN_NAMESPACE ... __END_NAMESPACE pairing in an include file.
+
+my $code = 0;
+for my $path (@ARGV) {
+    my $localcode = 0;
+    my @stack;
+
+    open my $in, '<', $path
+        or die "open $path failed: $!";
+
+    while (<$in>) {
+        if ( /^\s*__BEGIN_(.*)\b/ ) {
+            push @stack, $1;
+        }
+        elsif ( /^\s*__END_(.*)\b/ ) {
+            if (@stack) {
+                my $tag = pop @stack;
+               if ($1 ne $tag) {
+                    print "$path:$.: BEGIN $tag paired with END $1\n";
+                   $localcode = 1;
+               }
+            }
+            else {
+                print "$path:$.: END $1 does not match a begin\n";
+               $localcode = 1;
+            }
+        }
+    }
+
+    if (@stack) {
+       print "$path: Unmatched begin tags " . join (' ', @stack) ."\n";
+       $localcode = 1;
+    }
+
+    if ($localcode == 0) {
+       print "$path: OK\n";
+    } else {
+       $code = $localcode;
+    }
+}
+
+exit $code;

diff --git a/wctype/wctype.h b/wctype/wctype.h
index f5519aa4eb79b8e0f46cf7dc4221f931cc76256a..5bfe43895c5e03f42c0bf81d40c3383a6b03a84e 100644 (file)
--- a/wctype/wctype.h
+++ b/wctype/wctype.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,97,98,99,2000,01,02 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2002, 2005 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
@@ -44,7 +44,6 @@ typedef unsigned int wint_t;
 #  ifdef __USE_ISOC99
 __USING_NAMESPACE_C99(wint_t)
 #  endif
-__END_NAMESPACE_C99
 # endif
 
 /* Constant expression of type `wint_t' whose value does not correspond