file: Restrict to regular files (RHBZ#582484).

[libguestfs.git] / cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 09a3231..d45ec88 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -36,8 +36,6 @@ local-checks-to-skip =                        \
   sc_prohibit_quote_without_use                \
   sc_prohibit_quotearg_without_use     \
   sc_prohibit_stat_st_blocks           \
-  sc_prohibit_strcmp_and_strncmp       \
-  sc_prohibit_strcmp                   \
   sc_space_tab                         \
   sc_two_space_separator_in_usage      \
   sc_error_message_uppercase           \
@@ -50,7 +48,6 @@ disable_temporarily =                 \
   sc_unmarked_diagnostics              \
   sc_prohibit_ctype_h                  \
   sc_prohibit_asprintf                 \
-  sc_avoid_ctype_macros                        \
   sc_avoid_write
 
 # Avoid uses of write(2).  Either switch to streams (fwrite), or use
@@ -135,7 +132,9 @@ ifeq (0,$(MAKELEVEL))
   # submodule name.  Contrast these:
   # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib
   #  b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda)
-  _submodule_hash = sed 's/.//;s/ .*//'
+  # $ cat .git-module-status
+  # b653eda3ac4864de205419d9f41eec267cb89eeb
+  _submodule_hash = sed 's/^[ +-]//;s/ .*//'
   _update_required := $(shell                                          \
       actual=$$(git submodule status | $(_submodule_hash));            \
       stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)";      \