Merged with 4.4lite.

Changed to conform to NetBSD's new RCS ID convention.
This commit is contained in:
jtc 1994-12-07 00:33:47 +00:00
parent 7a51c22113
commit 55ad6872f5
3 changed files with 22 additions and 18 deletions

View File

@ -1,5 +1,5 @@
# from: @(#)Makefile 5.3 (Berkeley) 5/11/90
# $Id: Makefile,v 1.2 1993/07/30 23:49:37 mycroft Exp $
# $NetBSD: Makefile,v 1.3 1994/12/07 00:33:47 jtc Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= unifdef

View File

@ -1,5 +1,7 @@
.\" Copyright (c) 1985, 1991 The Regents of the University of California.
.\" All rights reserved.
.\" $NetBSD: unifdef.1,v 1.4 1994/12/07 00:33:48 jtc Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
.\" This code is derived from software contributed to Berkeley by
.\" Dave Yost.
@ -32,10 +34,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
.\" from: @(#)unifdef.1 6.5 (Berkeley) 4/23/91
.\" $Id: unifdef.1,v 1.3 1994/04/01 08:58:45 cgd Exp $
.\" @(#)unifdef.1 8.2 (Berkeley) 4/1/94
.\"
.Dd April 23, 1991
.Dd April 1, 1994
.Dt UNIFDEF 1
.Os BSD 4.3
.Sh NAME
@ -43,8 +44,8 @@
.Nd remove ifdef'ed lines
.Sh SYNOPSIS
.Nm unifdef
.Op Fl clt
.Oo
.Fl t l c
.Fl D Ns Ar sym
.Fl U Ns Ar sym
.Fl iD Ns Ar sym
@ -105,9 +106,8 @@ are retained and vice versa.
Replace removed lines with blank lines
instead of deleting them.
.It Fl t
Disables parsing for
C comments and quotes; useful for plain text
(not C code).
Disables parsing for C comments and quotes, which is useful
for plain text.
.Pp
.It Fl iD Ns Ar sym
.It Fl iU Ns Ar sym

View File

@ -1,6 +1,8 @@
/* $NetBSD: unifdef.c,v 1.3 1994/12/07 00:33:49 jtc Exp $ */
/*
* Copyright (c) 1985 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Dave Yost.
@ -35,14 +37,16 @@
*/
#ifndef lint
char copyright[] =
"@(#) Copyright (c) 1985 The Regents of the University of California.\n\
All rights reserved.\n";
static char copyright[] =
"@(#) Copyright (c) 1985, 1993\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
/*static char sccsid[] = "from: @(#)unifdef.c 4.7 (Berkeley) 6/1/90";*/
static char rcsid[] = "$Id: unifdef.c,v 1.2 1993/08/01 18:03:56 mycroft Exp $";
#if 0
static char sccsid[] = "@(#)unifdef.c 8.1 (Berkeley) 6/6/93";
#endif
static char rcsid[] = "$NetBSD: unifdef.c,v 1.3 1994/12/07 00:33:49 jtc Exp $";
#endif /* not lint */
/*