Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge lite-2.

Browse Source
This commit is contained in:
mrg 1997-10-18 16:04:21 +00:00
parent 6db79ef042
commit 226284be12
10 changed files with 80 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/indent/Makefile
View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.3 1997/01/09 20:20:08 tls Exp $ # $NetBSD: Makefile,v 1.4 1997/10/18 16:04:21 mrg Exp $
# from: @(#)Makefile 5.11 (Berkeley) 5/11/90 # from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= indent PROG= indent
SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c

14
usr.bin/indent/args.c
View File

@ -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, 1993
* Copyright (c) 1980 The Regents of the University of California. * The Regents of the University of California. All rights reserved.
* Copyright (c) 1976 Board of Trustees of the University of Illinois. * Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,8 +37,11 @@
*/ */
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)args.c 5.10 (Berkeley) 2/26/91";*/ #if 0
static char rcsid[] = "$NetBSD: args.c,v 1.3 1997/01/09 20:20:09 tls Exp $"; 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 */ #endif /* not lint */
/* /*

26
usr.bin/indent/indent.1
View File

@ -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) 1985 Sun Microsystems, Inc.
.\" Copyright (c) 1976 Board of Trustees of the University of Illinois. .\" Copyright (c) 1976 Board of Trustees of the University of Illinois.
.\" All rights reserved. .\" All rights reserved.
@ -33,10 +34,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.\" from: @(#)indent.1 6.11 (Berkeley) 7/24/91 .\" from: @(#)indent.1 8.1 (Berkeley) 7/1/93
.\" $NetBSD: indent.1,v 1.6 1997/01/09 20:20:10 tls Exp $
.\" .\"
.Dd July 24, 1991 .Dd July 1, 1993
.Dt INDENT 1 .Dt INDENT 1
.Os BSD 4.2 .Os BSD 4.2
.Sh NAME .Sh NAME
@ -266,8 +266,8 @@ paren. For example, here is how a piece of continued code looks with
in effect: in effect:
.ne 2 .ne 2
.Bd -literal -offset indent .Bd -literal -offset indent
.Li p1 = first_procedure(second_procedure(p2, p3), p1 = first_procedure(second_procedure(p2, p3),
.Li \ \ third_procedure(p4,p5)); \ \ third_procedure(p4,p5));
.Ed .Ed
.Pp .Pp
.ne 5 .ne 5
@ -275,17 +275,17 @@ With
.Fl lp .Fl lp
in effect (the default) the code looks somewhat clearer: in effect (the default) the code looks somewhat clearer:
.Bd -literal -offset indent .Bd -literal -offset indent
.Li p1\ =\ first_procedure(second_procedure(p2,\ p3), p1\ =\ first_procedure(second_procedure(p2,\ p3),
.Li \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ third_procedure(p4,p5)); \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ third_procedure(p4,p5));
.Ed .Ed
.Pp .Pp
.ne 5 .ne 5
Inserting two more newlines we get: Inserting two more newlines we get:
.Bd -literal -offset indent .Bd -literal -offset indent
.Li p1\ =\ first_procedure(second_procedure(p2, p1\ =\ first_procedure(second_procedure(p2,
.Li \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ p3), \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ p3),
.Li \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ third_procedure(p4 \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ third_procedure(p4
.Li \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ p5)); \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ p5));
.Ed .Ed
.It Fl npro .It Fl npro
Causes the profile files, Causes the profile files,

18
usr.bin/indent/indent.c
View File

@ -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, 1993
* Copyright (c) 1980 The Regents of the University of California. * The Regents of the University of California. All rights reserved.
* Copyright (c) 1976 Board of Trustees of the University of Illinois. * Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,14 +39,17 @@
#ifndef lint #ifndef lint
char copyright[] = char copyright[] =
"@(#) Copyright (c) 1985 Sun Microsystems, Inc.\n\ "@(#) 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\ @(#) 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 */ #endif /* not lint */
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)indent.c 5.16 (Berkeley) 2/26/91";*/ #if 0
static char rcsid[] = "$NetBSD: indent.c,v 1.4 1997/01/09 20:20:11 tls Exp $"; 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 */ #endif /* not lint */
#include <sys/param.h> #include <sys/param.h>

8
usr.bin/indent/indent_codes.h
View File

@ -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) 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. * Copyright (c) 1976 Board of Trustees of the University of Illinois.
* All rights reserved. * 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * 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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)indent_codes.h 5.7 (Berkeley) 6/1/90 * from: @(#)indent_codes.h 8.1 (Berkeley) 6/6/93
* $NetBSD: indent_codes.h,v 1.3 1997/01/09 20:20:12 tls Exp $
*/ */
#define newline 1 #define newline 1

8
usr.bin/indent/indent_globs.h
View File

@ -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) 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. * Copyright (c) 1976 Board of Trustees of the University of Illinois.
* All rights reserved. * 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * 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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)indent_globs.h 5.11 (Berkeley) 2/26/91 * from: @(#)indent_globs.h 8.1 (Berkeley) 6/6/93
* $NetBSD: indent_globs.h,v 1.3 1997/01/09 20:20:13 tls Exp $
*/ */
#define BACKSLASH '\\' #define BACKSLASH '\\'

14
usr.bin/indent/io.c
View File

@ -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, 1993
* Copyright (c) 1980 The Regents of the University of California. * The Regents of the University of California. All rights reserved.
* Copyright (c) 1976 Board of Trustees of the University of Illinois. * Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,8 +37,11 @@
*/ */
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)io.c 5.15 (Berkeley) 2/26/91";*/ #if 0
static char rcsid[] = "$NetBSD: io.c,v 1.3 1997/01/09 20:20:15 tls Exp $"; 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 */ #endif /* not lint */
#include <stdio.h> #include <stdio.h>

14
usr.bin/indent/lexi.c
View File

@ -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, 1993
* Copyright (c) 1980 The Regents of the University of California. * The Regents of the University of California. All rights reserved.
* Copyright (c) 1976 Board of Trustees of the University of Illinois. * Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,8 +37,11 @@
*/ */
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)lexi.c 5.16 (Berkeley) 2/26/91";*/ #if 0
static char rcsid[] = "$NetBSD: lexi.c,v 1.4 1997/09/09 09:28:19 agc Exp $"; 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 */ #endif /* not lint */
/* /*

14
usr.bin/indent/parse.c
View File

@ -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, 1993
* Copyright (c) 1980 The Regents of the University of California. * The Regents of the University of California. All rights reserved.
* Copyright (c) 1976 Board of Trustees of the University of Illinois. * Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,8 +37,11 @@
*/ */
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)parse.c 5.12 (Berkeley) 2/26/91";*/ #if 0
static char rcsid[] = "$NetBSD: parse.c,v 1.3 1997/01/09 20:20:18 tls Exp $"; 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 */ #endif /* not lint */
#include <stdio.h> #include <stdio.h>

14
usr.bin/indent/pr_comment.c
View File

@ -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, 1993
* Copyright (c) 1980 The Regents of the University of California. * The Regents of the University of California. All rights reserved.
* Copyright (c) 1976 Board of Trustees of the University of Illinois. * Copyright (c) 1976 Board of Trustees of the University of Illinois.
* Copyright (c) 1985 Sun Microsystems, Inc.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,8 +37,11 @@
*/ */
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)pr_comment.c 5.12 (Berkeley) 2/26/91";*/ #if 0
static char rcsid[] = "$NetBSD: pr_comment.c,v 1.4 1997/01/09 20:20:19 tls Exp $"; 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 */ #endif /* not lint */
#include <stdio.h> #include <stdio.h>