X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=check-module;h=c5e5e1ccc546588daef5e9b82afb45022a6b00ed;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=6961cd0a872fb328dee520c9f9d246edb9269a47;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/check-module b/check-module
index 6961cd0a8..c5e5e1ccc 100755
--- a/check-module
+++ b/check-module
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # Check a gnulib module.
 
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc.
 
 # This file is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 
 # Read a module description file and derive the set of files
-# included directly by any .c or .h file listed in the `Files:' section.
+# included directly by any .c or .h file listed in the 'Files:' section.
 # Take the union of all such sets for any dependent modules.
 # Then, compare that set with the set derived from the names
 # listed in the various Files: sections.
@@ -31,12 +31,13 @@
 # FIXME:
 # for each .m4 file listed in the Files: section(s)
 # parse it for AC_LIBSOURCES directives, and accumulate the set
-# of files `required' via all AC_LIBSOURCES.
+# of files "required" via all AC_LIBSOURCES.
 # If this set is not empty, ensure that it contains
 # the same (.c and .h only?) files as are listed in the Files: sections.
 
 use strict;
 use Getopt::Long;
+use File::Basename;
 #use Coda;
 
 my $COPYRIGHT_NOTICE = "Copyright (C) 2006 Free Software Foundation, Inc.\n".
@@ -59,7 +60,7 @@ sub parse_module_file ($)
   my ($module_file) = @_;
 
   open FH, '<', $module_file
-    or die "$ME: can't open `$module_file' for reading: $!\n";
+    or die "$ME: can't open '$module_file' for reading: $!\n";
 
   my %file_set;
   my %dep_set;
@@ -129,7 +130,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try '$ME --help' for more information.\n";
     }
   else
     {
@@ -137,7 +138,7 @@ sub usage ($)
 Usage: $ME [OPTIONS] FILE...
 
 Read a module description file and derive the set of files
-included directly by any .c or .h file listed in the `Files:' section.
+included directly by any .c or .h file listed in the 'Files:' section.
 Take the union of all such sets for any dependent modules.
 Then, compare that set with the set derived from the names
 listed in the various Files: sections.
@@ -158,11 +159,20 @@ sub find_included_lib_files ($)
 
   # Special cases...
   my %special_non_dup = ( 'fnmatch_loop.c' => 1,
-			  'regex.c' => 1, 'at-func.c' => 1 );
+			  'regex.c' => 1, 'at-func.c' => 1,
+			  'vasnprintf.c' => 1
+			);
+  my %dup_include_ok;
+  $dup_include_ok{'vasnprintf.c'}{'isnand-nolibm.h'} = 1;
+  $dup_include_ok{'vasnprintf.c'}{'isnanl-nolibm.h'} = 1;
+  $dup_include_ok{'vasnprintf.c'}{'fpucw.h'} = 1;
+  $dup_include_ok{'gen-uni-tables.c'}{'3level.h'} = 1;
+  $dup_include_ok{'csharpexec.c'}{'classpath.c'} = 1;
+  $dup_include_ok{'csharpexec.c'}{'classpath.h'} = 1;
 
   my %inc;
   open FH, '<', $file
-    or die "$ME: can't open `$file' for reading: $!\n";
+    or die "$ME: can't open '$file' for reading: $!\n";
 
   while (defined (my $line = <FH>))
     {
@@ -176,6 +186,7 @@ sub find_included_lib_files ($)
       chomp $line;
       $line =~ s/".*//;
       exists $inc{$line} && ! exists $special_non_dup{$line}
+	  && ! exists $dup_include_ok{basename $file}{$line}
 	and warn "$ME: $file: duplicate inclusion of $line\n";
 
       $inc{$line} = 1;
@@ -187,7 +198,7 @@ sub find_included_lib_files ($)
 
 my %exempt_header =
   (
-   # Exempt headers like unlocked-io.h that are `#include'd
+   # Exempt headers like unlocked-io.h that are '#include'd
    # but not necessarily used.
    'unlocked-io.h' => 1,
 
@@ -217,10 +228,6 @@ my %exempt_header =
    'lib/gc-gnulib.c:rijndael-api-fst.h' => 1,
    'lib/gc-gnulib.c:hmac.h' => 1,
    'lib/gc-libgcrypt.c:md2.h' => 1,
-
-   # The fts-lgpl module doesn't actually use fts-cycle.c and unistd-safer.h.
-   'lib/fts.c:fts-cycle.c' => 1,
-   'lib/fts.c:unistd-safer.h' => 1,
   );
 
 sub check_module ($)
@@ -265,7 +272,7 @@ sub check_module ($)
 	    || exists $exempt_header{$i}
 	      and next;
 	  !exists $module_all_files{$lib_file} && -f "../lib/$i"
-	    and warn "$f: $i is `#include'd, but not "
+	    and warn "$f: $i is '#include'd, but not "
 	      . "listed in module's Files: section\n";
 	}
       #my @t = sort keys %$inc;