Checkpoint -- still merging with Taj's version of the world.

This commit is contained in:
wkj 2004-05-16 07:55:57 +00:00
parent b855148c9b
commit c5561c23cf
37 changed files with 415 additions and 378 deletions

View file

@ -74,14 +74,13 @@ static char *parse(char *s, int typeit) /* convert \0, etc to nroff driving tabl
static int getnrfont(FILE *fp) /* read the nroff description file */
{
FILE *fin;
Chwid chtemp[NCHARS];
static Chwid chinit;
int i, nw, n, wid, code, type;
char buf[100], ch[100], s1[100], s2[100], cmd[300];
char buf[100], ch[100], s1[100], s2[100];
wchar_t wc;
code = 0;
chinit.wid = 1;
chinit.str = "";
for (i = 0; i < ALPHABET; i++) {
@ -139,7 +138,7 @@ static int getnrfont(FILE *fp) /* read the nroff description file */
void n_ptinit(void)
{
int i;
char *p, *cp;
char *p;
char opt[50], cmd[100];
FILE *fp;
@ -186,7 +185,7 @@ void n_ptinit(void)
/* hyphalg = 0; /* for testing */
strcat(termtab, devname);
if ((fp = fopen(unsharp(termtab), "r")) == NULL) {
if ((fp = fopen(termtab, "r")) == NULL) {
ERROR "cannot open %s", termtab WARN;
exit(-1);
}