[PATCH 06/25] syntax-check: fix violations and re-enable sc_file_system.

[Gary V. Vaughan]

* cfg.mk (local-checks-to-fix): Remove sc_file_system from list
of disabled checks.
(VC_LIST_ALWAYS_EXCLUDE_REGEX): Match mail directory correctly
to avoid running its contents through syntax-check.
* libltdl/config/ltmain.m4sh (func_mode_link): Use correct
spelling for "file system".
* libltdl/ltdl.c (try_dlopen): Ditto.
* tests/dlloader-api.at: Ditto.

Signed-off-by: Gary V. Vaughan <address@hidden>
---
 build-aux/ltmain.m4sh |    2 +-
 cfg.mk                |    3 +--
 libltdl/ltdl.c        |    2 +-
 tests/dlloader-api.at |    8 ++++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh
index 2ba866b..57e4d06 100644
--- a/build-aux/ltmain.m4sh
+++ b/build-aux/ltmain.m4sh
@@ -6726,7 +6726,7 @@ func_mode_link ()
 
        windows)
          # Use '-' rather than '.', since we only want one
-         # extension on DOS 8.3 filesystems.
+         # extension on DOS 8.3 file systems.
          func_arith $current - $age
          major=$func_arith_result
          versuffix="-$major"
diff --git a/cfg.mk b/cfg.mk
index 5374f8f..8ac193e 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -35,10 +35,9 @@ announcement_Cc_ = address@hidden, $(PACKAGE_BUGREPORT)
 endif
 
 # Don't syntax check the mail subdirectory.
-VC_LIST_ALWAYS_EXCLUDE_REGEX = /mail/
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^mail/
 
 local-checks-to-fix =                          \
-       sc_file_system                          \
        sc_m4_quote_check                       \
        sc_makefile_TAB_only_indentation        \
        sc_makefile_at_at_check                 \
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 448476e..c11baae 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1285,7 +1285,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, 
const char *ext,
     name[ext - base_name] = LT_EOS_CHAR;
   }
 
-  /* Before trawling through the filesystem in search of a module,
+  /* Before trawling through the file system in search of a module,
      check whether we are opening a preloaded module.  */
   if (!dir)
     {
diff --git a/tests/dlloader-api.at b/tests/dlloader-api.at
index 5eeafba..3215c3b 100644
--- a/tests/dlloader-api.at
+++ b/tests/dlloader-api.at
@@ -45,7 +45,7 @@ first_open (lt_user_data data, const char *filename, 
lt_dladvise advise)
   static const char *first_module = "first";
   const char *ctx = (const char *) data;
 
-  /* Use a magic string to avoid possible interactions with filesystem
+  /* Use a magic string to avoid possible interactions with file system
    * objects.  Prepend '/' to short-circuit libltdl's search of
    * $shlibpath_var (e.g. PATH, LD_LIBRARY_PATH, or similar).
    */
@@ -115,7 +115,7 @@ last_open (lt_user_data data, const char *filename, 
lt_dladvise advise)
   static const char *last_module = "last";
   const char *ctx = (const char *) data;
 
-  /* Use a magic string to avoid possible interactions with filesystem
+  /* Use a magic string to avoid possible interactions with file system
    * objects.  Prepend '/' to short-circuit libltdl's search of
    * $shlibpath_var (e.g. PATH, LD_LIBRARY_PATH, or similar).
    */
@@ -277,7 +277,7 @@ main (int argc, char* argv[])
 
   printf ("Found loader \"%s\"\n", finder->name);
 
-  /* Use a magic string to avoid possible interactions with filesystem
+  /* Use a magic string to avoid possible interactions with file system
    * objects.  Prepend '/' to short-circuit libltdl's search of
    * $shlibpath_var (e.g. PATH, LD_LIBRARY_PATH, or similar).
    */
@@ -324,7 +324,7 @@ main (int argc, char* argv[])
 
   lt_dlclose (module);
 
-  /* Use a magic string to avoid possible interactions with filesystem
+  /* Use a magic string to avoid possible interactions with file system
    * objects.  Prepend '/' to short-circuit libltdl's search of
    * $shlibpath_var (e.g. PATH, LD_LIBRARY_PATH, or similar).
    */
-- 
1.7.7.3

Cheers,
-- 
Gary V. Vaughan (gary AT gnu DOT org)