From owner-p4-projects  Fri Nov 15  9: 0:51 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3CC1037B404; Fri, 15 Nov 2002 09:00:48 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DC6CA37B401
	for <perforce@freebsd.org>; Fri, 15 Nov 2002 09:00:47 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7CEC543E6E
	for <perforce@freebsd.org>; Fri, 15 Nov 2002 09:00:47 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFGw9mV002108
	for <perforce@freebsd.org>; Fri, 15 Nov 2002 08:58:09 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFGw9Ec002100
	for perforce@freebsd.org; Fri, 15 Nov 2002 08:58:09 -0800 (PST)
Date: Fri, 15 Nov 2002 08:58:09 -0800 (PST)
Message-Id: <200211151658.gAFGw9Ec002100@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 21070 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=21070

Change 21070 by green@green_laptop_2 on 2002/11/15 08:58:01

	* Correct the usage for setfmac(8) in its manpage and that
	  of setf{,s}mac(8) in the usage() statement.
	* Implement -R for recursive labelling for setfmac.8 since it's
	  essentially free now.

Affected files ...

.. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#2 edit
.. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#2 (text+ko) ====

@@ -39,9 +39,9 @@
 .Nd set MAC label for a file system object
 .Sh SYNOPSIS
 .Nm
-.Ar label
-.Ar file
-.Op Ar file ...
+.Op Fl Rh
+.Ar label file
+.Op Ar ...
 .Sh DESCRIPTION
 The
 .Nm

==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#7 (text+ko) ====

@@ -86,7 +86,7 @@
 	FTSENT *ftsent;
 	FTS *fts;
 	struct label_specs *specs;
-	int eflag = 0, xflag = 0, vflag = 0, hflag;
+	int eflag = 0, xflag = 0, vflag = 0, Rflag = 0, hflag;
 	int ch, is_setfmac;
 	char *bn;
 
@@ -96,8 +96,11 @@
 	is_setfmac = strcmp(bn, "setfmac") == 0;
 	hflag = is_setfmac ? FTS_LOGICAL : FTS_PHYSICAL;
 	specs = new_specs();
-	while ((ch = getopt(argc, argv, is_setfmac ? "h" : "ef:s:vx")) != -1) {
+	while ((ch = getopt(argc, argv, is_setfmac ? "Rh" : "ef:s:vx")) != -1) {
 		switch (ch) {
+		case 'R':
+			Rflag = 1;
+			break;
 		case 'e':
 			eflag = 1;
 			break;
@@ -143,7 +146,7 @@
 		case FTS_D:		/* do pre-order */
 		case FTS_DC:		/* do cyclic? */
 			/* don't ever recurse directories as setfmac(8) */
-			if (is_setfmac)
+			if (is_setfmac && !Rflag)
 				fts_set(fts, ftsent, FTS_SKIP);
 		case FTS_DEFAULT:	/* do default */
 		case FTS_F:		/* do regular */
@@ -180,9 +183,9 @@
 {
 
 	if (is_setfmac)
-		fprintf(stderr, "usage: setfmac [-h] label path ...\n");
+		fprintf(stderr, "usage: setfmac [-Rh] label path [...]\n");
 	else
-		fprintf(stderr, "usage: setfsmac [-evx] [-f specfile [...]] [-s specfile [...]] path ...\n");
+		fprintf(stderr, "usage: setfsmac [-evx] [-f specfile [...]] [-s specfile [...]] path [...]\n");
 	exit(1);
 }
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message