X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=cfg.mk;h=f1bdec103c16942958a45c8b3e046e6adad5346f;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=37fb0a6cc494da2580638ced0fc548b73f194b27;hpb=34823be715ed9e6f3f1b1ebcbe711dad18acd45a;p=gnulib.git

diff --git a/cfg.mk b/cfg.mk
index 37fb0a6cc..f1bdec103 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -3,7 +3,6 @@
 local-checks-to-skip =			\
   sc_GFDL_version			\
   sc_GPL_version			\
-  sc_avoid_if_before_free		\
   sc_bindtextdomain			\
   sc_cast_of_alloca_return_value	\
   sc_cast_of_argument_to_free		\
@@ -23,14 +22,12 @@ local-checks-to-skip =			\
   sc_prohibit_always-defined_macros	\
   sc_prohibit_atoi_atof			\
   sc_prohibit_c_ctype_without_use	\
-  sc_prohibit_cloexec_without_use	\
   sc_prohibit_dirent_without_use	\
   sc_prohibit_error_without_use		\
   sc_prohibit_getopt_without_use	\
   sc_prohibit_have_config_h		\
   sc_prohibit_inttostr_without_use	\
   sc_prohibit_magic_number_exit		\
-  sc_prohibit_openat_without_use	\
   sc_prohibit_path_max_allocation	\
   sc_prohibit_reversed_compare_failure	\
   sc_prohibit_safe_read_without_use	\
@@ -46,7 +43,6 @@ local-checks-to-skip =			\
   sc_require_config_h_first		\
   sc_space_tab				\
   sc_texinfo_acronym			\
-  sc_trailing_blank			\
   sc_two_space_separator_in_usage	\
   sc_unmarked_diagnostics		\
   sc_useless_cpp_parens
@@ -56,3 +52,31 @@ exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
   ^modules/|^lib/javaversion\.class$$|$(empty-at-EOF)
 exclude_file_name_regexp--sc_prohibit_doubled_word = \
   ^(tests/test-init\.sh|lib/base(32|64)\.c)$$
+exclude_file_name_regexp--sc_prohibit_openat_without_use = ^lib/selinux-at\.c$$
+exclude_file_name_regexp--sc_trailing_blank = \
+  ^(.*\.class|build-aux/texinfo\.tex|doc/Copyright/assign\.future\.manual)$$
+
+# Disable strncpy prohibition completely, for now.
+exclude_file_name_regexp--sc_prohibit_strncpy = .*
+
+if_before_free_offenders_ =	\
+  clean-temp.c			\
+  csharpcomp.c			\
+  free.c			\
+  fstrcmp.c			\
+  gl_carray_list.c		\
+  glob.c			\
+  glthread/lock.c		\
+  propername.c			\
+  relocatable.c			\
+  vasnprintf.c
+
+if_before_free_basename_re_ = \
+  $(shell printf '%s\n' '$(if_before_free_offenders_)' \
+    |sed 's|\.c\>||g'|tr -s '[\n[:space:]]' '|')
+
+exclude_file_name_regexp--sc_avoid_if_before_free = \
+  ^lib/($(if_before_free_basename_re_))\.c$$
+
+exclude_file_name_regexp--sc_prohibit_defined_have_decl_tests = \
+  ^lib/((error|getopt|strtoimax)\.c|(argp-namefrob)\.h)$$