only compile common_source/* once (25% faster), remove unused printcap.c

This commit is contained in:
lukem 1997-10-10 09:26:35 +00:00
parent 430cf95918
commit 0acf0ef008
12 changed files with 34 additions and 606 deletions

View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.7 1997/10/05 15:11:58 mrg Exp $
# $NetBSD: Makefile,v 1.8 1997/10/10 09:26:35 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
SUBDIR= lp lpc lpd lpq lpr lprm lptest pac filters
SUBDIR= common_source lp lpc lpd lpq lpr lprm lptest pac filters
.if make(install)
SUBDIR+= SMM.doc

View File

@ -1,3 +1,11 @@
# $NetBSD: Makefile.inc,v 1.1 1997/10/05 15:11:59 mrg Exp $
# $NetBSD: Makefile.inc,v 1.2 1997/10/10 09:26:35 lukem Exp $
WARNS?=1
LIBCOMMON != cd ${.CURDIR}/../common_source;\
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
CFLAGS+=-I${.CURDIR}/../common_source
DPADD+= ${LIBCOMMON}/libcommon.a
LDADD+= -L${LIBCOMMON} -lcommon
WARNS?= 1
.include "../Makefile.inc"

View File

@ -0,0 +1,11 @@
# $NetBSD: Makefile,v 1.1 1997/10/10 09:29:37 lukem Exp $
LIB= common
SRCS= common.c displayq.c rmjob.c startdaemon.c
NOPROFILE= noprofile
NOPIC= nopic
.include <bsd.lib.mk>
LDADD=
DPADD=

View File

@ -1,570 +0,0 @@
/* $NetBSD: printcap.c,v 1.10 1997/10/05 15:12:03 mrg Exp $ */
/*
* Copyright (c) 1983, 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.
*/
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)printcap.c 8.2 (Berkeley) 4/28/95";
#else
__RCSID("$NetBSD: printcap.c,v 1.10 1997/10/05 15:12:03 mrg Exp $");
#endif
#endif /* not lint */
#include <sys/param.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include "lp.h"
#include "pathnames.h"
#ifndef BUFSIZ
#define BUFSIZ 1024
#endif
#define MAXHOP 32 /* max number of tc= indirections */
/*
* getcap-style interface for the old printcap routines.
*
* !!!USE THIS INTERFACE ONLY IF YOU DON'T HAVE THE REAL GETCAP!!!
*/
static char *pbp; /* pointer into pbuf for pgetstr() */
static char pbuf[BUFSIZ]; /* buffer for capability strings */
extern char line[]; /* buffer for printcap entries */
int
cgetnext(bp, db_array)
char **bp;
char **db_array;
{
int ret;
char *strdup();
pbp = pbuf;
ret = getprent(line);
*bp = strdup(line);
return (ret);
}
int
cgetent(bp, db_array, name)
char **bp, **db_array, *name;
{
int i;
*bp = line;
pbp = pbuf;
i = pgetent(*bp, name);
if (i < 0)
return (-2);
else if (i == 0)
return (-1);
else
return (0);
}
char *
cgetcap(buf, cap, type)
char *buf, *cap;
int type;
{
return ((char *) pgetflag(cap));
}
int
cgetstr(buf, cap, str)
char *buf, *cap;
char **str;
{
char *pgetstr __P((char *, char **));
if (pbp >= pbuf+BUFSIZ) {
write(2, "Capability string buffer overflow\n", 34);
return (-1);
}
return ((*str = pgetstr(cap, &pbp)) == NULL ? -1 : 0);
}
int
cgetnum(buf, cap, num)
char *buf, *cap;
long *num;
{
return ((*num = pgetnum(cap)) < 0 ? -1 : 0);
}
int
cgetclose()
{
void endprent __P((void));
endprent();
return (0);
}
/*
* termcap - routines for dealing with the terminal capability data base
*
* BUG: Should use a "last" pointer in tbuf, so that searching
* for capabilities alphabetically would not be a n**2/2
* process when large numbers of capabilities are given.
* Note: If we add a last pointer now we will screw up the
* tc capability. We really should compile termcap.
*
* Essentially all the work here is scanning and decoding escapes
* in string capabilities. We don't use stdio because the editor
* doesn't, and because living w/o it is not hard.
*/
#define PRINTCAP
#ifdef PRINTCAP
#define tgetent pgetent
#define tskip pskip
#define tgetstr pgetstr
#define tdecode pdecode
#define tgetnum pgetnum
#define tgetflag pgetflag
#define tdecode pdecode
#define tnchktc pnchktc
#define tnamatch pnamatch
#define V6
#endif
static FILE *pfp = NULL; /* printcap data base file pointer */
static char *tbuf;
static int hopcount; /* detect infinite loops in termcap, init 0 */
static int tf;
char *tgetstr __P((char *, char **));
static char *tskip __P((char *));
static char *tdecode __P((char *, char **));
/*
* Similar to tgetent except it returns the next enrty instead of
* doing a lookup.
*/
int
getprent(bp)
char *bp;
{
int c, skip = 0;
if (pfp == NULL) {
seteuid(euid);
pfp = fopen(_PATH_PRINTCAP, "r");
seteuid(uid);
if (pfp == NULL)
return(-1);
}
tbuf = bp;
for (;;) {
switch (c = getc(pfp)) {
case EOF:
fclose(pfp);
pfp = NULL;
return(0);
case '\n':
if (bp == tbuf) {
skip = 0;
continue;
}
if (bp[-1] == '\\') {
bp--;
continue;
}
*bp = '\0';
return(1);
case '#':
if (bp == tbuf)
skip++;
default:
if (skip)
continue;
if (bp >= tbuf+BUFSIZ) {
write(2, "Termcap entry too long\n", 23);
*bp = '\0';
return(1);
}
*bp++ = c;
}
}
}
void
endprent()
{
if (pfp != NULL) {
/*
* Can't use fclose here because on POSIX-compliant
* systems, fclose() causes the file pointer of the
* underlying file descriptor (which is possibly shared
* with a parent process) to be adjusted, and this
* reeks havoc in the parent because it doesn't know
* the file pointer has changed.
*/
(void) close(fileno(pfp));
pfp = NULL;
}
}
/*
* Get an entry for terminal name in buffer bp,
* from the termcap file. Parse is very rudimentary;
* we just notice escaped newlines.
*/
int
tgetent(bp, name)
char *bp, *name;
{
char *cp;
int c;
int i = 0, cnt = 0;
char ibuf[BUFSIZ];
tbuf = bp;
#ifndef V6
cp = getenv("TERMCAP");
/*
* TERMCAP can have one of two things in it. It can be the
* name of a file to use instead of /etc/termcap. In this
* case it better start with a "/". Or it can be an entry to
* use so we don't have to read the file. In this case it
* has to already have the newlines crunched out.
*/
if (cp && *cp) {
if (*cp != '/') {
cp2 = getenv("TERM");
if (cp2 == (char *) 0 || strcmp(name, cp2) == 0) {
/*
* XXX: strcpy, should perhaps use BUFSIZ
* here, as that's the general length of a
* termcap buffer. Note that this code
* isn't used now anyway.
*/
strcpy(bp, cp);
return(tnchktc());
} else {
tf = open(_PATH_PRINTCAP, 0);
}
} else
tf = open(cp, 0);
}
#endif
if (tf == 0)
tf = open(_PATH_PRINTCAP, 0);
if (tf < 0)
return (-1);
for (;;) {
cp = bp;
for (;;) {
if (i == cnt) {
cnt = read(tf, ibuf, BUFSIZ);
if (cnt <= 0) {
close(tf);
tf = 0;
return (0);
}
i = 0;
}
c = ibuf[i++];
if (c == '\n') {
if (cp > bp && cp[-1] == '\\'){
cp--;
continue;
}
break;
}
if (cp >= bp+BUFSIZ) {
write(2,"Termcap entry too long\n", 23);
break;
} else
*cp++ = c;
}
*cp = 0;
/*
* The real work for the match.
*/
if (tnamatch(name)) {
lseek(tf, 0L, 0);
i = tnchktc();
if (tf) {
close(tf);
tf = 0;
}
return(i);
}
}
}
/*
* tnchktc: check the last entry, see if it's tc=xxx. If so,
* recursively find xxx and append that entry (minus the names)
* to take the place of the tc=xxx entry. This allows termcap
* entries to say "like an HP2621 but doesn't turn on the labels".
* Note that this works because of the left to right scan.
*/
int
tnchktc()
{
char *p, *q;
char tcname[16]; /* name of similar terminal */
char tcbuf[BUFSIZ];
char *holdtbuf = tbuf;
int l;
p = tbuf + strlen(tbuf) - 2; /* before the last colon */
while (*--p != ':')
if (p<tbuf) {
write(2, "Bad termcap entry\n", 18);
return (0);
}
p++;
/* p now points to beginning of last field */
if (p[0] != 't' || p[1] != 'c')
return(1);
strncpy(tcname, p+3, sizeof(tcname) - 4);
q = tcname;
while (q && *q != ':')
q++;
*q = '\0';
if (++hopcount > MAXHOP) {
write(2, "Infinite tc= loop\n", 18);
return (0);
}
if (tgetent(tcbuf, tcname) != 1)
return(0);
for (q = tcbuf; *q != ':'; q++)
;
l = p - holdtbuf + strlen(q);
if (l > BUFSIZ) {
write(2, "Termcap entry too long\n", 23);
q[BUFSIZ - (p-tbuf)] = 0;
}
strcpy(p, q+1); /* XXX: strcpy is safe from above test */
tbuf = holdtbuf;
return(1);
}
/*
* Tnamatch deals with name matching. The first field of the termcap
* entry is a sequence of names separated by |'s, so we compare
* against each such name. The normal : terminator after the last
* name (before the first field) stops us.
*/
int
tnamatch(np)
char *np;
{
char *Np, *Bp;
Bp = tbuf;
if (*Bp == '#')
return(0);
for (;;) {
for (Np = np; *Np && *Bp == *Np; Bp++, Np++)
continue;
if (*Np == 0 && (*Bp == '|' || *Bp == ':' || *Bp == 0))
return (1);
while (*Bp && *Bp != ':' && *Bp != '|')
Bp++;
if (*Bp == 0 || *Bp == ':')
return (0);
Bp++;
}
}
/*
* Skip to the next field. Notice that this is very dumb, not
* knowing about \: escapes or any such. If necessary, :'s can be put
* into the termcap file in octal.
*/
static char *
tskip(bp)
char *bp;
{
while (*bp && *bp != ':')
bp++;
if (*bp == ':')
bp++;
return (bp);
}
/*
* Return the (numeric) option id.
* Numeric options look like
* li#80
* i.e. the option string is separated from the numeric value by
* a # character. If the option is not found we return -1.
* Note that we handle octal numbers beginning with 0.
*/
int
tgetnum(id)
char *id;
{
int i, base;
char *bp = tbuf;
for (;;) {
bp = tskip(bp);
if (*bp == 0)
return (-1);
if (*bp++ != id[0] || *bp == 0 || *bp++ != id[1])
continue;
if (*bp == '@')
return(-1);
if (*bp != '#')
continue;
bp++;
base = 10;
if (*bp == '0')
base = 8;
i = 0;
while (isdigit(*bp))
i *= base, i += *bp++ - '0';
return (i);
}
}
/*
* Handle a flag option.
* Flag options are given "naked", i.e. followed by a : or the end
* of the buffer. Return 1 if we find the option, or 0 if it is
* not given.
*/
int
tgetflag(id)
char *id;
{
char *bp = tbuf;
for (;;) {
bp = tskip(bp);
if (!*bp)
return (0);
if (*bp++ == id[0] && *bp != 0 && *bp++ == id[1]) {
if (!*bp || *bp == ':')
return (1);
else if (*bp == '@')
return(0);
}
}
}
/*
* Get a string valued option.
* These are given as
* cl=^Z
* Much decoding is done on the strings, and the strings are
* placed in area, which is a ref parameter which is updated.
* No checking on area overflow.
*/
char *
tgetstr(id, area)
char *id, **area;
{
char *bp = tbuf;
for (;;) {
bp = tskip(bp);
if (!*bp)
return (0);
if (*bp++ != id[0] || *bp == 0 || *bp++ != id[1])
continue;
if (*bp == '@')
return(0);
if (*bp != '=')
continue;
bp++;
return (tdecode(bp, area));
}
}
/*
* Tdecode does the grung work to decode the
* string capability escapes.
*/
static char *
tdecode(str, area)
char *str;
char **area;
{
char *cp;
int c;
char *dp;
int i;
cp = *area;
while ((c = *str++) && c != ':') {
switch (c) {
case '^':
c = *str++ & 037;
break;
case '\\':
dp = "E\033^^\\\\::n\nr\rt\tb\bf\f";
c = *str++;
nextc:
if (*dp++ == c) {
c = *dp++;
break;
}
dp++;
if (*dp)
goto nextc;
if (isdigit(c)) {
c -= '0', i = 2;
do
c <<= 3, c |= *str++ - '0';
while (--i && isdigit(*str));
}
break;
}
*cp++ = c;
}
*cp++ = 0;
str = *area;
*area = cp;
return (str);
}

View File

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.2 1997/10/05 12:48:35 mrg Exp $
# $NetBSD: Makefile,v 1.3 1997/10/10 09:26:37 lukem Exp $
# @(#)Makefile 5.6 (Berkeley) 6/23/90
FILES= lp
FILESDIR= /usr/bin
FILESMODE= 555
MAN = lp.1
MAN= lp.1
.include <bsd.prog.mk>

View File

@ -1,13 +1,10 @@
# $NetBSD: Makefile,v 1.7 1997/05/08 21:12:24 gwr Exp $
# $NetBSD: Makefile,v 1.8 1997/10/10 09:26:38 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lpc
CFLAGS+=-I${.CURDIR}/../common_source
MAN= lpc.8
SRCS= lpc.c cmds.c cmdtab.c startdaemon.c common.c
SRCS= lpc.c cmds.c cmdtab.c
BINGRP= daemon
BINMODE=2555
.PATH: ${.CURDIR}/../common_source
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,12 +1,8 @@
# $NetBSD: Makefile,v 1.10 1997/05/08 21:12:25 gwr Exp $
# $NetBSD: Makefile,v 1.11 1997/10/10 09:26:39 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lpd
CFLAGS+=-I${.CURDIR}/../common_source
MAN= lpd.8
SRCS= lpd.c printjob.c recvjob.c displayq.c rmjob.c startdaemon.c \
lpdchar.c common.c key.c modes.c ttcompat.c
.PATH: ${.CURDIR}/../common_source
SRCS= lpd.c printjob.c recvjob.c lpdchar.c key.c modes.c ttcompat.c
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,13 +1,10 @@
# $NetBSD: Makefile,v 1.6 1997/05/08 21:12:26 gwr Exp $
# $NetBSD: Makefile,v 1.7 1997/10/10 09:26:40 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lpq
CFLAGS+=-I${.CURDIR}/../common_source
SRCS= lpq.c displayq.c common.c
BINOWN= root
BINGRP= daemon
BINMODE=6555
BINDIR= /usr/bin
.PATH: ${.CURDIR}/../common_source
.include <bsd.prog.mk>

View File

@ -1,13 +1,10 @@
# $NetBSD: Makefile,v 1.6 1997/05/08 21:12:27 gwr Exp $
# $NetBSD: Makefile,v 1.7 1997/10/10 09:26:41 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lpr
CFLAGS+=-I${.CURDIR}/../common_source
SRCS= lpr.c startdaemon.c common.c
BINOWN= root
BINGRP= daemon
BINMODE=6555
BINDIR= /usr/bin
.PATH: ${.CURDIR}/../common_source
.include <bsd.prog.mk>

View File

@ -1,13 +1,10 @@
# $NetBSD: Makefile,v 1.6 1997/05/08 21:12:28 gwr Exp $
# $NetBSD: Makefile,v 1.7 1997/10/10 09:26:42 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lprm
CFLAGS+=-I${.CURDIR}/../common_source
SRCS= lprm.c rmjob.c startdaemon.c common.c
BINOWN= root
BINGRP= daemon
BINMODE=6555
BINDIR= /usr/bin
.PATH: ${.CURDIR}/../common_source
.include <bsd.prog.mk>

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.4 1995/11/15 22:50:41 pk Exp $
# $NetBSD: Makefile,v 1.5 1997/10/10 09:26:43 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lptest
.include "../../Makefile.inc"
.include <bsd.prog.mk>

View File

@ -1,11 +1,7 @@
# $NetBSD: Makefile,v 1.7 1997/05/08 21:12:29 gwr Exp $
# $NetBSD: Makefile,v 1.8 1997/10/10 09:26:44 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= pac
CFLAGS+=-I${.CURDIR}/../common_source
MAN= pac.8
SRCS= pac.c common.c
.PATH: ${.CURDIR}/../common_source
.include "../../Makefile.inc"
.include <bsd.prog.mk>