summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1998-03-09 08:54:31 +0000
committerjkh <jkh@FreeBSD.org>1998-03-09 08:54:31 +0000
commit8c2e3b0218bf8aced93fd7d730def710d5c1b0bb (patch)
treec6602d1883edf7795500156d8ddfcd8fcf35fc1d /usr.sbin
parentdc96ced4d9327a6e02605d4a1d86bbf7f71738c2 (diff)
downloadFreeBSD-src-8c2e3b0218bf8aced93fd7d730def710d5c1b0bb.zip
FreeBSD-src-8c2e3b0218bf8aced93fd7d730def710d5c1b0bb.tar.gz
Allow -R and -h to be combined as long as no symlink-following flags
are also requested. Submitted by: Andre Albsmeier <andre.albsmeier@mchp.siemens.de>
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/chown/chown.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/chown/chown.c b/usr.sbin/chown/chown.c
index 918b8d9..f6c9b7d 100644
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)chown.c 8.8 (Berkeley) 4/4/94";
#else
static const char rcsid[] =
- "$Id: chown.c,v 1.8 1997/09/04 11:55:45 charnier Exp $";
+ "$Id: chown.c,v 1.9 1997/09/21 09:13:57 wosch Exp $";
#endif
#endif /* not lint */
@@ -121,7 +121,7 @@ main(argc, argv)
fts_options = FTS_PHYSICAL;
if (Rflag) {
- if (hflag)
+ if (hflag && (Lflag || Hflag))
errx(1, "the -R and -h options may not be specified together");
if (Hflag)
fts_options |= FTS_COMFOLLOW;
OpenPOWER on IntegriCloud