From 56036d26233ff609be6306f948bdbebc57075335 Mon Sep 17 00:00:00 2001 From: trhodes Date: Thu, 16 May 2002 01:57:20 +0000 Subject: Consistancy check s/file system/filesystem/ Reviewed by: brian --- bin/pax/ar_subs.c | 4 ++-- bin/pax/buf_subs.c | 2 +- bin/pax/cache.h | 2 +- bin/pax/file_subs.c | 26 +++++++++++++------------- bin/pax/ftree.c | 2 +- bin/pax/options.c | 4 ++-- bin/pax/pat_rep.c | 2 +- bin/pax/pax.1 | 12 ++++++------ bin/pax/pax.c | 4 ++-- bin/pax/pax.h | 2 +- bin/pax/tables.h | 2 +- bin/pax/tar.c | 4 ++-- 12 files changed, 33 insertions(+), 33 deletions(-) (limited to 'bin/pax') diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index 5d82f5a..ac6cb11 100644 --- a/bin/pax/ar_subs.c +++ b/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 file system (nos + * than the file with the same name in the filesystem (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 file system to another. this does not + * copy files from one part of the filesystem 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). diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c index 77579e2..401e623 100644 --- a/bin/pax/buf_subs.c +++ b/bin/pax/buf_subs.c @@ -167,7 +167,7 @@ rd_start(void) /* * cp_start() - * set up buffer system for copying within the file system + * set up buffer system for copying within the filesystem */ void diff --git a/bin/pax/cache.h b/bin/pax/cache.h index 6420588..853b02e 100644 --- a/bin/pax/cache.h +++ b/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 file system. These misses + * bit worse than with files already resident on the filesystem. These misses * create a MAJOR performance cost. To address this problem, these routines * cache both hits and misses. * diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 9f9f30f..44d9064 100644 --- a/bin/pax/file_subs.c +++ b/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 file system (other than a file or hard link). + * create an entry in the filesystem (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 file system with the specified name. We pass the type + * Remove node from filesystem 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 file system and it + * We were trying to create some kind of node in the filesystem 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 file system. + * last resort when trying to create entries in the filesystem. * 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 - * file system for nodes NOT EXPLICITLY stored on the archive. + * filesystem 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 file system node + * set the uid and gid of a filesystem 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 file system node + * set the uid and gid of a filesystem 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 file system block, + * for write when passed the basic allocation size of a filesystem 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 file systems will not create an lseek hole at + * an empty block. A lot of filesystems 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 file system block + * rem: how many bytes left in this filesystem 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 file system block again + * We are now at the start of filesystem 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 file system block, have to write + * have non-zero data in this filesystem 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 file systems will not + * when the last file block in a file is zero, many filesystems 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). */ diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index 52e28f3..0eb3c35 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -404,7 +404,7 @@ next_file(ARCHD *arcn) continue; case FTS_DC: /* - * fts claims a file system cycle + * fts claims a filesystem cycle */ paxwarn(1,"File system cycle found at %s",ftent->fts_path); continue; diff --git a/bin/pax/options.c b/bin/pax/options.c index 7e6b56b..45ca520 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -481,7 +481,7 @@ pax_options(int argc, char **argv) break; case 'X': /* - * do not pass over mount points in the file system + * do not pass over mount points in the filesystem */ Xflag = 1; flg |= CXF; @@ -772,7 +772,7 @@ tar_options(int argc, char **argv) break; case 'X': /* - * do not pass over mount points in the file system + * do not pass over mount points in the filesystem */ Xflag = 1; break; diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index 0f09b99..b4998ed 100644 --- a/bin/pax/pat_rep.c +++ b/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 - * file system. On the other hand a symlink that points elsewhere (and + * filesystem. 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 diff --git a/bin/pax/pax.1 b/bin/pax/pax.1 index e142798..b4925f3 100644 --- a/bin/pax/pax.1 +++ b/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 file system file or on a disk device will +An archive stored in a regular filesystem 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 file system will be +an archive member with the same name as a file in the filesystem will be extracted if the archive member is newer than the file. During .Em write , -a file system member with the same name as an archive member will be +a filesystem 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 file system types are not supported). +will be archived (other filesystem 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 file system traversal. +Follow all symbolic links to perform a logical filesystem traversal. .It Fl P -Do not follow symbolic links, perform a physical file system traversal. +Do not follow symbolic links, perform a physical filesystem 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 diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 8a92e4e..d3bf18f 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -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 file systems, such as inode number storage), use + * too small for large filesystems, 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 file systems. + * formats on large filesystems. * 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 diff --git a/bin/pax/pax.h b/bin/pax/pax.h index 2cf9e8a..fc87bdb 100644 --- a/bin/pax/pax.h +++ b/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 file system */ + char *org_name; /* orig name in filesystem */ 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 */ diff --git a/bin/pax/tables.h b/bin/pax/tables.h index 74c91f7..8da63ab 100644 --- a/bin/pax/tables.h +++ b/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 file system or with some archive formats (cpio) + * hard links in a filesystem or with some archive formats (cpio) */ typedef struct hrdlnk { char *name; /* name of first file seen with this ino/dev */ diff --git a/bin/pax/tar.c b/bin/pax/tar.c index 57517e8..b869cfa 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -511,7 +511,7 @@ tar_wr(ARCHD *arcn) char hdblk[sizeof(HD_TAR)]; /* - * check for those file system types which tar cannot store + * check for those filesystem 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 file system types ustar cannot store + * check for those filesystem types ustar cannot store */ if (arcn->type == PAX_SCK) { paxwarn(1, "Ustar cannot archive a socket %s", arcn->org_name); -- cgit v1.1