merge lite-2.
This commit is contained in:
mrg
parent
6db79ef042
commit
226284be12
@ -1,5 +1,5 @@
|
||||
# $NetBSD: Makefile,v 1.3 1997/01/09 20:20:08 tls Exp $
|
||||
# from: @(#)Makefile 5.11 (Berkeley) 5/11/90
|
||||
# $NetBSD: Makefile,v 1.4 1997/10/18 16:04:21 mrg Exp $
|
||||
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
|
||||
|
||||
PROG= indent
|
||||
SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
/* $NetBSD: args.c,v 1.3 1997/01/09 20:20:09 tls Exp $ */
|
||||
/* $NetBSD: args.c,v 1.4 1997/10/18 16:04:26 mrg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* Copyright (c) 1980 The Regents of the University of California.
|
||||
* Copyright (c) 1980, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -36,8 +37,11 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)args.c 5.10 (Berkeley) 2/26/91";*/
|
||||
static char rcsid[] = "$NetBSD: args.c,v 1.3 1997/01/09 20:20:09 tls Exp $";
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)args.c 8.1 (Berkeley) 6/6/93";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: args.c,v 1.4 1997/10/18 16:04:26 mrg Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
.\" $NetBSD: indent.1,v 1.6 1997/01/09 20:20:10 tls Exp $
|
||||
.\" $NetBSD: indent.1,v 1.7 1997/10/18 16:04:29 mrg Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
|
||||
.\" Copyright (c) 1980, 1990, 1993
|
||||
.\" The Regents of the University of California. All rights reserved.
|
||||
.\" Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
.\" Copyright (c) 1976 Board of Trustees of the University of Illinois.
|
||||
.\" All rights reserved.
|
||||
@ -33,10 +34,9 @@
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" from: @(#)indent.1 6.11 (Berkeley) 7/24/91
|
||||
.\" $NetBSD: indent.1,v 1.6 1997/01/09 20:20:10 tls Exp $
|
||||
.\" from: @(#)indent.1 8.1 (Berkeley) 7/1/93
|
||||
.\"
|
||||
.Dd July 24, 1991
|
||||
.Dd July 1, 1993
|
||||
.Dt INDENT 1
|
||||
.Os BSD 4.2
|
||||
.Sh NAME
|
||||
@ -266,8 +266,8 @@ paren. For example, here is how a piece of continued code looks with
|
||||
in effect:
|
||||
.ne 2
|
||||
.Bd -literal -offset indent
|
||||
.Li p1 = first_procedure(second_procedure(p2, p3),
|
||||
.Li \ \ third_procedure(p4,p5));
|
||||
p1 = first_procedure(second_procedure(p2, p3),
|
||||
\ \ third_procedure(p4,p5));
|
||||
.Ed
|
||||
.Pp
|
||||
.ne 5
|
||||
@ -275,17 +275,17 @@ With
|
||||
.Fl lp
|
||||
in effect (the default) the code looks somewhat clearer:
|
||||
.Bd -literal -offset indent
|
||||
.Li p1\ =\ first_procedure(second_procedure(p2,\ p3),
|
||||
.Li \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ third_procedure(p4,p5));
|
||||
p1\ =\ first_procedure(second_procedure(p2,\ p3),
|
||||
\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ third_procedure(p4,p5));
|
||||
.Ed
|
||||
.Pp
|
||||
.ne 5
|
||||
Inserting two more newlines we get:
|
||||
.Bd -literal -offset indent
|
||||
.Li p1\ =\ first_procedure(second_procedure(p2,
|
||||
.Li \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ p3),
|
||||
.Li \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ third_procedure(p4
|
||||
.Li \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ p5));
|
||||
p1\ =\ first_procedure(second_procedure(p2,
|
||||
\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ p3),
|
||||
\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ third_procedure(p4
|
||||
\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ p5));
|
||||
.Ed
|
||||
.It Fl npro
|
||||
Causes the profile files,
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
/* $NetBSD: indent.c,v 1.4 1997/01/09 20:20:11 tls Exp $ */
|
||||
/* $NetBSD: indent.c,v 1.5 1997/10/18 16:04:33 mrg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* Copyright (c) 1980 The Regents of the University of California.
|
||||
* Copyright (c) 1980, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -38,14 +39,17 @@
|
||||
#ifndef lint
|
||||
char copyright[] =
|
||||
"@(#) Copyright (c) 1985 Sun Microsystems, Inc.\n\
|
||||
@(#) Copyright (c) 1980 The Regents of the University of California.\n\
|
||||
@(#) Copyright (c) 1976 Board of Trustees of the University of Illinois.\n\
|
||||
All rights reserved.\n";
|
||||
@(#) Copyright (c) 1980, 1993\n\
|
||||
The Regents of the University of California. All rights reserved.\n";
|
||||
#endif /* not lint */
|
||||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)indent.c 5.16 (Berkeley) 2/26/91";*/
|
||||
static char rcsid[] = "$NetBSD: indent.c,v 1.4 1997/01/09 20:20:11 tls Exp $";
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)indent.c 5.17 (Berkeley) 6/7/93";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: indent.c,v 1.5 1997/10/18 16:04:33 mrg Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
/* $NetBSD: indent_codes.h,v 1.3 1997/01/09 20:20:12 tls Exp $ */
|
||||
/* $NetBSD: indent_codes.h,v 1.4 1997/10/18 16:04:36 mrg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* Copyright (c) 1980 The Regents of the University of California.
|
||||
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 1980, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
@ -34,8 +35,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)indent_codes.h 5.7 (Berkeley) 6/1/90
|
||||
* $NetBSD: indent_codes.h,v 1.3 1997/01/09 20:20:12 tls Exp $
|
||||
* from: @(#)indent_codes.h 8.1 (Berkeley) 6/6/93
|
||||
*/
|
||||
|
||||
#define newline 1
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
/* $NetBSD: indent_globs.h,v 1.3 1997/01/09 20:20:13 tls Exp $ */
|
||||
/* $NetBSD: indent_globs.h,v 1.4 1997/10/18 16:04:40 mrg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* Copyright (c) 1980 The Regents of the University of California.
|
||||
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 1980, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
@ -34,8 +35,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)indent_globs.h 5.11 (Berkeley) 2/26/91
|
||||
* $NetBSD: indent_globs.h,v 1.3 1997/01/09 20:20:13 tls Exp $
|
||||
* from: @(#)indent_globs.h 8.1 (Berkeley) 6/6/93
|
||||
*/
|
||||
|
||||
#define BACKSLASH '\\'
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
/* $NetBSD: io.c,v 1.3 1997/01/09 20:20:15 tls Exp $ */
|
||||
/* $NetBSD: io.c,v 1.4 1997/10/18 16:04:45 mrg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* Copyright (c) 1980 The Regents of the University of California.
|
||||
* Copyright (c) 1980, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -36,8 +37,11 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)io.c 5.15 (Berkeley) 2/26/91";*/
|
||||
static char rcsid[] = "$NetBSD: io.c,v 1.3 1997/01/09 20:20:15 tls Exp $";
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: io.c,v 1.4 1997/10/18 16:04:45 mrg Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
/* $NetBSD: lexi.c,v 1.4 1997/09/09 09:28:19 agc Exp $ */
|
||||
/* $NetBSD: lexi.c,v 1.5 1997/10/18 16:04:49 mrg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* Copyright (c) 1980 The Regents of the University of California.
|
||||
* Copyright (c) 1980, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -36,8 +37,11 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)lexi.c 5.16 (Berkeley) 2/26/91";*/
|
||||
static char rcsid[] = "$NetBSD: lexi.c,v 1.4 1997/09/09 09:28:19 agc Exp $";
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)lexi.c 8.1 (Berkeley) 6/6/93";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: lexi.c,v 1.5 1997/10/18 16:04:49 mrg Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
/*
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
/* $NetBSD: parse.c,v 1.3 1997/01/09 20:20:18 tls Exp $ */
|
||||
/* $NetBSD: parse.c,v 1.4 1997/10/18 16:04:53 mrg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* Copyright (c) 1980 The Regents of the University of California.
|
||||
* Copyright (c) 1980, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -36,8 +37,11 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)parse.c 5.12 (Berkeley) 2/26/91";*/
|
||||
static char rcsid[] = "$NetBSD: parse.c,v 1.3 1997/01/09 20:20:18 tls Exp $";
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: parse.c,v 1.4 1997/10/18 16:04:53 mrg Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
/* $NetBSD: pr_comment.c,v 1.4 1997/01/09 20:20:19 tls Exp $ */
|
||||
/* $NetBSD: pr_comment.c,v 1.5 1997/10/18 16:04:56 mrg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* Copyright (c) 1980 The Regents of the University of California.
|
||||
* Copyright (c) 1980, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
* Copyright (c) 1976 Board of Trustees of the University of Illinois.
|
||||
* Copyright (c) 1985 Sun Microsystems, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@ -36,8 +37,11 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
/*static char sccsid[] = "from: @(#)pr_comment.c 5.12 (Berkeley) 2/26/91";*/
|
||||
static char rcsid[] = "$NetBSD: pr_comment.c,v 1.4 1997/01/09 20:20:19 tls Exp $";
|
||||
#if 0
|
||||
static char sccsid[] = "@(#)pr_comment.c 8.1 (Berkeley) 6/6/93";
|
||||
#else
|
||||
static char rcsid[] = "$NetBSD: pr_comment.c,v 1.5 1997/10/18 16:04:56 mrg Exp $";
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user