Date: Thu, 26 Aug 2010 20:44:12 +0000 (UTC) From: Ulrich Spoerlein <uqs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r211849 - in stable/8: lib/libarchive sbin/restore sys/dev/cxgb/ulp/iw_cxgb sys/fs/msdosfs sys/gnu/fs/ext2fs usr.bin/cpio usr.bin/tar usr.bin/tar/test usr.bin/xinstall usr.sbin/mtree Message-ID: <201008262044.o7QKiCrI053223@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: uqs Date: Thu Aug 26 20:44:12 2010 New Revision: 211849 URL: http://svn.freebsd.org/changeset/base/211849 Log: MFC r204111: Fix common misspelling of hierarchy Modified: stable/8/lib/libarchive/archive_write_disk.3 stable/8/sbin/restore/restore.h stable/8/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c stable/8/sys/fs/msdosfs/msdosfs_vnops.c stable/8/sys/gnu/fs/ext2fs/ext2_vnops.c stable/8/usr.bin/cpio/bsdcpio.1 stable/8/usr.bin/tar/test/test_option_T.c stable/8/usr.bin/tar/test/test_option_s.c stable/8/usr.bin/tar/tree.c stable/8/usr.bin/xinstall/xinstall.c stable/8/usr.sbin/mtree/mtree.5 Directory Properties: stable/8/lib/libarchive/ (props changed) stable/8/sbin/restore/ (props changed) stable/8/sys/ (props changed) stable/8/usr.bin/cpio/ (props changed) stable/8/usr.bin/tar/ (props changed) stable/8/usr.bin/xinstall/ (props changed) stable/8/usr.sbin/mtree/ (props changed) Modified: stable/8/lib/libarchive/archive_write_disk.3 ============================================================================== --- stable/8/lib/libarchive/archive_write_disk.3 Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/lib/libarchive/archive_write_disk.3 Thu Aug 26 20:44:12 2010 (r211849) @@ -339,7 +339,7 @@ In particular, the directory .Pa aa is created as well as the final object .Pa bb . -In theory, this can be exploited to create an entire directory heirarchy +In theory, this can be exploited to create an entire directory hierarchy with a single request. Of course, this does not work if the .Cm ARCHIVE_EXTRACT_NODOTDOT @@ -371,5 +371,5 @@ compact implementation when appropriate. .Pp There should be a corresponding .Nm archive_read_disk -interface that walks a directory heirarchy and returns archive +interface that walks a directory hierarchy and returns archive entry objects. \ No newline at end of file Modified: stable/8/sbin/restore/restore.h ============================================================================== --- stable/8/sbin/restore/restore.h Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/sbin/restore/restore.h Thu Aug 26 20:44:12 2010 (r211849) @@ -41,7 +41,7 @@ extern int bflag; /* set input block size */ extern int dflag; /* print out debugging info */ extern int Dflag; /* degraded mode - try hard to get stuff back */ -extern int hflag; /* restore heirarchies */ +extern int hflag; /* restore hierarchies */ extern int mflag; /* restore by name instead of inode number */ extern int Nflag; /* do not write the disk */ extern int uflag; /* unlink symlink targets */ Modified: stable/8/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c ============================================================================== --- stable/8/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c Thu Aug 26 20:44:12 2010 (r211849) @@ -675,7 +675,7 @@ static void __flush_qp(struct iwch_qp *q qhp->refcnt++; mtx_unlock(&qhp->lock); - /* locking heirarchy: cq lock first, then qp lock. */ + /* locking hierarchy: cq lock first, then qp lock. */ mtx_lock(&rchp->lock); mtx_lock(&qhp->lock); cxio_flush_hw_cq(&rchp->cq); @@ -685,7 +685,7 @@ static void __flush_qp(struct iwch_qp *q mtx_unlock(&rchp->lock); (*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context); - /* locking heirarchy: cq lock first, then qp lock. */ + /* locking hierarchy: cq lock first, then qp lock. */ mtx_lock(&schp->lock); mtx_lock(&qhp->lock); cxio_flush_hw_cq(&schp->cq); Modified: stable/8/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- stable/8/sys/fs/msdosfs/msdosfs_vnops.c Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/sys/fs/msdosfs/msdosfs_vnops.c Thu Aug 26 20:44:12 2010 (r211849) @@ -1072,7 +1072,7 @@ abortit: /* * If ".." must be changed (ie the directory gets a new * parent) then the source directory must not be in the - * directory heirarchy above the target, as this would + * directory hierarchy above the target, as this would * orphan everything below the source directory. Also * the user must have write permission in the source so * as to be able to change "..". We must repeat the call Modified: stable/8/sys/gnu/fs/ext2fs/ext2_vnops.c ============================================================================== --- stable/8/sys/gnu/fs/ext2fs/ext2_vnops.c Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/sys/gnu/fs/ext2fs/ext2_vnops.c Thu Aug 26 20:44:12 2010 (r211849) @@ -864,7 +864,7 @@ abortit: /* * If ".." must be changed (ie the directory gets a new * parent) then the source directory must not be in the - * directory heirarchy above the target, as this would + * directory hierarchy above the target, as this would * orphan everything below the source directory. Also * the user must have write permission in the source so * as to be able to change "..". We must repeat the call Modified: stable/8/usr.bin/cpio/bsdcpio.1 ============================================================================== --- stable/8/usr.bin/cpio/bsdcpio.1 Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/usr.bin/cpio/bsdcpio.1 Thu Aug 26 20:44:12 2010 (r211849) @@ -266,7 +266,7 @@ for more information. .Sh EXAMPLES The .Nm -command is traditionally used to copy file heirarchies in conjunction +command is traditionally used to copy file hierarchies in conjunction with the .Xr find 1 command. Modified: stable/8/usr.bin/tar/test/test_option_T.c ============================================================================== --- stable/8/usr.bin/tar/test/test_option_T.c Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/usr.bin/tar/test/test_option_T.c Thu Aug 26 20:44:12 2010 (r211849) @@ -43,7 +43,7 @@ DEFINE_TEST(test_option_T) int r; struct stat st; - /* Create a simple dir heirarchy; bail if anything fails. */ + /* Create a simple dir hierarchy; bail if anything fails. */ if (!assertEqualInt(0, mkdir("d1", 0755))) return; if (!assertEqualInt(0, mkdir("d1/d2", 0755))) return; if (!touch("d1/f1")) return; Modified: stable/8/usr.bin/tar/test/test_option_s.c ============================================================================== --- stable/8/usr.bin/tar/test/test_option_s.c Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/usr.bin/tar/test/test_option_s.c Thu Aug 26 20:44:12 2010 (r211849) @@ -44,7 +44,7 @@ DEFINE_TEST(test_option_s) { struct stat st; - /* Create a sample file heirarchy. */ + /* Create a sample file hierarchy. */ assertEqualInt(0, mkdir("in", 0755)); assertEqualInt(0, mkdir("in/d1", 0755)); assertEqualInt(0, mkfile("in/d1/foo", "foo")); Modified: stable/8/usr.bin/tar/tree.c ============================================================================== --- stable/8/usr.bin/tar/tree.c Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/usr.bin/tar/tree.c Thu Aug 26 20:44:12 2010 (r211849) @@ -313,7 +313,7 @@ tree_next(struct tree *t) * violation. Just crash now. */ if (t->visit_type == TREE_ERROR_FATAL) { const char *msg = "Unable to continue traversing" - " directory heirarchy after a fatal error."; + " directory hierarchy after a fatal error."; write(2, msg, strlen(msg)); *(int *)0 = 1; /* Deliberate SEGV; NULL pointer dereference. */ exit(1); /* In case the SEGV didn't work. */ Modified: stable/8/usr.bin/xinstall/xinstall.c ============================================================================== --- stable/8/usr.bin/xinstall/xinstall.c Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/usr.bin/xinstall/xinstall.c Thu Aug 26 20:44:12 2010 (r211849) @@ -734,7 +734,7 @@ strip(const char *to_name) /* * install_dir -- - * build directory heirarchy + * build directory hierarchy */ void install_dir(char *path) Modified: stable/8/usr.sbin/mtree/mtree.5 ============================================================================== --- stable/8/usr.sbin/mtree/mtree.5 Thu Aug 26 19:55:03 2010 (r211848) +++ stable/8/usr.sbin/mtree/mtree.5 Thu Aug 26 20:44:12 2010 (r211849) @@ -33,12 +33,12 @@ .Os .Sh NAME .Nm mtree -.Nd format of mtree dir heirarchy files +.Nd format of mtree dir hierarchy files .Sh DESCRIPTION The .Nm format is a textual format that describes a collection of filesystem objects. -Such files are typically used to create or verify directory heirarchies. +Such files are typically used to create or verify directory hierarchies. .Ss General Format An .Nm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008262044.o7QKiCrI053223>