s/filesystem/file system/ as discussed on -developers

bin/csh/USD.doc/csh.g

@@ -1181,7 +1181,7 @@ file resides.
 which begin with the character `/' are interpreted relative
 to the
 .I root
-directory in the filesystem.
+directory in the file system.
 Other 
 .I pathnames 
 are interpreted relative to the current directory

bin/df/df.1

@@ -46,19 +46,19 @@
 .Oc
 .Op Fl ailn
 .Op Fl t Ar type
-.Op Ar file | filesystem ...
+.Op Ar file | file system ...
 .Sh DESCRIPTION
 The
 .Nm
 utility
 displays statistics about the amount of free disk space on the specified
-.Ar filesystem
+.Ar file system
-or on the filesystem of which
+or on the file system of which
 .Ar file
 is a part.
 Values are displayed in 512-byte per block counts.
-If neither a file or a filesystem operand is specified,
+If neither a file or a file system operand is specified,
-statistics for all mounted filesystems are displayed
+statistics for all mounted file systems are displayed
 (subject to the
 .Fl t
 option below).
@@ -94,20 +94,20 @@ this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl l
-Only display information about locally-mounted filesystems.
+Only display information about locally-mounted file systems.
 .It Fl m
 Use 1048576-byte (1-Mbyte) blocks rather than the default.  Note that
 this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl n
-Print out the previously obtained statistics from the filesystems.
+Print out the previously obtained statistics from the file systems.
 This option should be used if it is possible that one or more
-filesystems are in a state such that they will not be able to provide
+file systems are in a state such that they will not be able to provide
 statistics without a long delay.
 When this option is specified,
 .Nm
-will not request new statistics from the filesystems, but will respond
+will not request new statistics from the file systems, but will respond
 with the possibly stale statistics that were previously obtained.
 .It Fl P
 Use POSIX compliant output of 512-byte blocks rather than the default.
@@ -115,11 +115,11 @@ Note that this overrides the
 .Ev BLOCKSIZE
 specification from the environment.
 .It Fl t
-Only print out statistics for filesystems of the specified types.
+Only print out statistics for file systems of the specified types.
 More than one type may be specified in a comma separated list.
-The list of filesystem types can be prefixed with
+The list of file system types can be prefixed with
 .Dq no
-to specify the filesystem types for which action should
+to specify the file system types for which action should
 .Em not
 be taken.
 For example, the
@@ -129,13 +129,13 @@ command:
 df -t nonfs,nullfs
 .Ed
 .Pp
-lists all filesystems except those of type
+lists all file systems except those of type
 .Tn NFS
 and
 .Tn NULLFS .
 The
 .Xr lsvfs 1
-command can be used to find out the types of filesystems
+command can be used to find out the types of file systems
 that are available on the system.
 .El
 .Sh ENVIRONMENT
@@ -150,7 +150,7 @@ The
 .Fl n
 and
 .Fl t
-flags are ignored if a file or filesystem is specified.
+flags are ignored if a file or file system is specified.
 .Sh SEE ALSO
 .Xr lsvfs 1 ,
 .Xr quota 1 ,

bin/df/df.c

@@ -289,8 +289,8 @@ getmntpt(char *name)
 }
 
 /*
- * Make a pass over the filesystem info in ``mntbuf'' filtering out
+ * Make a pass over the file system info in ``mntbuf'' filtering out
- * filesystem types not in vfslist and possibly re-stating to get
+ * file system types not in vfslist and possibly re-stating to get
  * current (not cached) info.  Returns the new count of valid statfs bufs.
  */
 static long
@@ -367,15 +367,15 @@ prthumanval(double bytes)
 }
 
 /*
- * Convert statfs returned filesystem size into BLOCKSIZE units.
+ * Convert statfs returned file system size into BLOCKSIZE units.
- * Attempts to avoid overflow for large filesystems.
+ * Attempts to avoid overflow for large file systems.
  */
 #define fsbtoblk(num, fsbs, bs) \
 	(((fsbs) != 0 && (fsbs) < (bs)) ? \
 		(num) / ((bs) / (fsbs)) : (num) * ((fsbs) / (bs)))
 
 /*
- * Print out status about a filesystem.
+ * Print out status about a file system.
  */
 static void
 prtstat(struct statfs *sfsp, struct maxwidths *mwp)
@@ -435,7 +435,7 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp)
 
 /*
  * Update the maximum field-width information in `mwp' based on
- * the filesystem specified by `sfsp'.
+ * the file system specified by `sfsp'.
  */
 static void
 update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp)
@@ -483,7 +483,7 @@ usage(void)
 {
 
 	(void)fprintf(stderr,
-	    "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | filesystem ...]\n");
+	    "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | file system ...]\n");
 	exit(EX_USAGE);
 }
 

bin/ln/ln.1

@@ -124,7 +124,7 @@ links.
 A hard link to a file is indistinguishable from the original directory entry;
 any changes to a file are effectively independent of the name used to reference
 the file.
-Hard links may not normally refer to directories and may not span filesystems.
+Hard links may not normally refer to directories and may not span file systems.
 .Pp
 A symbolic link contains the name of the file to
 which it is linked.  The referenced file is used when an
@@ -138,7 +138,7 @@ must be done to obtain information about the link.
 The
 .Xr readlink  2
 call may be used to read the contents of a symbolic link.
-Symbolic links may span filesystems and may refer to directories.
+Symbolic links may span file systems and may refer to directories.
 .Pp
 Given one or two arguments,
 .Nm

bin/ln/symlink.7

@@ -47,13 +47,13 @@ it is a reference to the object underlying the original file name.
 Changes to a file are independent of the name used to reference the
 file.
 Hard links may not refer to directories and may not reference files
-on different filesystems.
+on different file systems.
 A symbolic link contains the name of the file to which it is linked,
 i.e. it is a pointer to another name, and not to an underlying object.
 For this reason, symbolic links may reference directories and may span
-filesystems.
+file systems.
 .Pp
-Because a symbolic link and its referenced object coexist in the filesystem
+Because a symbolic link and its referenced object coexist in the file system
 name space, confusion can arise in distinguishing between the link itself
 and the referenced object.
 Historically, commands and system calls have adopted their own link

bin/ls/ls.1

@@ -216,7 +216,7 @@ this is the default when output is to a terminal.
 Reverse the order of the sort to get reverse
 lexicographical order or the oldest entries first.
 .It Fl s
-Display the number of filesystem blocks actually used by each file, in units
+Display the number of file system blocks actually used by each file, in units
 of 512 bytes, where partial units are rounded up to the next integer value.
 If the output is to a terminal, a total sum for all the file
 sizes is output on a line before the listing.

bin/mv/mv.1

@@ -128,7 +128,7 @@ option.
 .Pp
 As the
 .Xr rename 2
-call does not work across filesystems,
+call does not work across file systems,
 .Nm
 uses
 .Xr cp 1

bin/pax/ar_subs.c

@@ -206,7 +206,7 @@ extract(void)
 
 		/*
 		 * with -u or -D only extract when the archive member is newer
-		 * than the file with the same name in the filesystem (nos
+		 * than the file with the same name in the file system (nos
 		 * test of being the same type is required).
 		 * NOTE: this test is done BEFORE name modifications as
 		 * specified by pax. this operation can be confusing to the
@@ -717,7 +717,7 @@ archive(void)
 
 /*
  * copy()
- *	copy files from one part of the filesystem to another. this does not
+ *	copy files from one part of the file system to another. this does not
  *	use any archive storage. The EFFECT OF THE COPY IS THE SAME as if an
  *	archive was written and then extracted in the destination directory
  *	(except the files are forced to be under the destination directory).

bin/pax/buf_subs.c

@@ -167,7 +167,7 @@ rd_start(void)
 
 /*
  * cp_start()
- *	set up buffer system for copying within the filesystem
+ *	set up buffer system for copying within the file system
  */
 
 void

bin/pax/cache.h

@@ -42,7 +42,7 @@
  * Constants and data structures used to implement group and password file
  * caches. Traditional passwd/group cache routines perform quite poorly with
  * archives. The chances of hitting a valid lookup with an archive is quite a
- * bit worse than with files already resident on the filesystem. These misses
+ * bit worse than with files already resident on the file system. These misses
  * create a MAJOR performance cost. To address this problem, these routines
  * cache both hits and misses.
  *

bin/pax/file_subs.c

@@ -335,7 +335,7 @@ mk_link(char *to, struct stat *to_sb, char *from,
 
 /*
  * node_creat()
- *	create an entry in the filesystem (other than a file or hard link).
+ *	create an entry in the file system (other than a file or hard link).
  *	If successful, sets uid/gid modes and times as required.
  * Return:
  *	0 if ok, -1 otherwise
@@ -495,7 +495,7 @@ node_creat(ARCHD *arcn)
 
 /*
  * unlnk_exist()
- *	Remove node from filesystem with the specified name. We pass the type
+ *	Remove node from file system with the specified name. We pass the type
  *	of the node that is going to replace it. When we try to create a
  *	directory and find that it already exists, we allow processing to
  *	continue as proper modes etc will always be set for it later on.
@@ -544,13 +544,13 @@ unlnk_exist(char *name, int type)
 
 /*
  * chk_path()
- *	We were trying to create some kind of node in the filesystem and it
+ *	We were trying to create some kind of node in the file system and it
  *	failed. chk_path() makes sure the path up to the node exists and is
  *	writeable. When we have to create a directory that is missing along the
  *	path somewhere, the directory we create will be set to the same
  *	uid/gid as the file has (when uid and gid are being preserved).
  *	NOTE: this routine is a real performance loss. It is only used as a
- *	last resort when trying to create entries in the filesystem.
+ *	last resort when trying to create entries in the file system.
  * Return:
  *	-1 when it could find nothing it is allowed to fix.
  *	0 otherwise
@@ -581,7 +581,7 @@ chk_path( char *name, uid_t st_uid, gid_t st_gid)
 		/*
 		 * if it exists we assume it is a directory, it is not within
 		 * the spec (at least it seems to read that way) to alter the
-		 * filesystem for nodes NOT EXPLICITLY stored on the archive.
+		 * file system for nodes NOT EXPLICITLY stored on the archive.
 		 * If that assumption is changed, you would test the node here
 		 * and figure out how to get rid of it (probably like some
 		 * recursive unlink()) or fix up the directory permissions if
@@ -673,7 +673,7 @@ set_ftime(char *fnm, time_t mtime, time_t atime, int frc)
 
 /*
  * set_ids()
- *	set the uid and gid of a filesystem node
+ *	set the uid and gid of a file system node
  * Return:
  *	0 when set, -1 on failure
  */
@@ -697,7 +697,7 @@ set_ids(char *fnm, uid_t uid, gid_t gid)
 
 /*
  * set_lids()
- *	set the uid and gid of a filesystem node
+ *	set the uid and gid of a file system node
  * Return:
  *	0 when set, -1 on failure
  */
@@ -748,7 +748,7 @@ set_pmode(char *fnm, mode_t mode)
  *	with holes. However, on extraction (or during copy, -rw) we have to
  *	deal with these files. Without detecting the holes, the files can
  *	consume a lot of file space if just written to disk. This replacement
- *	for write when passed the basic allocation size of a filesystem block,
+ *	for write when passed the basic allocation size of a file system block,
  *	uses lseek whenever it detects the input data is all 0 within that
  *	file block. In more detail, the strategy is as follows:
  *	While the input is all zero keep doing an lseek. Keep track of when we
@@ -768,11 +768,11 @@ set_pmode(char *fnm, mode_t mode)
  *	are not desired, just do a conditional test in those routines that
  *	call file_write() and have it call write() instead. BEFORE CLOSING THE
  *	FILE, make sure to call file_flush() when the last write finishes with
- *	an empty block. A lot of filesystems will not create an lseek hole at
+ *	an empty block. A lot of file systems will not create an lseek hole at
  *	the end. In this case we drop a single 0 at the end to force the
  *	trailing 0's in the file.
  *	---Parameters---
- *	rem: how many bytes left in this filesystem block
+ *	rem: how many bytes left in this file system block
  *	isempt: have we written to the file block yet (is it empty)
  *	sz: basic file block allocation size
  *	cnt: number of bytes on this write
@@ -796,7 +796,7 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
 	while (cnt) {
 		if (!*rem) {
 			/*
-			 * We are now at the start of filesystem block again
+			 * We are now at the start of file system block again
 			 * (or what we think one is...). start looking for
 			 * empty blocks again
 			 */
@@ -844,7 +844,7 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
 		}
 
 		/*
-		 * have non-zero data in this filesystem block, have to write
+		 * have non-zero data in this file system block, have to write
 		 */
 		if (write(fd, st, wcnt) != wcnt) {
 			syswarn(1, errno, "Failed write to file %s", name);
@@ -857,7 +857,7 @@ file_write(int fd, char *str, int cnt, int *rem, int *isempt, int sz,
 
 /*
  * file_flush()
- *	when the last file block in a file is zero, many filesystems will not
+ *	when the last file block in a file is zero, many file systems will not
  *	let us create a hole at the end. To get the last block with zeros, we
  *	write the last BYTE with a zero (back up one byte and write a zero).
  */

bin/pax/ftree.c

@@ -404,7 +404,7 @@ next_file(ARCHD *arcn)
 			continue;
 		case FTS_DC:
 			/*
-			 * fts claims a filesystem cycle
+			 * fts claims a file system cycle
 			 */
 			paxwarn(1,"File system cycle found at %s",ftent->fts_path);
 			continue;

bin/pax/options.c

@@ -341,7 +341,7 @@ pax_options(int argc, char **argv)
 			break;
 		case 't':
 			/*
-			 * preserve access time on filesystem nodes we read
+			 * preserve access time on file system nodes we read
 			 */
 			tflag = 1;
 			flg |= TF;
@@ -483,7 +483,7 @@ pax_options(int argc, char **argv)
 			break;
 		case 'X':
 			/*
-			 * do not pass over mount points in the filesystem
+			 * do not pass over mount points in the file system
 			 */
 			Xflag = 1;
 			flg |= CXF;
@@ -774,7 +774,7 @@ tar_options(int argc, char **argv)
 			break;
 		case 'X':
 			/*
-			 * do not pass over mount points in the filesystem
+			 * do not pass over mount points in the file system
 			 */
 			Xflag = 1;
 			break;

bin/pax/pat_rep.c

@@ -655,7 +655,7 @@ mod_name(ARCHD *arcn)
 	 * anyway). But there are no such requirements for symlinks. On one
 	 * hand the symlink that refers to a file in the archive will have to
 	 * be modified to so it will still work at its new location in the
-	 * filesystem. On the other hand a symlink that points elsewhere (and
+	 * file system. On the other hand a symlink that points elsewhere (and
 	 * should continue to do so) should not be modified. There is clearly
 	 * no perfect solution here. So we handle them like hardlinks. Clearly
 	 * a replacement made by the interactive rename mapping is very likely

bin/pax/pax.1

@@ -387,7 +387,7 @@ to perform an append operation.
 Any attempt to append to an archive stored on such a device may damage the
 archive or have other unpredictable results.
 Tape drives in particular are more likely to not support an append operation.
-An archive stored in a regular filesystem file or on a disk device will
+An archive stored in a regular file system file or on a disk device will
 usually support an append operation.
 .It Fl b Ar blocksize
 When
@@ -644,11 +644,11 @@ Ignore files that are older (having a less recent file modification time)
 than a pre-existing file or archive member with the same name.
 During
 .Em read ,
-an archive member with the same name as a file in the filesystem will be
+an archive member with the same name as a file in the file system will be
 extracted if the archive member is newer than the file.
 During
 .Em write ,
-a filesystem member with the same name as an archive member will be
+a file system member with the same name as an archive member will be
 written to the archive if it is newer than the archive member.
 During
 .Em copy ,
@@ -738,7 +738,7 @@ files,
 .Em  hard links , soft links ,
 and
 .Em  directories
-will be archived (other filesystem types are not supported).
+will be archived (other file system types are not supported).
 For backwards compatibility with even older tar formats, a
 .Fl o
 option can be used when writing an archive to omit the storage of directories.
@@ -841,9 +841,9 @@ options may be supplied and checking stops with the first match.
 Follow only command line symbolic links while performing a physical file
 system traversal.
 .It Fl L
-Follow all symbolic links to perform a logical filesystem traversal.
+Follow all symbolic links to perform a logical file system traversal.
 .It Fl P
-Do not follow symbolic links, perform a physical filesystem traversal.
+Do not follow symbolic links, perform a physical file system traversal.
 This is the default mode.
 .It Fl T Ar [from_date][,to_date][/[c][m]]
 Allow files to be selected based on a file modification or inode change

bin/pax/pax.c

@@ -138,7 +138,7 @@ char	*tempbase;		/* basename of tempfile to use for mkstemp(3) */
  *	of times to correct, or try to correct forever.
  * 1.4	Sparse files (lseek holes) stored on the archive (but stored with blocks
  *	of all zeros will be restored with holes appropriate for the target
- *	filesystem
+ *	file system
  * 1.5	The user is notified whenever something is found during archive
  *	read operations which violates spec (but the read will continue).
  * 1.6	Multiple archive volumes can be read and may span over different
@@ -162,11 +162,11 @@ char	*tempbase;		/* basename of tempfile to use for mkstemp(3) */
  *	archive and pax the specific format specifications.
  * 2.3	Blocking size and format is rigidly enforced on writes.
  * 2.4	Formats which may exhibit header overflow problems (they have fields
- *	too small for large filesystems, such as inode number storage), use
+ *	too small for large file systems, such as inode number storage), use
  *	routines designed to repair this problem. These techniques still
  *	conform to both pax and format specifications, but no longer truncate
  *	these fields. This removes any restrictions on using these archive
- *	formats on large filesystems.
+ *	formats on large file systems.
  * 2.5	Multiple archive volumes can be written and may span over different
  *	archive devices
  * 2.6	A archive volume record limit allows the user to specify the number
@@ -192,7 +192,7 @@ char	*tempbase;		/* basename of tempfile to use for mkstemp(3) */
  * 3	COPY ENHANCEMENTS
  * 3.1	Sparse files (lseek holes) can be copied without expanding the holes
  *	into zero filled blocks. The file copy is created with holes which are
- *	appropriate for the target filesystem
+ *	appropriate for the target file system
  * 3.2	Access time as well as modification time on copied file trees can be
  *	preserved with the appropriate -p options.
  * 3.3	Access time reset with the -t applies to all file nodes (including

bin/pax/pax.h

@@ -190,7 +190,7 @@ typedef struct {
 	char name[PAXPATHLEN+1];	/* file name */
 	int ln_nlen;			/* link name length */
 	char ln_name[PAXPATHLEN+1];	/* name to link to (if any) */
-	char *org_name;			/* orig name in filesystem */
+	char *org_name;			/* orig name in file system */
 	PATTERN *pat;			/* ptr to pattern match (if any) */
 	struct stat sb;			/* stat buffer see stat(2) */
 	off_t pad;			/* bytes of padding after file xfer */

bin/pax/tables.h

@@ -56,7 +56,7 @@
 
 /*
  * file hard link structure (hashed by dev/ino and chained) used to find the
- * hard links in a filesystem or with some archive formats (cpio)
+ * hard links in a file system or with some archive formats (cpio)
  */
 typedef struct hrdlnk {
 	char		*name;	/* name of first file seen with this ino/dev */

bin/pax/tar.1

@@ -229,7 +229,7 @@ The default is to strip leading slashes.
 This is a positional argument which reads the names of files to
 archive or extract from the given file, one per line.
 .It Fl X
-Do not cross mount points in the filesystem.
+Do not cross mount points in the file system.
 .It Fl Z
 Compress archive using
 .Xr compress 1 .

bin/pax/tar.c

@@ -511,7 +511,7 @@ tar_wr(ARCHD *arcn)
 	char hdblk[sizeof(HD_TAR)];
 
 	/*
-	 * check for those filesystem types which tar cannot store
+	 * check for those file system types which tar cannot store
 	 */
 	switch(arcn->type) {
 	case PAX_DIR:
@@ -892,7 +892,7 @@ ustar_wr(ARCHD *arcn)
 	char hdblk[sizeof(HD_USTAR)];
 
 	/*
-	 * check for those filesystem types ustar cannot store
+	 * check for those file system types ustar cannot store
 	 */
 	if (arcn->type == PAX_SCK) {
 		paxwarn(1, "Ustar cannot archive a socket %s", arcn->org_name);

bin/ps/ps.1

@@ -73,7 +73,7 @@ The default output format includes, for each process, the process'
 controlling terminal, cpu time (including both user and system time),
 state, and associated command.
 .Pp
-The process filesystem (see
+The process file system (see
 .Xr procfs 5 )
 should be mounted when
 .Nm

bin/rm/rm.1

@@ -167,9 +167,9 @@ path reference.  For example:
 .Sh BUGS
 The
 .Fl P
-option assumes that the underlying filesystem is a fixed-block file
+option assumes that the underlying file system is a fixed-block file
 system.
-UFS is a fixed-block filesystem, LFS is not.
+UFS is a fixed-block file system, LFS is not.
 In addition, only regular files are overwritten, other types of files
 are not.
 .Sh COMPATIBILITY

bin/rm/rm.c

@@ -357,8 +357,8 @@ rm_file(char **argv)
  * XXX
  * This is a cheap way to *really* delete files.  Note that only regular
  * files are deleted, directories (and therefore names) will remain.
- * Also, this assumes a fixed-block filesystem (like FFS, or a V7 or a
+ * Also, this assumes a fixed-block file system (like FFS, or a V7 or a
- * System V filesystem).  In a logging filesystem, you'll have to have
+ * System V file system).  In a logging file system, you'll have to have
  * kernel support.
  */
 void

bin/sh/error.c

@@ -211,7 +211,7 @@ STATIC const struct errname errormsg[] = {
 	{ EMFILE,	ALL,	"too many open files" },
 #endif
 	{ ENFILE,	ALL,	"file table overflow" },
-	{ ENOSPC,	ALL,	"filesystem full" },
+	{ ENOSPC,	ALL,	"file system full" },
 #ifdef EDQUOT
 	{ EDQUOT,	ALL,	"disk quota exceeded" },
 #endif
@@ -219,7 +219,7 @@ STATIC const struct errname errormsg[] = {
 	{ ENOSR,	ALL,	"no streams resources" },
 #endif
 	{ ENXIO,	ALL,	"no such device or address" },
-	{ EROFS,	ALL,	"read-only filesystem" },
+	{ EROFS,	ALL,	"read-only file system" },
 	{ ETXTBSY,	ALL,	"text busy" },
 	{ ENOMEM,	ALL,	"not enough memory" },
 #ifdef ENOLINK

bin/sh/sh.1

@@ -526,7 +526,7 @@ spawning a new process.
 .Pp
 Otherwise, if the command name does not match a function
 or built-in command, the command is searched for as a normal
-program in the filesystem (as described in the next section).
+program in the file system (as described in the next section).
 When a normal program is executed, the shell runs the program,
 passing the arguments and the environment to the program.
 If the program is not a normal executable file