diff options
author | joe <joe@FreeBSD.org> | 2000-07-14 09:37:59 +0000 |
---|---|---|
committer | joe <joe@FreeBSD.org> | 2000-07-14 09:37:59 +0000 |
commit | 58dad7500ca2c1fbe603212b0ee945d2491c31d0 (patch) | |
tree | 9a825a65e0b39a9e230793f8f94fb352eef4db74 /usr.sbin | |
parent | b9b09beff77fa0c63504c65b19ba867fd78e84da (diff) | |
download | FreeBSD-src-58dad7500ca2c1fbe603212b0ee945d2491c31d0.zip FreeBSD-src-58dad7500ca2c1fbe603212b0ee945d2491c31d0.tar.gz |
Use -P instead of -S to specify that no symlinks should be followed.
There's no reason to make it different from cp(1), chmod(1), chown(1)
etc.
Requested by: sheldonh
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/mtree/mtree.8 | 6 | ||||
-rw-r--r-- | usr.sbin/mtree/mtree.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/mtree/mtree.8 index d5a59f5..e47de7b 100644 --- a/usr.sbin/mtree/mtree.8 +++ b/usr.sbin/mtree/mtree.8 @@ -93,14 +93,14 @@ directory when using the option. .It Fl p Ar path Use the file hierarchy rooted in +.It Fl P +Don't follow symbolic links in the file hierarchy, instead consider +the symbolic link itself in any comparisons. .Ar path , instead of the current directory. .It Fl r Remove any files in the file hierarchy that are not described in the specification. -.It Fl S -Don't follow symbolic links in the file hierarchy, instead consider -the symbolic link itself in any comparisons. .It Fl s Ar seed Display a single checksum to the standard error output that represents all of the files for which the keyword diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c index 734701b..b994cd2 100644 --- a/usr.sbin/mtree/mtree.c +++ b/usr.sbin/mtree/mtree.c @@ -77,7 +77,7 @@ main(argc, argv) keys = KEYDEFAULT; init_excludes(); - while ((ch = getopt(argc, argv, "cdef:iK:k:np:rs:SUuxX:")) != -1) + while ((ch = getopt(argc, argv, "cdef:iK:k:np:Prs:UuxX:")) != -1) switch((char)ch) { case 'c': cflag = 1; @@ -112,6 +112,10 @@ main(argc, argv) case 'p': dir = optarg; break; + case 'P': + ftsoptions ^= FTS_LOGICAL; + ftsoptions |= FTS_PHYSICAL; + break; case 'r': rflag = 1; break; @@ -120,10 +124,6 @@ main(argc, argv) crc_total = ~strtol(optarg, &p, 0); if (*p) errx(1, "illegal seed value -- %s", optarg); - case 'S': - ftsoptions ^= FTS_LOGICAL; - ftsoptions |= FTS_PHYSICAL; - break; case 'U': Uflag = 1; uflag = 1; |