Importing usr.bin/soelim

No Minix-specific changes needed.

Change-Id: Ie313f3a4ade21c9f5edabd55726fa6af5f468e5d
This commit is contained in:
Thomas Cort 2013-11-18 08:49:16 -05:00
parent 15fd0f1d06
commit 2b4e2a565b
6 changed files with 351 additions and 1 deletions

View file

@ -490,6 +490,7 @@
./usr/bin/size minix-sys binutils ./usr/bin/size minix-sys binutils
./usr/bin/sleep minix-sys ./usr/bin/sleep minix-sys
./usr/bin/slip minix-sys ./usr/bin/slip minix-sys
./usr/bin/soelim minix-sys
./usr/bin/sort minix-sys ./usr/bin/sort minix-sys
./usr/bin/spell minix-sys ./usr/bin/spell minix-sys
./usr/bin/split minix-sys ./usr/bin/split minix-sys
@ -2094,6 +2095,7 @@
./usr/man/man1/shuffle.1 minix-sys ./usr/man/man1/shuffle.1 minix-sys
./usr/man/man1/size.1 minix-sys binutils ./usr/man/man1/size.1 minix-sys binutils
./usr/man/man1/sleep.1 minix-sys ./usr/man/man1/sleep.1 minix-sys
./usr/man/man1/soelim.1 minix-sys
./usr/man/man1/sort.1 minix-sys ./usr/man/man1/sort.1 minix-sys
./usr/man/man1/spell.1 minix-sys ./usr/man/man1/spell.1 minix-sys
./usr/man/man1/split.1 minix-sys ./usr/man/man1/split.1 minix-sys

View file

@ -223,6 +223,7 @@
2010/05/27 08:40:19,usr.bin/seq 2010/05/27 08:40:19,usr.bin/seq
2012/10/17 12:00:00,usr.bin/shlock 2012/10/17 12:00:00,usr.bin/shlock
2013/06/02 12:00:00,usr.bin/shuffle 2013/06/02 12:00:00,usr.bin/shuffle
2012/10/17 12:00:00,usr.bin/soelim
2012/10/17 12:00:00,usr.bin/sort 2012/10/17 12:00:00,usr.bin/sort
2012/10/17 12:00:00,usr.bin/split 2012/10/17 12:00:00,usr.bin/split
2011/01/15 22:54:10,usr.bin/stat 2011/01/15 22:54:10,usr.bin/stat

View file

@ -24,7 +24,7 @@ SUBDIR= asa \
renice rev \ renice rev \
\ \
sdiff sed seq shlock \ sdiff sed seq shlock \
shuffle sort split stat su \ shuffle soelim sort split stat su \
tee tic tput \ tee tic tput \
tr tsort tty ul unexpand unifdef \ tr tsort tty ul unexpand unifdef \
toproto \ toproto \

6
usr.bin/soelim/Makefile Normal file
View file

@ -0,0 +1,6 @@
# $NetBSD: Makefile,v 1.5 2009/04/14 22:15:26 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= soelim
.include <bsd.prog.mk>

93
usr.bin/soelim/soelim.1 Normal file
View file

@ -0,0 +1,93 @@
.\" $NetBSD: soelim.1,v 1.10 2012/05/12 14:52:58 reed Exp $
.\"
.\" Copyright (c) 1980, 1990, 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. 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.
.\"
.\" @(#)soelim.1 8.1 (Berkeley) 6/6/93
.\"
.Dd June 6, 1993
.Dt SOELIM 1
.Os
.Sh NAME
.Nm soelim
.Nd eliminate .so's from nroff input
.Sh SYNOPSIS
.Nm
.Op Fl I Ar directory
.Op Ar file ...
.Sh DESCRIPTION
.Nm
reads the specified files or the standard input and performs the textual
inclusion implied by the
.Xr nroff 1
directives of the form:
.Pp
.Dl \&.so somefile
.Pp
The directives need to appear at the beginning of input lines.
This is useful since programs such as
.Xr tbl 1
do not normally do this; it allows the placement of individual tables
in separate files to be run as a part of a large document.
.Pp
An argument consisting of a single minus
.Ql Fl
is taken to be
a file name corresponding to the standard input.
.Pp
Note that inclusion can be suppressed by using
.Ql \e'
instead of
.Ql \e. ,
i.e.
.Pp
.Dl \'so /usr/lib/tmac.s
.Pp
A sample usage of
.Nm
would be
.Pp
.Bd -literal -offset indent -compact
soelim exum?.n \&| tbl \&| nroff \-ms \&| col \&| lpr
.Ed
.Pp
The options are as follows:
.Bl -tag -width indent
.It Fl I
Add the specified directory to the search path for input files.
.El
.Sh SEE ALSO
.Xr colcrt 1 ,
.Xr more 1
.Sh HISTORY
The
.Nm
command appeared in
.Bx 1 .
.Sh BUGS
The format of the source commands must involve no strangeness \-
exactly one blank must precede and no blanks follow the file name.

248
usr.bin/soelim/soelim.c Normal file
View file

@ -0,0 +1,248 @@
/* $NetBSD: soelim.c,v 1.14 2008/07/21 14:19:26 lukem Exp $ */
/*
* 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
* 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. 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.
*/
#include <sys/cdefs.h>
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1980, 1993\
The Regents of the University of California. All rights reserved.");
#endif /* not lint */
#ifndef lint
#if 0
static char sccsid[] = "@(#)soelim.c 8.1 (Berkeley) 6/6/93";
#endif
__RCSID("$NetBSD: soelim.c,v 1.14 2008/07/21 14:19:26 lukem Exp $");
#endif /* not lint */
/*
* soelim - a filter to process n/troff input eliminating .so's
*
* Author: Bill Joy UCB July 8, 1977
*
* This program eliminates .so's from a n/troff input stream.
* It can be used to prepare safe input for submission to the
* phototypesetter since the software supporting the operator
* doesn't let him do chdir.
*
* This is a kludge and the operator should be given the
* ability to do chdir.
*
* This program is more generally useful, it turns out, because
* the program tbl doesn't understand ".so" directives.
*/
#include <sys/param.h>
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#define STDIN_NAME "-"
struct path {
char **list;
size_t n, c;
};
static int process(struct path *, const char *);
static void initpath(struct path *);
static void addpath(struct path *, const char *);
static FILE *openpath(struct path *, const char *, const char *);
int main(int, char **);
static void
initpath(struct path *p)
{
p->list = NULL;
p->n = p->c = 0;
}
static void
addpath(struct path *p, const char *dir)
{
char **n;
if (p->list == NULL || p->n <= p->c - 2) {
n = realloc(p->list, (p->n + 10) * sizeof(p->list[0]));
if (n == NULL)
err(1, NULL);
p->list = n;
p->n += 10;
}
if ((p->list[p->c++] = strdup(dir)) == NULL)
err(1, NULL);
p->list[p->c] = NULL;
}
static FILE *
openpath(struct path *p, const char *name, const char *parm)
{
char filename[MAXPATHLEN];
const char *f;
FILE *fp;
size_t i;
if (*name == '/' || p->c == 0)
return fopen(name, parm);
for (i = 0; i < p->c; i++) {
if (p->list[i][0] == '\0')
f = name;
else {
(void)snprintf(filename, sizeof(filename), "%s/%s",
p->list[i], name);
f = filename;
}
if ((fp = fopen(f, parm)) != NULL)
return fp;
}
return NULL;
}
int
main(int argc, char *argv[])
{
struct path p;
int c;
initpath(&p);
addpath(&p, ".");
while ((c = getopt(argc, argv, "I:")) != -1)
switch (c) {
case 'I':
addpath(&p, optarg);
break;
default:
(void)fprintf(stderr,
"usage: %s [-I<dir>] [files...]\n",
getprogname());
exit(1);
}
argc -= optind;
argv += optind;
if (argc == 0) {
(void)process(&p, STDIN_NAME);
exit(0);
}
do {
(void)process(&p, argv[0]);
argv++;
argc--;
} while (argc > 0);
exit(0);
}
int
process(struct path *p, const char *file)
{
char *cp;
int c;
char fname[BUFSIZ];
FILE *soee;
int isfile;
if (!strcmp(file, STDIN_NAME)) {
soee = stdin;
} else {
soee = openpath(p, file, "r");
if (soee == NULL) {
warn("Cannot open `%s'", file);
return(-1);
}
}
for (;;) {
c = getc(soee);
if (c == EOF)
break;
if (c != '.')
goto simple;
c = getc(soee);
if (c != 's') {
putchar('.');
goto simple;
}
c = getc(soee);
if (c != 'o') {
printf(".s");
goto simple;
}
do
c = getc(soee);
while (c == ' ' || c == '\t');
cp = fname;
isfile = 0;
for (;;) {
switch (c) {
case ' ':
case '\t':
case '\n':
case EOF:
goto donename;
default:
*cp++ = c;
c = getc(soee);
isfile++;
continue;
}
}
donename:
if (cp == fname) {
printf(".so");
goto simple;
}
*cp = 0;
if (process(p, fname) < 0)
if (isfile)
printf(".so %s\n", fname);
continue;
simple:
if (c == EOF)
break;
putchar(c);
if (c != '\n') {
c = getc(soee);
goto simple;
}
}
if (soee != stdin) {
fclose(soee);
}
return(0);
}