Use __SCCSID() for SCCS IDs.

- Define NO__SCCSID in CFLAGS to preserve existing behavior of omitting
  SCCS IDs by default.
- While here, fix the $FreeBSD$ in pw_util.c to use __FBSDID.
This commit is contained in:
jhb 2018-05-23 17:02:12 +00:00
parent 1ff7e0b99a
commit fa4144861a
5 changed files with 7 additions and 24 deletions

View File

@ -19,7 +19,7 @@ SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c gr_util.c \
stub.c trimdomain.c uucplock.c
INCS= libutil.h login_cap.h
CFLAGS+= -DLIBC_SCCS
CFLAGS+= -DNO__SCCSID
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6

View File

@ -31,12 +31,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)login_tty.c 8.1 (Berkeley) 6/4/93";
#endif
#endif /* LIBC_SCCS and not lint */
__SCCSID("@(#)login_tty.c 8.1 (Berkeley) 6/4/93");
#include <sys/param.h>

View File

@ -31,12 +31,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)pty.c 8.3 (Berkeley) 5/16/94";
#endif
#endif /* LIBC_SCCS and not lint */
__SCCSID("@(#)pty.c 8.3 (Berkeley) 5/16/94");
#include <sys/types.h>
#include <sys/ioctl.h>

View File

@ -36,13 +36,9 @@
* SUCH DAMAGE.
*/
#ifndef lint
#if 0
static const char sccsid[] = "@(#)pw_util.c 8.3 (Berkeley) 4/2/94";
#endif
static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
__SCCSID("@(#)pw_util.c 8.3 (Berkeley) 4/2/94");
/*
* This file is used by all the "password" programs; vipw(8), chpass(1),

View File

@ -31,10 +31,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#ifndef lint
static const char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93";
#endif /* not lint */
__SCCSID("@(#)uucplock.c 8.1 (Berkeley) 6/6/93");
#include <sys/types.h>
#include <sys/file.h>