compile with -R

SCCS-vsn: usr.bin/fmt/fmt.c 5.7
SCCS-vsn: usr.bin/mail/fio.c 5.11
SCCS-vsn: usr.bin/mail/popen.c 5.11
SCCS-vsn: usr.bin/mail/aux.c 5.12
SCCS-vsn: usr.bin/mail/Makefile 5.10

diff --git a/usr/src/usr.bin/fmt/fmt.c b/usr/src/usr.bin/fmt/fmt.c
index 9960705..c07b281 100644 (file)
--- a/usr/src/usr.bin/fmt/fmt.c
+++ b/usr/src/usr.bin/fmt/fmt.c
@@ -22,7 +22,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)fmt.c      5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)fmt.c      5.7 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>


@@ -43,8 +43,10 @@ static char sccsid[] = "@(#)fmt.c    5.6 (Berkeley) %G%";
 #define        NOSTR   ((char *) 0)    /* Null string pointer for lint */
 
 /* LIZ@UOM 6/18/85 --New variables goal_length and max_length */
 #define        NOSTR   ((char *) 0)    /* Null string pointer for lint */
 
 /* LIZ@UOM 6/18/85 --New variables goal_length and max_length */

-int    goal_length = 65;       /* Target or goal line length in output */
-int    max_length = 75;        /* Max line length in output */
+#define GOAL_LENGTH 65
+#define MAX_LENGTH 75
+int    goal_length;            /* Target or goal line length in output */
+int    max_length;             /* Max line length in output */

 int    pfx;                    /* Current leading blank count */
 int    lineno;                 /* Current input line */
 int    mark;                   /* Last place we saw a head line */
 int    pfx;                    /* Current leading blank count */
 int    lineno;                 /* Current input line */
 int    mark;                   /* Last place we saw a head line */


@@ -66,6 +68,8 @@ main(argc, argv)
        register int errs = 0;
        int number;             /* LIZ@UOM 6/18/85 */
 
        register int errs = 0;
        int number;             /* LIZ@UOM 6/18/85 */
 

+       goal_length = GOAL_LENGTH;
+       max_length = MAX_LENGTH;

        setout();
        lineno = 1;
        mark = -10;
        setout();
        lineno = 1;
        mark = -10;

diff --git a/usr/src/usr.bin/mail/Makefile b/usr/src/usr.bin/mail/Makefile
index 49ad1e0..7ecbfaf 100644 (file)
--- a/usr/src/usr.bin/mail/Makefile
+++ b/usr/src/usr.bin/mail/Makefile
@@ -14,9 +14,9 @@
 # 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    5.9 (Berkeley) %G%
+#      @(#)Makefile    5.10 (Berkeley) %G%

 #
 #

-CFLAGS=        -O
+CFLAGS=        -O -R

 LIBC=  /lib/libc.a
 SRCS=  version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \
        getname.c head.c v7.local.c lex.c list.c main.c names.c popen.c \
 LIBC=  /lib/libc.a
 SRCS=  version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \
        getname.c head.c v7.local.c lex.c list.c main.c names.c popen.c \


@@ -76,8 +76,7 @@ cmd1.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 cmd1.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 cmd1.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
 cmd1.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
 cmd1.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 cmd1.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
 cmd1.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h

-cmd1.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/stat.h
-cmd1.o: /usr/include/sys/wait.h
+cmd1.o: local.h v7.local.h glob.h /usr/include/setjmp.h

 cmd2.o: cmd2.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 cmd2.o: /usr/include/signal.h /usr/include/machine/trap.h
 cmd2.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 cmd2.o: cmd2.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 cmd2.o: /usr/include/signal.h /usr/include/machine/trap.h
 cmd2.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h


@@ -92,8 +91,7 @@ cmd3.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 cmd3.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 cmd3.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
 cmd3.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
 cmd3.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 cmd3.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
 cmd3.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h

-cmd3.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/stat.h
-cmd3.o: /usr/include/sys/wait.h
+cmd3.o: local.h v7.local.h glob.h /usr/include/setjmp.h

 cmdtab.o: cmdtab.c def.h /usr/include/sys/param.h /usr/include/sys/types.h
 cmdtab.o: /usr/include/signal.h /usr/include/machine/trap.h
 cmdtab.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 cmdtab.o: cmdtab.c def.h /usr/include/sys/param.h /usr/include/sys/types.h
 cmdtab.o: /usr/include/signal.h /usr/include/machine/trap.h
 cmdtab.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h


@@ -109,15 +107,13 @@ collect.o: /usr/include/stdio.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
 collect.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
 collect.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h
 collect.o: glob.h /usr/include/setjmp.h /usr/include/sys/stat.h
 collect.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
 collect.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h
 collect.o: glob.h /usr/include/setjmp.h /usr/include/sys/stat.h

-collect.o: /usr/include/sys/wait.h

 edit.o: edit.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 edit.o: /usr/include/signal.h /usr/include/machine/trap.h
 edit.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 edit.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 edit.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
 edit.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
 edit.o: edit.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 edit.o: /usr/include/signal.h /usr/include/machine/trap.h
 edit.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 edit.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 edit.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
 edit.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h

-edit.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/stdio.h
-edit.o: /usr/include/sys/stat.h /usr/include/sys/wait.h
+edit.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/stat.h

 fio.o: fio.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 fio.o: /usr/include/signal.h /usr/include/machine/trap.h
 fio.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 fio.o: fio.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 fio.o: /usr/include/signal.h /usr/include/machine/trap.h
 fio.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h


@@ -185,9 +181,8 @@ popen.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 popen.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 popen.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
 popen.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
 popen.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 popen.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
 popen.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h

-popen.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/stdio.h
-popen.o: /usr/include/sys/signal.h /usr/include/sys/types.h
-popen.o: /usr/include/sys/wait.h /usr/include/errno.h
+popen.o: local.h v7.local.h glob.h /usr/include/setjmp.h
+popen.o: /usr/include/sys/signal.h /usr/include/sys/wait.h

 quit.o: quit.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 quit.o: /usr/include/signal.h /usr/include/machine/trap.h
 quit.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 quit.o: quit.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 quit.o: /usr/include/signal.h /usr/include/machine/trap.h
 quit.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h

diff --git a/usr/src/usr.bin/mail/aux.c b/usr/src/usr.bin/mail/aux.c
index 6200358..e15b61b 100644 (file)
--- a/usr/src/usr.bin/mail/aux.c
+++ b/usr/src/usr.bin/mail/aux.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)aux.c      5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)aux.c      5.12 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "rcv.h"
 #endif /* not lint */
 
 #include "rcv.h"


@@ -267,7 +267,7 @@ istrcpy(dest, src)
  * the stack.
  */
 
  * the stack.
  */
 

-static int     ssp = -1;               /* Top of file stack */
+static int     ssp;                    /* Top of file stack */

 struct sstack {
        FILE    *s_file;                /* File we were in. */
        int     s_cond;                 /* Saved state of conditionals */
 struct sstack {
        FILE    *s_file;                /* File we were in. */
        int     s_cond;                 /* Saved state of conditionals */


@@ -292,14 +292,15 @@ source(name)
                perror(cp);
                return(1);
        }
                perror(cp);
                return(1);
        }

-       if (ssp >= NOFILE - 2) {
+       if (ssp >= NOFILE - 1) {

                printf("Too much \"sourcing\" going on.\n");
                fclose(fi);
                return(1);
        }
                printf("Too much \"sourcing\" going on.\n");
                fclose(fi);
                return(1);
        }

-       sstack[++ssp].s_file = input;
+       sstack[ssp].s_file = input;

        sstack[ssp].s_cond = cond;
        sstack[ssp].s_loading = loading;
        sstack[ssp].s_cond = cond;
        sstack[ssp].s_loading = loading;

+       ssp++;

        loading = 0;
        cond = CANY;
        input = fi;
        loading = 0;
        cond = CANY;
        input = fi;


@@ -314,7 +315,7 @@ source(name)
 
 unstack()
 {
 
 unstack()
 {

-       if (ssp < 0) {
+       if (ssp <= 0) {

                printf("\"Source\" stack over-pop.\n");
                sourcing = 0;
                return(1);
                printf("\"Source\" stack over-pop.\n");
                sourcing = 0;
                return(1);


@@ -322,10 +323,11 @@ unstack()
        fclose(input);
        if (cond != CANY)
                printf("Unmatched \"if\"\n");
        fclose(input);
        if (cond != CANY)
                printf("Unmatched \"if\"\n");

+       ssp--;

        cond = sstack[ssp].s_cond;
        loading = sstack[ssp].s_loading;
        cond = sstack[ssp].s_cond;
        loading = sstack[ssp].s_loading;

-       input = sstack[ssp--].s_file;
-       if (ssp < 0)
+       input = sstack[ssp].s_file;
+       if (ssp == 0)

                sourcing = loading;
        return(0);
 }
                sourcing = loading;
        return(0);
 }

diff --git a/usr/src/usr.bin/mail/fio.c b/usr/src/usr.bin/mail/fio.c
index 4b201b3..e356b05 100644 (file)
--- a/usr/src/usr.bin/mail/fio.c
+++ b/usr/src/usr.bin/mail/fio.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)fio.c      5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)fio.c      5.11 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "rcv.h"
 #endif /* not lint */
 
 #include "rcv.h"


@@ -338,8 +338,8 @@ done:
        relsesigs();
 }
 
        relsesigs();
 }
 

-static int sigdepth = 0;               /* depth of holdsigs() */
-static int omask = 0;
+static int sigdepth;           /* depth of holdsigs() */
+static int omask;

 /*
  * Hold signals SIGHUP, SIGINT, and SIGQUIT.
  */
 /*
  * Hold signals SIGHUP, SIGINT, and SIGQUIT.
  */

diff --git a/usr/src/usr.bin/mail/popen.c b/usr/src/usr.bin/mail/popen.c
index 6e140a7..a61f556 100644 (file)
--- a/usr/src/usr.bin/mail/popen.c
+++ b/usr/src/usr.bin/mail/popen.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)popen.c    5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)popen.c    5.11 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "rcv.h"
 #endif /* not lint */
 
 #include "rcv.h"


@@ -25,7 +25,7 @@ static char sccsid[] = "@(#)popen.c   5.10 (Berkeley) %G%";
 
 #define READ 0
 #define WRITE 1
 
 #define READ 0
 #define WRITE 1

-static int *pid = NULL;
+static int *pid;

 
 FILE *
 Popen(cmd, mode)
 
 FILE *
 Popen(cmd, mode)


@@ -35,7 +35,7 @@ Popen(cmd, mode)
        int p[2];
        int myside, hisside, fd0, fd1;
 
        int p[2];
        int myside, hisside, fd0, fd1;
 

-       if (pid == NULL)
+       if (pid == 0)

                pid = (int *) malloc((unsigned) sizeof (int) * getdtablesize());
        if (pipe(p) < 0)
                return NULL;
                pid = (int *) malloc((unsigned) sizeof (int) * getdtablesize());
        if (pipe(p) < 0)
                return NULL;