From owner-cvs-all  Sat Sep 15 13:16:22 2001
Delivered-To: cvs-all@freebsd.org
Received: from mailman.zeta.org.au (mailman.zeta.org.au [203.26.10.16])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1FA7737B407; Sat, 15 Sep 2001 13:16:14 -0700 (PDT)
Received: from bde.zeta.org.au (bde.zeta.org.au [203.2.228.102])
	by mailman.zeta.org.au (8.9.3/8.8.7) with ESMTP id GAA26093;
	Sun, 16 Sep 2001 06:16:10 +1000
Date: Sun, 16 Sep 2001 06:15:45 +1000 (EST)
From: Bruce Evans <bde@zeta.org.au>
X-X-Sender:  <bde@delplex.bde.org>
To: "David O'Brien" <obrien@FreeBSD.org>
Cc: <cvs-committers@FreeBSD.org>, <cvs-all@FreeBSD.org>
Subject: Re: cvs commit: src/share/man/man9 style.9
In-Reply-To: <20010915121926.A71700@dragon.nuxi.com>
Message-ID: <20010916054620.T29957-100000@delplex.bde.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.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%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

On Sat, 15 Sep 2001, David O'Brien wrote:

> On Sun, Sep 16, 2001 at 04:22:36AM +1000, Bruce Evans wrote:
> > - line containing $FreeBSD$ longer than before.  The $FreeBSD was indented
> >   only 2 spaces to gives some chance of the line not being too long.
>
> how do you suggest we deal with this?

Look at what NetBSD does and ask them what's wrong with it.  NetBSD
seems to use:

---
/*	$NetBSD$ */

<copyright comment>

#include <sys/cdefs.h>
#if defined(LIBC_SCCSID) && !defined(lint)
#if 0
<CSRG sccsid>
#endif
__RCSID($NetBSD$)
#endif /* LIBC_SCCSID) and not lint */
---

in most files in libc/stdio.  I.e.,  add $NetBSD$ in a comment to to the
top of the file; add the cdefs include immediately above the vendor id
stuff and merge the $NetBSD$ rcsid into the vendor id stuff.

I now prefer something like:

---
<copyright comment>

#if 0 /* maybe change to #ifdef VENDOR_ID */
<vendor id stuff>
#endif

#include <sys/cdefs.h>
__FBSDID($NetBSD$)
---

Here <vendor id stuff> may contain another include of cdefs.h and/or
ifdefs and/or __FOOBSDID() macros.  I think it is best to keep the
FreeBSD id stuff completely separate even if this involves duplicating
a line or two.

Bruce


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