diff options
| -rw-r--r-- | usr.bin/vis/extern.h | 36 | ||||
| -rw-r--r-- | usr.bin/vis/foldit.c | 14 | ||||
| -rw-r--r-- | usr.bin/vis/vis.c | 15 |
3 files changed, 52 insertions, 13 deletions
diff --git a/usr.bin/vis/extern.h b/usr.bin/vis/extern.h new file mode 100644 index 000000000000..6839ae006901 --- /dev/null +++ b/usr.bin/vis/extern.h @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 1989, 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 + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +extern int foldit __P((char *, int, int)); diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c index 898e341c3c61..6ad82c2dc2f4 100644 --- a/usr.bin/vis/foldit.c +++ b/usr.bin/vis/foldit.c @@ -31,22 +31,24 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> + +__FBSDID("$FreeBSD$"); + #ifndef lint -#if 0 -static char sccsid[] = "@(#)foldit.c 8.1 (Berkeley) 6/6/93"; +static const char sccsid[] = "@(#)foldit.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ #include <stdio.h> +#include "extern.h" + int foldit(chunk, col, max) char *chunk; int col, max; { - register char *cp; + char *cp; /* * Keep track of column position. Insert hidden newline diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c index 740308e99ee9..c1f22e9e4b2e 100644 --- a/usr.bin/vis/vis.c +++ b/usr.bin/vis/vis.c @@ -31,19 +31,19 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> + +__FBSDID("$FreeBSD$"); + #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ +#endif #ifndef lint -#if 0 -static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93"; +static const char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ #include <err.h> #include <locale.h> @@ -52,11 +52,12 @@ static const char rcsid[] = #include <unistd.h> #include <vis.h> +#include "extern.h" + int eflags, fold, foldwidth=80, none, markeol, debug; void process __P((FILE *)); static void usage __P((void)); -extern int foldit __P((char *, int, int)); int main(argc, argv) |