From 231bdaf6198a766ae5442fef6f4b8e661d523868 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 9 Oct 2009 19:17:17 -0600 Subject: [PATCH] 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 --- ChangeLog | 24 ++++++++++++++++++++++++ doc/posix-functions/fstatat.texi | 2 +- doc/posix-functions/lstat.texi | 2 +- lib/file-has-acl.c | 2 +- lib/fwriteerror.c | 4 ++-- tests/test-areadlink.h | 2 +- tests/test-areadlinkat-with-size.c | 2 +- tests/test-areadlinkat.c | 2 +- tests/test-canonicalize-lgpl.c | 2 +- tests/test-canonicalize.c | 2 +- tests/test-fstatat.c | 2 +- tests/test-linkat.c | 2 +- tests/test-lstat.h | 2 +- tests/test-mkdir.h | 2 +- tests/test-readlink.h | 2 +- tests/test-remove.c | 2 +- tests/test-rename.h | 2 +- tests/test-renameat.c | 2 +- tests/test-rmdir.h | 2 +- tests/test-symlink.h | 2 +- tests/test-symlinkat.c | 2 +- tests/test-unlink.h | 2 +- tests/test-unlinkat.c | 2 +- 23 files changed, 47 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c57ea154..61e6168bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,29 @@ 2009-10-09 Eric Blake + 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 b96fc4d54..6a3827bd0 100644 --- 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 328b896c9..39d2dcefc 100644 --- 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 5e6bfe615..4dda3ade2 100644 --- 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 21bd09804..325f9bf7d 100644 --- 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 , 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 07ccf232d..57fdb7af5 100644 --- 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 43715d01f..df4afc258 100644 --- 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 6b0c96c77..5f8d4b085 100644 --- 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 6efd714e8..cb0979001 100644 --- 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 658987722..7de6059e0 100644 --- 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 28a71fad9..2c6526273 100644 --- 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 6aa3ca71d..9740d26cd 100644 --- 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 68e4f745c..a47eb096e 100644 --- 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 1fd7fe4a5..61a3ef6fe 100644 --- 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 996e11f3a..4ce67f79d 100644 --- 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 c084d8c65..2d5d6337c 100644 --- 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 5dc89180a..b4f8c1243 100644 --- 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 09e511902..c69a75fc9 100644 --- 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 94636ddad..a85973955 100644 --- 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 99072935c..d009a8098 100644 --- 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 4a6fe0a7b..3b542e330 100644 --- 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 80cce9486..6b6384e50 100644 --- 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 785ede4ca..851ffe7ca 100644 --- 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; } -- 2.11.0