maint: prefer 'file system' over 'filesystem'

* doc/posix-functions/fstatat.texi (fstatat): Likewise.
* doc/posix-functions/lstat.texi (lstat): Likewise.
* lib/file-has-acl.c (file_has_acl): Likewise.
* lib/fwriteerror.c [TEST]: Likewise.
* tests/test-areadlink.h (test_areadlink): Likewise.
* tests/test-areadlinkat-with-size.c (main): Likewise.
* tests/test-areadlinkat.c (main): Likewise.
* tests/test-canonicalize-lgpl.c (main): Likewise.
* tests/test-canonicalize.c (main): Likewise.
* tests/test-fstatat.c (main): Likewise.
* tests/test-linkat.c (main): Likewise.
* tests/test-lstat.h (test_lstat_func): Likewise.
* tests/test-mkdir.h (test_mkdir): Likewise.
* tests/test-readlink.h (test_readlink): Likewise.
* tests/test-remove.c (main): Likewise.
* tests/test-rename.h (test_rename): Likewise.
* tests/test-renameat.c (main): Likewise.
* tests/test-rmdir.h (test_rmdir_func): Likewise.
* tests/test-symlink.h (test_symlink): Likewise.
* tests/test-symlinkat.c (main): Likewise.
* tests/test-unlink.h (test_unlink_func): Likewise.
* tests/test-unlinkat.c (main): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 0c57ea15480fba9dabd57af8681ad0c384a32ed4..61e6168bc8896c984cd02f2ab8340995a682b2b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
 2009-10-09  Eric Blake  <ebb9@byu.net>
 
+       maint: prefer 'file system' over 'filesystem'
+       * doc/posix-functions/fstatat.texi (fstatat): Likewise.
+       * doc/posix-functions/lstat.texi (lstat): Likewise.
+       * lib/file-has-acl.c (file_has_acl): Likewise.
+       * lib/fwriteerror.c [TEST]: Likewise.
+       * tests/test-areadlink.h (test_areadlink): Likewise.
+       * tests/test-areadlinkat-with-size.c (main): Likewise.
+       * tests/test-areadlinkat.c (main): Likewise.
+       * tests/test-canonicalize-lgpl.c (main): Likewise.
+       * tests/test-canonicalize.c (main): Likewise.
+       * tests/test-fstatat.c (main): Likewise.
+       * tests/test-linkat.c (main): Likewise.
+       * tests/test-lstat.h (test_lstat_func): Likewise.
+       * tests/test-mkdir.h (test_mkdir): Likewise.
+       * tests/test-readlink.h (test_readlink): Likewise.
+       * tests/test-remove.c (main): Likewise.
+       * tests/test-rename.h (test_rename): Likewise.
+       * tests/test-renameat.c (main): Likewise.
+       * tests/test-rmdir.h (test_rmdir_func): Likewise.
+       * tests/test-symlink.h (test_symlink): Likewise.
+       * tests/test-symlinkat.c (main): Likewise.
+       * tests/test-unlink.h (test_unlink_func): Likewise.
+       * tests/test-unlinkat.c (main): Likewise.
+
        maint: make realtime library usage explicit
        * modules/gethrxtime (Link): Mention LIB_GETHRXTIME.
        * modules/gettime (Link): Mention LIB_CLOCK_GETTIME.

diff --git a/doc/posix-functions/fstatat.texi b/doc/posix-functions/fstatat.texi
index b96fc4d54e7d0195a7de268dce5376f9ef3ba978..6a3827bd0e9067aa2719f36256654f03d7dc3600 100644 (file)
--- a/doc/posix-functions/fstatat.texi
+++ b/doc/posix-functions/fstatat.texi
@@ -32,7 +32,7 @@ GB.  The fix is to use the @code{AC_SYS_LARGEFILE} macro.
 @item
 On Windows platforms (excluding Cygwin), @code{st_ino} is always 0.
 @item
-On some filesystems, @code{st_size} contains bogus information for
+On some file systems, @code{st_size} contains bogus information for
 symlinks; use the gnulib module areadlink-with-size for a better way
 to get symlink contents.
 @end itemize

diff --git a/doc/posix-functions/lstat.texi b/doc/posix-functions/lstat.texi
index 328b896c9004edd373620c46a33910fd9c8294f5..39d2dcefc562d39507755f69844d16afb715a45a 100644 (file)
--- a/doc/posix-functions/lstat.texi
+++ b/doc/posix-functions/lstat.texi
@@ -36,7 +36,7 @@ expressions such as @code{(islnk ? lstat : stat) (name, buf)} are not
 portable, and should instead be written @code{islnk ? lstat (name,
 buf) : stat (name, buf)}.
 @item
-On some filesystems, @code{st_size} contains bogus information for
+On some file systems, @code{st_size} contains bogus information for
 symlinks; use the gnulib module areadlink-with-size for a better way
 to get symlink contents.
 @end itemize

diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
index 5e6bfe615473c3d8a5cfe95a1b35c4bd93fc0873..4dda3ade2aca725518b302dadc88628e588bc2c6 100644 (file)
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -354,7 +354,7 @@ file_has_acl (char const *name, struct stat const *sb)
              /* On Linux, FreeBSD, IRIX, acl_get_file (name, ACL_TYPE_ACCESS)
                 and acl_get_file (name, ACL_TYPE_DEFAULT) on a directory
                 either both succeed or both fail; it depends on the
-                filesystem.  Therefore there is no point in making the second
+                file system.  Therefore there is no point in making the second
                 call if the first one already failed.  */
              if (ret == 0 && S_ISDIR (sb->st_mode))
                {

diff --git a/lib/fwriteerror.c b/lib/fwriteerror.c
index 21bd09804e7c0b35d4013588e95751be9583c5eb..325f9bf7d7c22eb89f530a8eb2911a4917d5d4b4 100644 (file)
--- a/lib/fwriteerror.c
+++ b/lib/fwriteerror.c
@@ -1,5 +1,5 @@
 /* Detect write error on a stream.
-   Copyright (C) 2003-2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2003-2006, 2008, 2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -125,7 +125,7 @@ fwriteerror_no_ebadf (FILE *fp)
 #if TEST
 
 /* Name of a file on which writing fails.  On systems without /dev/full,
-   you can choose a filename on a full filesystem.  */
+   you can choose a filename on a full file system.  */
 #define UNWRITABLE_FILE "/dev/full"
 
 int

diff --git a/tests/test-areadlink.h b/tests/test-areadlink.h
index 07ccf232dc4232e6abc1147f1d627cdbd03fdbda..57fdb7af582f84183a84638403b814e6f624acd9 100644 (file)
--- a/tests/test-areadlink.h
+++ b/tests/test-areadlink.h
@@ -56,7 +56,7 @@ test_areadlink (char * (*func) (char const *, size_t), bool print)
   if (symlink (BASE "dir", BASE "link"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       return 77;
     }

diff --git a/tests/test-areadlinkat-with-size.c b/tests/test-areadlinkat-with-size.c
index 43715d01f568faf267aee23d9f24846f70d86069..df4afc25894e0573d65c234dbebc110fcca4c674 100644 (file)
--- a/tests/test-areadlinkat-with-size.c
+++ b/tests/test-areadlinkat-with-size.c
@@ -70,7 +70,7 @@ main ()
 
   /* Relative tests.  */
   if (result == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
            stderr);
   else
     {

diff --git a/tests/test-areadlinkat.c b/tests/test-areadlinkat.c
index 6b0c96c77fd151775a709820c61e93cfa7433196..5f8d4b08506f08881b4e3bfa3f1b07f320f4f5dc 100644 (file)
--- a/tests/test-areadlinkat.c
+++ b/tests/test-areadlinkat.c
@@ -70,7 +70,7 @@ main ()
 
   /* Relative tests.  */
   if (result == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
            stderr);
   else
     {

diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index 6efd714e8626accec6fa09390501b4c10568eaf8..cb09790018509ba98e806f3d6c0aa8c97863dc96 100644 (file)
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -103,7 +103,7 @@ main ()
     {
       ASSERT (remove (BASE "/tra") == 0);
       ASSERT (rmdir (BASE) == 0);
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
+      fputs ("skipping test: symlinks not supported on this file system\n",
             stderr);
       return 77;
     }

diff --git a/tests/test-canonicalize.c b/tests/test-canonicalize.c
index 658987722438d00f2007c8c923710a802b139a7d..7de6059e06f44d6a357ee388ff1dca1e01753ea8 100644 (file)
--- a/tests/test-canonicalize.c
+++ b/tests/test-canonicalize.c
@@ -121,7 +121,7 @@ main ()
     {
       ASSERT (remove (BASE "/tra") == 0);
       ASSERT (rmdir (BASE) == 0);
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
+      fputs ("skipping test: symlinks not supported on this file system\n",
             stderr);
       return 77;
     }

diff --git a/tests/test-fstatat.c b/tests/test-fstatat.c
index 28a71fad9acc40be92afb7db38bcf484db770d4f..2c652627389fea3013f73f9960505220e4f49323 100644 (file)
--- a/tests/test-fstatat.c
+++ b/tests/test-fstatat.c
@@ -79,7 +79,7 @@ main ()
   /* FIXME - add additional tests of dfd not at current directory.  */
 
   if (result == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
           stderr);
   return result;
 }

diff --git a/tests/test-linkat.c b/tests/test-linkat.c
index 6aa3ca71d1909bc82fa59f6dfadf85e056b631c3..9740d26cd6f519b5dfb8eda506142993ab1561a9 100644 (file)
--- a/tests/test-linkat.c
+++ b/tests/test-linkat.c
@@ -166,7 +166,7 @@ main ()
       ASSERT (rmdir (BASE "sub1") == 0);
       ASSERT (rmdir (BASE "sub2") == 0);
       free (cwd);
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
+      fputs ("skipping test: symlinks not supported on this file system\n",
              stderr);
       return result;
     }

diff --git a/tests/test-lstat.h b/tests/test-lstat.h
index 68e4f745cc1cbe45a642a751099fc35e7c0e4130..a47eb096e4b8bfdadaea272bd1d74b84a9402dc0 100644 (file)
--- a/tests/test-lstat.h
+++ b/tests/test-lstat.h
@@ -74,7 +74,7 @@ test_lstat_func (int (*func) (char const *, struct stat *), bool print)
     {
       ASSERT (unlink (BASE "file") == 0);
       if (print)
-       fputs ("skipping test: symlinks not supported on this filesystem\n",
+       fputs ("skipping test: symlinks not supported on this file system\n",
               stderr);
       return 77;
     }

diff --git a/tests/test-mkdir.h b/tests/test-mkdir.h
index 1fd7fe4a599a0c1b22dfa1d35124622589776d16..61a3ef6fe5b33a6a0335bd746a58f467a8049f56 100644 (file)
--- a/tests/test-mkdir.h
+++ b/tests/test-mkdir.h
@@ -67,7 +67,7 @@ test_mkdir (int (*func) (char const *, mode_t), bool print)
   if (symlink (BASE "dir", BASE "link"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       return 77;
     }

diff --git a/tests/test-readlink.h b/tests/test-readlink.h
index 996e11f3a58f2d29905d88f3f1c62cf6217af107..4ce67f79d560446021bef2d735cbe83f9b631a4b 100644 (file)
--- a/tests/test-readlink.h
+++ b/tests/test-readlink.h
@@ -58,7 +58,7 @@ test_readlink (ssize_t (*func) (char const *, char *, size_t), bool print)
   if (symlink (BASE "dir", BASE "link"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       return 77;
     }

diff --git a/tests/test-remove.c b/tests/test-remove.c
index c084d8c656616d6c55d6052ee2f99859f3fbb812..2d5d6337c46f884b1f77d640040c9567e0adc28b 100644 (file)
--- a/tests/test-remove.c
+++ b/tests/test-remove.c
@@ -92,7 +92,7 @@ main ()
      symlink.  */
   if (symlink (BASE "dir", BASE "link") != 0)
     {
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
+      fputs ("skipping test: symlinks not supported on this file system\n",
              stderr);
       return 77;
     }

diff --git a/tests/test-rename.h b/tests/test-rename.h
index 5dc89180a80d436af1b7329d5a6a2cdbbf838b2a..b4f8c1243e7b90f60b3724fa84a086abe176d678 100644 (file)
--- a/tests/test-rename.h
+++ b/tests/test-rename.h
@@ -245,7 +245,7 @@ test_rename (int (*func) (char const *, char const *), bool print)
   if (symlink (BASE "file", BASE "link1"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       ASSERT (unlink (BASE "file") == 0);
       ASSERT (rmdir (BASE "dir") == 0);

diff --git a/tests/test-renameat.c b/tests/test-renameat.c
index 09e51190247f9c337dbeeb13f35a08967c83ad79..c69a75fc9b56766f832405a715df2abf9932e86d 100644 (file)
--- a/tests/test-renameat.c
+++ b/tests/test-renameat.c
@@ -179,7 +179,7 @@ main ()
   free (cwd);
 
   if (result)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
            stderr);
   return result;
 }

diff --git a/tests/test-rmdir.h b/tests/test-rmdir.h
index 94636ddad910f0e64b5ffa876847159ca90fca3f..a85973955495b68110b605ccd2c2ad7af439f5a7 100644 (file)
--- a/tests/test-rmdir.h
+++ b/tests/test-rmdir.h
@@ -80,7 +80,7 @@ test_rmdir_func (int (*func) (char const *name), bool print)
   if (symlink (BASE "dir", BASE "link") != 0)
     {
       if (print)
-       fputs ("skipping test: symlinks not supported on this filesystem\n",
+       fputs ("skipping test: symlinks not supported on this file system\n",
               stderr);
       return 77;
     }

diff --git a/tests/test-symlink.h b/tests/test-symlink.h
index 99072935c3838aeb10f09dbc60bcd306411ef641..d009a80985b49371c316cbb504b683be591198cf 100644 (file)
--- a/tests/test-symlink.h
+++ b/tests/test-symlink.h
@@ -28,7 +28,7 @@ test_symlink (int (*func) (char const *, char const *), bool print)
   if (func ("nowhere", BASE "link1"))
     {
       if (print)
-        fputs ("skipping test: symlinks not supported on this filesystem\n",
+        fputs ("skipping test: symlinks not supported on this file system\n",
                stderr);
       return 77;
     }

diff --git a/tests/test-symlinkat.c b/tests/test-symlinkat.c
index 4a6fe0a7b509855e62a159d0abc0981567a715c2..3b542e3309d5df882db366253d3a57a041838d69 100644 (file)
--- a/tests/test-symlinkat.c
+++ b/tests/test-symlinkat.c
@@ -117,7 +117,7 @@ main ()
 
   ASSERT (close (dfd) == 0);
   if (result == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
           stderr);
   return result;
 }

diff --git a/tests/test-unlink.h b/tests/test-unlink.h
index 80cce948662b0c06d742f5516f7e9d1e0bd78166..6b6384e50f864efbc34aa171cb55000f68f8e983 100644 (file)
--- a/tests/test-unlink.h
+++ b/tests/test-unlink.h
@@ -68,7 +68,7 @@ test_unlink_func (int (*func) (char const *name), bool print)
       ASSERT (func (BASE "dir/file") == 0);
       ASSERT (rmdir (BASE "dir") == 0);
       if (print)
-       fputs ("skipping test: symlinks not supported on this filesystem\n",
+       fputs ("skipping test: symlinks not supported on this file system\n",
               stderr);
       return 77;
     }

diff --git a/tests/test-unlinkat.c b/tests/test-unlinkat.c
index 785ede4cae79d9a5d70380819c4b8860b53abff5..851ffe7ca4ccaff19bc5e3091809d87c5de7718b 100644 (file)
--- a/tests/test-unlinkat.c
+++ b/tests/test-unlinkat.c
@@ -79,7 +79,7 @@ main ()
   ASSERT (result1 == result2);
   ASSERT (close (dfd) == 0);
   if (result1 == 77)
-    fputs ("skipping test: symlinks not supported on this filesystem\n",
+    fputs ("skipping test: symlinks not supported on this file system\n",
           stderr);
   return result1;
 }