BSD 4_3_Reno release

[unix-history] / usr / src / usr.bin / roff / nroff / n10.c

diff --git a/usr/src/usr.bin/roff/nroff/n10.c b/usr/src/usr.bin/roff/nroff/n10.c
index f220df1..0545dc1 100644 (file)
--- a/usr/src/usr.bin/roff/nroff/n10.c
+++ b/usr/src/usr.bin/roff/nroff/n10.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)n10.c      4.3 4/27/88";
+static char sccsid[] = "@(#)n10.c      4.5 5/11/89";

 #endif lint
 
 #include "tdef.h"
 #endif lint
 
 #include "tdef.h"


@@ -10,6 +10,7 @@ extern
 #include "v.h"
 extern
 #include "tw.h"
 #include "v.h"
 extern
 #include "tw.h"

+#include "pathnames.h"

 /*
 nroff10.c
 
 /*
 nroff10.c
 


@@ -50,14 +51,16 @@ ptinit(){
        int x[8];
        extern char *setbrk();
 
        int x[8];
        extern char *setbrk();
 

-       if(((i=open(termtab,0)) < 0) && (i=open("/usr/lib/term/tablpr",0)) < 0){
+       if(((i=open(termtab,0)) < 0) && (i=open(_PATH_TERM,0)) < 0){

                prstr("Cannot open ");
                prstr(termtab);
                prstr("\n");
                exit(-1);
        }
        read(i,(char *)x,8*sizeof(int));
                prstr("Cannot open ");
                prstr(termtab);
                prstr("\n");
                exit(-1);
        }
        read(i,(char *)x,8*sizeof(int));

-       read(i,(char *)&t.bset,j = sizeof(int)*((int *)&t.zzz - &t.bset));
+       /* Calc size of table, not counting zzz */
+       j = ((int) &t.zzz - (int) &t.bset);
+       read(i, (char *)&t.bset, j);

        x[2] -= j;
        q = setbrk(x[2]);
        lseek(i,(long)t.twinit+8*sizeof(int),0);
        x[2] -= j;
        q = setbrk(x[2]);
        lseek(i,(long)t.twinit+8*sizeof(int),0);