file reorg, pathnames.h, paths.h

SCCS-vsn: old/tbl/Makefile 4.5
SCCS-vsn: old/tbl/t1.c 4.3
SCCS-vsn: old/tc/tc.c 4.3

diff --git a/usr/src/old/tbl/Makefile b/usr/src/old/tbl/Makefile
index 87f5585..5aa0ad5 100644 (file)
--- a/usr/src/old/tbl/Makefile
+++ b/usr/src/old/tbl/Makefile
@@ -14,7 +14,7 @@
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-#      @(#)Makefile    4.4 (Berkeley) %G%
+#      @(#)Makefile    4.5 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a


@@ -39,7 +39,7 @@ depend: ${SRCS}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}
        mkdep ${CFLAGS} ${SRCS}
 
 install: ${MAN}

-       install -s -o bin -g bin -m 755 tbl ${DESTDIR}/usr/bin/tbl
+       install -s -o bin -g bin -m 755 tbl ${DESTDIR}/usr/bin

        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}
        install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat1
 
 lint: ${SRCS}

diff --git a/usr/src/old/tbl/t1.c b/usr/src/old/tbl/t1.c
index 62e47ef..6f9f8aa 100644 (file)
--- a/usr/src/old/tbl/t1.c
+++ b/usr/src/old/tbl/t1.c
@@ -1,27 +1,19 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)t1.c       4.2 %G%";
+static char sccsid[] = "@(#)t1.c       4.3 %G%";

 #endif
 
  /* t1.c: main control and input switching */
 #
 # include "t..c"
 #include <signal.h>
 #endif
 
  /* t1.c: main control and input switching */
 #
 # include "t..c"
 #include <signal.h>

+#include "pathnames.h"
+

 # ifdef gcos
 /* required by GCOS because file is passed to "tbl" by troff preprocessor */
 # define _f1 _f
 extern FILE *_f[];
 # endif
 
 # ifdef gcos
 /* required by GCOS because file is passed to "tbl" by troff preprocessor */
 # define _f1 _f
 extern FILE *_f[];
 # endif
 

-# ifdef unix
-# define MACROS "/usr/lib/tmac.s"
-# define PYMACS "/usr/lib/tmac.m"
-# endif
-
-# ifdef gcos
-# define MACROS "cc/troff/smac"
-# define PYMACS "cc/troff/mmac"
-# endif
-

 # define ever (;;)
 
 main(argc,argv)
 # define ever (;;)
 
 main(argc,argv)


@@ -72,12 +64,12 @@ swapin()
                if (sargc<=0) return(0);
                if (match("-ms", *sargv))
                        {
                if (sargc<=0) return(0);
                if (match("-ms", *sargv))
                        {

-                       *sargv = MACROS;
+                       *sargv = _PATH_MACROS;

                        break;
                        }
                if (match("-mm", *sargv))
                        {
                        break;
                        }
                if (match("-mm", *sargv))
                        {

-                       *sargv = PYMACS;
+                       *sargv = _PATH_PYMACS;

                        break;
                        }
                if (match("-TX", *sargv))
                        break;
                        }
                if (match("-TX", *sargv))

diff --git a/usr/src/old/tc/tc.c b/usr/src/old/tc/tc.c
index 2e84934..17e625d 100644 (file)
--- a/usr/src/old/tc/tc.c
+++ b/usr/src/old/tc/tc.c
@@ -1,9 +1,10 @@
-static char *sccsid = "@(#)tc.c        4.2 (Berkeley) %G%";
+static char *sccsid = "@(#)tc.c        4.3 (Berkeley) %G%";

 /*
  * Simulate typesetter on 4014
 */
 
 /*
  * Simulate typesetter on 4014
 */
 

-#include <signal.h>
+#include <sys/signal.h>
+#include <paths.h>

 #include <stdio.h>
 
 #define        oput(c) if (pgskip==0) putchar(c); else (c);
 #include <stdio.h>
 
 #define        oput(c) if (pgskip==0) putchar(c); else (c);


@@ -305,7 +306,7 @@ char line[];
        if( (unixpid=fork())==0 ) {
                signal(SIGINT,sigint); signal(SIGQUIT,sigquit);
                close(0); dup(2);
        if( (unixpid=fork())==0 ) {
                signal(SIGINT,sigint); signal(SIGQUIT,sigquit);
                close(0); dup(2);

-               execl("/bin/sh", "-sh", "-c", line, 0);
+               execl(_PATH_BSHELL, "-sh", "-c", line, 0);

                exit(255);
        }
        else if(unixpid == -1)
                exit(255);
        }
        else if(unixpid == -1)