prehistoric (e.g., pre-sendmail) code removed

SCCS-vsn: usr.bin/mail/names.c 5.7
SCCS-vsn: usr.bin/mail/quit.c 5.6
SCCS-vsn: usr.bin/mail/send.c 5.8
SCCS-vsn: usr.bin/mail/pathnames.h 5.5
SCCS-vsn: usr.bin/mail/cmd3.c 5.7
SCCS-vsn: usr.bin/mail/main.c 5.9
SCCS-vsn: usr.bin/mail/def.h 5.8
SCCS-vsn: usr.bin/mail/strings.c 5.6
SCCS-vsn: usr.bin/mail/aux.c 5.9
SCCS-vsn: usr.bin/mail/Makefile 5.6

diff --git a/usr/src/usr.bin/mail/Makefile b/usr/src/usr.bin/mail/Makefile
index 23a19ce..9bb4eaf 100644 (file)
--- a/usr/src/usr.bin/mail/Makefile
+++ b/usr/src/usr.bin/mail/Makefile
@@ -9,17 +9,16 @@
 # software without specific prior written permission. This software
 # is provided ``as is'' without express or implied warranty.
 #
 # software without specific prior written permission. This software
 # is provided ``as is'' without express or implied warranty.
 #

-#      @(#)Makefile    5.5 (Berkeley) %G%
+#      @(#)Makefile    5.6 (Berkeley) %G%

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

-SRCS=  aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c config.c edit.c fio.c \
-       getname.c head.c v7.local.c lex.c list.c main.c names.c optim.c \
-       popen.c quit.c send.c strings.c temp.c tty.c vars.c version.c
-OBJS=  version.o aux.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o config.o \
-       edit.o fio.o getname.o head.o v7.local.o lex.o list.o main.o \
-       names.o optim.o popen.o quit.o send.o strings.o temp.o tty.o \
-       vars.o str.o flsbuf.o
+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 \
+       quit.c send.c strings.c temp.c tty.c vars.c
+OBJS=  version.o aux.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o edit.o fio.o \
+       getname.o head.o v7.local.o lex.o list.o main.o names.o popen.o \
+       quit.o send.o strings.o temp.o tty.o vars.o str.o flsbuf.o

 
 #
 # Special massaging of C files for sharing of strings
 
 #
 # Special massaging of C files for sharing of strings


@@ -88,174 +87,184 @@ aux.o: /usr/include/signal.h /usr/include/machine/trap.h
 aux.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 aux.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 aux.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
 aux.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
 aux.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 aux.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h

-aux.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-aux.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/stat.h
+aux.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+aux.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+aux.o: /usr/include/setjmp.h /usr/include/sys/stat.h

 cmd1.o: cmd1.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 cmd1.o: /usr/include/signal.h /usr/include/machine/trap.h
 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: cmd1.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 cmd1.o: /usr/include/signal.h /usr/include/machine/trap.h
 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: 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: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+cmd1.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+cmd1.o: /usr/include/setjmp.h /usr/include/sys/stat.h /usr/include/sys/wait.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: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 cmd2.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.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: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 cmd2.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h

-cmd2.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-cmd2.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/stat.h
-cmd2.o: /usr/include/sys/wait.h
+cmd2.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+cmd2.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+cmd2.o: /usr/include/setjmp.h /usr/include/sys/stat.h /usr/include/sys/wait.h

 cmd3.o: cmd3.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 cmd3.o: /usr/include/signal.h /usr/include/machine/trap.h
 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: cmd3.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
 cmd3.o: /usr/include/signal.h /usr/include/machine/trap.h
 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: 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: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+cmd3.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+cmd3.o: /usr/include/setjmp.h /usr/include/sys/stat.h /usr/include/sys/wait.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: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 cmdtab.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.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: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 cmdtab.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h

-cmdtab.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-cmdtab.o: local.h v7.local.h
+cmdtab.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+cmdtab.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h

 collect.o: collect.c rcv.h def.h /usr/include/sys/param.h
 collect.o: /usr/include/sys/types.h /usr/include/signal.h
 collect.o: /usr/include/machine/trap.h /usr/include/machine/machparam.h
 collect.o: /usr/include/machine/endian.h /usr/include/sys/signal.h
 collect.o: /usr/include/stdio.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
 collect.o: collect.c rcv.h def.h /usr/include/sys/param.h
 collect.o: /usr/include/sys/types.h /usr/include/signal.h
 collect.o: /usr/include/machine/trap.h /usr/include/machine/machparam.h
 collect.o: /usr/include/machine/endian.h /usr/include/sys/signal.h
 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/ttydefaults.h
+collect.o: /usr/include/sys/ttydev.h /usr/include/ctype.h
+collect.o: /usr/include/strings.h local.h v7.local.h glob.h
+collect.o: /usr/include/setjmp.h /usr/include/sys/stat.h

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

-config.o: config.c configdefs.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: 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: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+edit.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+edit.o: /usr/include/setjmp.h /usr/include/stdio.h /usr/include/sys/stat.h
+edit.o: /usr/include/sys/wait.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: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 fio.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.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: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 fio.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h

-fio.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-fio.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/stat.h
-fio.o: /usr/include/sys/file.h /usr/include/sys/wait.h /usr/include/errno.h
+fio.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+fio.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+fio.o: /usr/include/setjmp.h /usr/include/sys/stat.h /usr/include/sys/file.h
+fio.o: /usr/include/sys/wait.h /usr/include/errno.h

 getname.o: getname.c /usr/include/pwd.h rcv.h def.h /usr/include/sys/param.h
 getname.o: /usr/include/sys/types.h /usr/include/signal.h
 getname.o: /usr/include/machine/trap.h /usr/include/machine/machparam.h
 getname.o: /usr/include/machine/endian.h /usr/include/sys/signal.h
 getname.o: /usr/include/stdio.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
 getname.o: getname.c /usr/include/pwd.h rcv.h def.h /usr/include/sys/param.h
 getname.o: /usr/include/sys/types.h /usr/include/signal.h
 getname.o: /usr/include/machine/trap.h /usr/include/machine/machparam.h
 getname.o: /usr/include/machine/endian.h /usr/include/sys/signal.h
 getname.o: /usr/include/stdio.h /usr/include/sgtty.h /usr/include/sys/ioctl.h

-getname.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-getname.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h
-getname.o: glob.h /usr/include/setjmp.h
+getname.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydefaults.h
+getname.o: /usr/include/sys/ttydev.h /usr/include/ctype.h
+getname.o: /usr/include/strings.h local.h v7.local.h glob.h
+getname.o: /usr/include/setjmp.h

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

-head.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-head.o: local.h v7.local.h glob.h /usr/include/setjmp.h
+head.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+head.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+head.o: /usr/include/setjmp.h

 v7.local.o: v7.local.c rcv.h def.h /usr/include/sys/param.h
 v7.local.o: /usr/include/sys/types.h /usr/include/signal.h
 v7.local.o: /usr/include/machine/trap.h /usr/include/machine/machparam.h
 v7.local.o: /usr/include/machine/endian.h /usr/include/sys/signal.h
 v7.local.o: /usr/include/stdio.h /usr/include/sgtty.h /usr/include/sys/ioctl.h
 v7.local.o: v7.local.c rcv.h def.h /usr/include/sys/param.h
 v7.local.o: /usr/include/sys/types.h /usr/include/signal.h
 v7.local.o: /usr/include/machine/trap.h /usr/include/machine/machparam.h
 v7.local.o: /usr/include/machine/endian.h /usr/include/sys/signal.h
 v7.local.o: /usr/include/stdio.h /usr/include/sgtty.h /usr/include/sys/ioctl.h

-v7.local.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-v7.local.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h
-v7.local.o: glob.h /usr/include/setjmp.h
+v7.local.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydefaults.h
+v7.local.o: /usr/include/sys/ttydev.h /usr/include/ctype.h
+v7.local.o: /usr/include/strings.h local.h v7.local.h glob.h
+v7.local.o: /usr/include/setjmp.h

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

-lex.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-lex.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/stat.h
-lex.o: /usr/include/errno.h
+lex.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+lex.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+lex.o: /usr/include/setjmp.h /usr/include/sys/stat.h /usr/include/errno.h

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

-list.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-list.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/ctype.h
+list.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+list.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+list.o: /usr/include/setjmp.h /usr/include/ctype.h

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

-main.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-main.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/stat.h
+main.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+main.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+main.o: /usr/include/setjmp.h /usr/include/sys/stat.h

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

-names.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-names.o: local.h v7.local.h glob.h /usr/include/setjmp.h
-names.o: /usr/include/sys/wait.h
-optim.o: optim.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
-optim.o: /usr/include/signal.h /usr/include/machine/trap.h
-optim.o: /usr/include/machine/machparam.h /usr/include/machine/endian.h
-optim.o: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
-optim.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h
-optim.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-optim.o: local.h v7.local.h glob.h /usr/include/setjmp.h configdefs.h
-popen.o: popen.c /usr/include/stdio.h /usr/include/sys/signal.h
-popen.o: /usr/include/machine/trap.h /usr/include/sys/types.h
-popen.o: /usr/include/sys/wait.h /usr/include/machine/endian.h
-popen.o: /usr/include/errno.h
+names.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+names.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+names.o: /usr/include/setjmp.h /usr/include/sys/wait.h
+popen.o: popen.c rcv.h def.h /usr/include/sys/param.h /usr/include/sys/types.h
+popen.o: /usr/include/signal.h /usr/include/machine/trap.h
+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/ttydefaults.h /usr/include/sys/ttydev.h
+popen.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+popen.o: /usr/include/setjmp.h /usr/include/stdio.h /usr/include/sys/signal.h
+popen.o: /usr/include/sys/types.h /usr/include/sys/wait.h /usr/include/errno.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: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 quit.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.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: /usr/include/sys/signal.h /usr/include/stdio.h /usr/include/sgtty.h
 quit.o: /usr/include/sys/ioctl.h /usr/include/sys/ttychars.h

-quit.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-quit.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/stat.h
-quit.o: /usr/include/sys/file.h
+quit.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+quit.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+quit.o: /usr/include/setjmp.h /usr/include/sys/stat.h /usr/include/sys/file.h

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

-send.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-send.o: local.h v7.local.h glob.h /usr/include/setjmp.h /usr/include/sys/wait.h
-send.o: /usr/include/sys/stat.h
+send.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+send.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+send.o: /usr/include/setjmp.h /usr/include/sys/wait.h /usr/include/sys/stat.h

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

-strings.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
-strings.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h
-strings.o: glob.h /usr/include/setjmp.h
+strings.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydefaults.h
+strings.o: /usr/include/sys/ttydev.h /usr/include/ctype.h
+strings.o: /usr/include/strings.h local.h v7.local.h glob.h
+strings.o: /usr/include/setjmp.h

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

-temp.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-temp.o: local.h v7.local.h glob.h /usr/include/setjmp.h
+temp.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+temp.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+temp.o: /usr/include/setjmp.h

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

-tty.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-tty.o: local.h v7.local.h glob.h /usr/include/setjmp.h
+tty.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+tty.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+tty.o: /usr/include/setjmp.h

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

-vars.o: /usr/include/sys/ttydev.h /usr/include/ctype.h /usr/include/strings.h
-vars.o: local.h v7.local.h glob.h /usr/include/setjmp.h
+vars.o: /usr/include/sys/ttydefaults.h /usr/include/sys/ttydev.h
+vars.o: /usr/include/ctype.h /usr/include/strings.h local.h v7.local.h glob.h
+vars.o: /usr/include/setjmp.h

 version.o: version.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 version.o: version.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/usr/src/usr.bin/mail/aux.c b/usr/src/usr.bin/mail/aux.c
index 3d1b58f..89d410f 100644 (file)
--- a/usr/src/usr.bin/mail/aux.c
+++ b/usr/src/usr.bin/mail/aux.c
@@ -11,7 +11,7 @@
  */
 
 #ifdef notdef
  */
 
 #ifdef notdef

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

 #endif /* notdef */
 
 #include "rcv.h"
 #endif /* notdef */
 
 #include "rcv.h"


@@ -328,36 +328,20 @@ unstack()
 /*
  * Touch the indicated file.
  * This is nifty for the shell.
 /*
  * Touch the indicated file.
  * This is nifty for the shell.

- * If we have the utime() system call, this is better served
- * by using that, since it will work for empty files.
- * On non-utime systems, we must sleep a second, then read.

  */
 
 alter(name)
        char name[];
 {
  */
 
 alter(name)
        char name[];
 {

-#ifdef UTIME

        struct stat statb;
        long time();
        time_t time_p[2];
        struct stat statb;
        long time();
        time_t time_p[2];

-#else
-       register int pid, f;
-       char w;
-#endif UTIME

 
 

-#ifdef UTIME

        if (stat(name, &statb) < 0)
                return;
        time_p[0] = time((long *) 0) + 1;
        time_p[1] = statb.st_mtime;
        utime(name, time_p);
        if (stat(name, &statb) < 0)
                return;
        time_p[0] = time((long *) 0) + 1;
        time_p[1] = statb.st_mtime;
        utime(name, time_p);

-#else
-       sleep(1);
-       if ((f = open(name, 0)) < 0)
-               return;
-       read(f, &w, 1);
-       exit(0);
-#endif

 }
 
 /*
 }
 
 /*

diff --git a/usr/src/usr.bin/mail/cmd3.c b/usr/src/usr.bin/mail/cmd3.c
index 8da669b..899e6c3 100644 (file)
--- a/usr/src/usr.bin/mail/cmd3.c
+++ b/usr/src/usr.bin/mail/cmd3.c
@@ -11,7 +11,7 @@
  */
 
 #ifdef notdef
  */
 
 #ifdef notdef

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

 #endif /* notdef */
 
 #include "rcv.h"
 #endif /* notdef */
 
 #include "rcv.h"


@@ -244,7 +244,6 @@ _respond(msgvec)
                        strcpy(buf, cp);
        }
        np = elide(extract(buf, GTO));
                        strcpy(buf, cp);
        }
        np = elide(extract(buf, GTO));

-       mapf(np, rcv);

        /*
         * Delete my name from the reply list,
         * and with it, all my alternate names.
        /*
         * Delete my name from the reply list,
         * and with it, all my alternate names.


@@ -278,7 +277,6 @@ _respond(msgvec)
                cp = skin(hfield("cc", mp));
                if (cp != NOSTR) {
                        np = elide(extract(cp, GCC));
                cp = skin(hfield("cc", mp));
                if (cp != NOSTR) {
                        np = elide(extract(cp, GCC));

-                       mapf(np, rcv);

                        np = delname(np, myname, icequal);
                        if (altnames != 0)
                                for (ap = altnames; *ap; ap++)
                        np = delname(np, myname, icequal);
                        if (altnames != 0)
                                for (ap = altnames; *ap; ap++)

diff --git a/usr/src/usr.bin/mail/def.h b/usr/src/usr.bin/mail/def.h
index 9e1fa11..6a6394e 100644 (file)
--- a/usr/src/usr.bin/mail/def.h
+++ b/usr/src/usr.bin/mail/def.h
@@ -9,7 +9,7 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *

- *     @(#)def.h       5.7 (Berkeley) %G%
+ *     @(#)def.h       5.8 (Berkeley) %G%

  */
 
 #include <sys/param.h>         /* includes <sys/types.h> */
  */
 
 #include <sys/param.h>         /* includes <sys/types.h> */


@@ -301,7 +301,6 @@ struct      name    *map();
 struct name    *outof();
 struct name    *put();
 struct name    *usermap();
 struct name    *outof();
 struct name    *put();
 struct name    *usermap();

-struct name    *verify();

 struct var     *lookup();
 long   transmit();
 int    icequal();
 struct var     *lookup();
 long   transmit();
 int    icequal();

diff --git a/usr/src/usr.bin/mail/main.c b/usr/src/usr.bin/mail/main.c
index 7847379..f4b940b 100644 (file)
--- a/usr/src/usr.bin/mail/main.c
+++ b/usr/src/usr.bin/mail/main.c
@@ -17,7 +17,7 @@ char copyright[] =
 #endif /* notdef */
 
 #ifdef notdef
 #endif /* notdef */
 
 #ifdef notdef

-static char sccsid[] = "@(#)main.c     5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.9 (Berkeley) %G%";

 #endif /* notdef */
 
 #include "rcv.h"
 #endif /* notdef */
 
 #include "rcv.h"


@@ -59,9 +59,6 @@ main(argc, argv)
         * all the temporary files, buffer standard output, and so forth.
         */
 
         * all the temporary files, buffer standard output, and so forth.
         */
 

-#ifdef GETHOST
-       inithost();
-#endif GETHOST

        mypid = getpid();
        intty = isatty(0);
        outtty = isatty(1);
        mypid = getpid();
        intty = isatty(0);
        outtty = isatty(1);

diff --git a/usr/src/usr.bin/mail/names.c b/usr/src/usr.bin/mail/names.c
index b848e0f..0a1c7ea 100644 (file)
--- a/usr/src/usr.bin/mail/names.c
+++ b/usr/src/usr.bin/mail/names.c
@@ -11,7 +11,7 @@
  */
 
 #ifdef notdef
  */
 
 #ifdef notdef

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

 #endif /* notdef */
 
 /*
 #endif /* notdef */
 
 /*


@@ -23,6 +23,11 @@ static char sccsid[] = "@(#)names.c  5.6 (Berkeley) %G%";
 #include "rcv.h"
 #include <sys/wait.h>
 
 #include "rcv.h"
 #include <sys/wait.h>
 

+/*
+ * Set of network separator characters.
+ */
+char   *metanet = "!%@";
+

 /*
  * Allocate a single element of a name list,
  * initialize its name field to the passed
 /*
  * Allocate a single element of a name list,
  * initialize its name field to the passed


@@ -192,64 +197,6 @@ yankword(ap, wbuf)
        return(cp);
 }
 
        return(cp);
 }
 

-/*
- * Verify that all the users in the list of names are
- * legitimate.  Bitch about and delink those who aren't.
- */
-
-struct name *
-verify(names)
-       struct name *names;
-{
-#ifdef SENDMAIL
-
-       return(names);
-#else
-       register struct name *np, *top, *t, *x;
-       register char *cp;
-
-       top = names;
-       np = names;
-       while (np != NIL) {
-               if (np->n_type & GDEL) {
-                       np = np->n_flink;
-                       continue;
-               }
-               for (cp = "!:@^"; *cp; cp++)
-                       if (any(*cp, np->n_name))
-                               break;
-               if (*cp != 0) {
-                       np = np->n_flink;
-                       continue;
-               }
-               cp = np->n_name;
-               while (*cp == '\\')
-                       cp++;
-               if (equal(cp, "msgs") ||
-                   getuserid(cp) != -1) {
-                       np = np->n_flink;
-                       continue;
-               }
-               fprintf(stderr, "Can't send to %s\n", np->n_name);
-               senderr++;
-               if (np == top) {
-                       top = np->n_flink;
-                       if (top != NIL)
-                               top->n_blink = NIL;
-                       np = top;
-                       continue;
-               }
-               x = np->n_blink;
-               t = np->n_flink;
-               x->n_flink = t;
-               if (t != NIL)
-                       t->n_blink = x;
-               np = t;
-       }
-       return(top);
-#endif
-}
-

 /*
  * For each recipient in the passed name list with a /
  * in the name, append the message to the end of the named file
 /*
  * For each recipient in the passed name list with a /
  * in the name, append the message to the end of the named file


@@ -419,7 +366,6 @@ isfileaddr(name)
        char *name;
 {
        register char *cp;
        char *name;
 {
        register char *cp;

-       extern char *metanet;

 
        if (any('@', name))
                return(0);
 
        if (any('@', name))
                return(0);


@@ -588,7 +534,6 @@ unpack(np)
        extra = 2;
        if (rflag != NOSTR)
                extra += 2;
        extra = 2;
        if (rflag != NOSTR)
                extra += 2;

-#ifdef SENDMAIL

        extra++;
        metoo = value("metoo") != NOSTR;
        if (metoo)
        extra++;
        metoo = value("metoo") != NOSTR;
        if (metoo)


@@ -596,7 +541,6 @@ unpack(np)
        verbose = value("verbose") != NOSTR;
        if (verbose)
                extra++;
        verbose = value("verbose") != NOSTR;
        if (verbose)
                extra++;

-#endif SENDMAIL

        if (hflag)
                extra += 2;
        top = (char **) salloc((t + extra) * sizeof *top);
        if (hflag)
                extra += 2;
        top = (char **) salloc((t + extra) * sizeof *top);


@@ -606,13 +550,11 @@ unpack(np)
                *ap++ = "-r";
                *ap++ = rflag;
        }
                *ap++ = "-r";
                *ap++ = rflag;
        }

-#ifdef SENDMAIL

        *ap++ = "-i";
        if (metoo)
                *ap++ = "-m";
        if (verbose)
                *ap++ = "-v";
        *ap++ = "-i";
        if (metoo)
                *ap++ = "-m";
        if (verbose)
                *ap++ = "-v";

-#endif SENDMAIL

        if (hflag) {
                *ap++ = "-h";
                *ap++ = savestr(sprintf(hbuf, "%d", hflag));
        if (hflag) {
                *ap++ = "-h";
                *ap++ = savestr(sprintf(hbuf, "%d", hflag));


@@ -828,21 +770,6 @@ delname(np, name, cmpfun)
        return(np);
 }
 
        return(np);
 }
 

-/*
- * Call the given routine on each element of the name
- * list, replacing said value if need be.
- */
-
-mapf(np, from)
-       register struct name *np;
-       char *from;
-{
-       register struct name *p;
-
-       for (p = np; p != NIL; p = p->n_flink)
-               p->n_name = netmap(p->n_name, from);
-}
-

 /*
  * Pretty print a name list
  * Uncomment it if you need it.
 /*
  * Pretty print a name list
  * Uncomment it if you need it.

diff --git a/usr/src/usr.bin/mail/pathnames.h b/usr/src/usr.bin/mail/pathnames.h
index e92e7e3..9889741 100644 (file)
--- a/usr/src/usr.bin/mail/pathnames.h
+++ b/usr/src/usr.bin/mail/pathnames.h
@@ -9,7 +9,7 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  *

- *     @(#)pathnames.h 5.4 (Berkeley) %G%
+ *     @(#)pathnames.h 5.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -18,14 +18,6 @@
  * Vax/Unix version 7.
  */
 
  * Vax/Unix version 7.
  */
 

-#define        GETHOST                         /* System has gethostname syscall */
-#ifdef GETHOST
-#define        LOCAL           EMPTYID         /* Dynamically determined local host */
-#else
-#define        LOCAL           'j'             /* Local host id */
-#endif GETHOST
-
-#define        MAIL            "/bin/mail"     /* Name of mail sender */

 #define SENDMAIL       "/usr/lib/sendmail"
                                        /* Name of classy mail deliverer */
 #define        EDITOR          "/usr/ucb/ex"   /* Name of text editor */
 #define SENDMAIL       "/usr/lib/sendmail"
                                        /* Name of classy mail deliverer */
 #define        EDITOR          "/usr/ucb/ex"   /* Name of text editor */


@@ -35,10 +27,8 @@
 #define        HELPFILE        "/usr/lib/Mail.help"
                                        /* Name of casual help file */
 #define        THELPFILE       "/usr/lib/Mail.tildehelp"
 #define        HELPFILE        "/usr/lib/Mail.help"
                                        /* Name of casual help file */
 #define        THELPFILE       "/usr/lib/Mail.tildehelp"

+                                       /* Name of casual tilde help */

 #define        POSTAGE         "/usr/adm/maillog"
                                        /* Where to audit mail sending */
 #define        POSTAGE         "/usr/adm/maillog"
                                        /* Where to audit mail sending */

-                                       /* Name of casual tilde help */

 #define        MASTER          "/usr/lib/Mail.rc"
 #define        APPEND                          /* New mail goes to end of mailbox */
 #define        MASTER          "/usr/lib/Mail.rc"
 #define        APPEND                          /* New mail goes to end of mailbox */

-#define CANLOCK                                /* Locking protocol actually works */
-#define        UTIME                           /* System implements utime(2) */

diff --git a/usr/src/usr.bin/mail/quit.c b/usr/src/usr.bin/mail/quit.c
index 959de52..ca9033f 100644 (file)
--- a/usr/src/usr.bin/mail/quit.c
+++ b/usr/src/usr.bin/mail/quit.c
@@ -11,7 +11,7 @@
  */
 
 #ifdef notdef
  */
 
 #ifdef notdef

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

 #endif /* notdef */
 
 #include "rcv.h"
 #endif /* notdef */
 
 #include "rcv.h"


@@ -55,22 +55,12 @@ quit()
         * Delete all untouched messages to keep them out of mbox.
         * If all the messages are to be preserved, just exit with
         * a message.
         * Delete all untouched messages to keep them out of mbox.
         * If all the messages are to be preserved, just exit with
         * a message.

-        *
-        * If the luser has sent mail to himself, refuse to do
-        * anything with the mailbox, unless mail locking works.

         */
 
        fbuf = fopen(mailname, "r");
        if (fbuf == NULL)
                goto newmail;
        flock(fileno(fbuf), LOCK_EX);
         */
 
        fbuf = fopen(mailname, "r");
        if (fbuf == NULL)
                goto newmail;
        flock(fileno(fbuf), LOCK_EX);

-#ifndef CANLOCK
-       if (selfsent) {
-               printf("You have new mail.\n");
-               fclose(fbuf);
-               return;
-       }
-#endif

        rbuf = NULL;
        if (fstat(fileno(fbuf), &minfo) >= 0 && minfo.st_size > mailsize) {
                printf("New mail has arrived.\n");
        rbuf = NULL;
        if (fstat(fileno(fbuf), &minfo) >= 0 && minfo.st_size > mailsize) {
                printf("New mail has arrived.\n");

diff --git a/usr/src/usr.bin/mail/send.c b/usr/src/usr.bin/mail/send.c
index 2fc9b3b..431f82a 100644 (file)
--- a/usr/src/usr.bin/mail/send.c
+++ b/usr/src/usr.bin/mail/send.c
@@ -11,7 +11,7 @@
  */
 
 #ifdef notdef
  */
 
 #ifdef notdef

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

 #endif /* notdef */
 
 #include "rcv.h"
 #endif /* notdef */
 
 #include "rcv.h"


@@ -279,7 +279,6 @@ mail1(hp)
 
        to = outof(to, mtf, hp);
        rewind(mtf);
 
        to = outof(to, mtf, hp);
        rewind(mtf);

-       to = verify(to);

        if (senderr && !remote) {
 topdog:
 
        if (senderr && !remote) {
 topdog:
 


@@ -363,13 +362,10 @@ topdog:
                (void) dup(fileno(mtf));
                for (i = getdtablesize(); --i > 2;)
                        (void) close(i);
                (void) dup(fileno(mtf));
                for (i = getdtablesize(); --i > 2;)
                        (void) close(i);

-#ifdef SENDMAIL

                if ((deliver = value("sendmail")) == NOSTR)
                        deliver = SENDMAIL;
                execv(deliver, namelist);
                if ((deliver = value("sendmail")) == NOSTR)
                        deliver = SENDMAIL;
                execv(deliver, namelist);

-#endif SENDMAIL
-               execv(MAIL, namelist);
-               perror(MAIL);
+               perror(deliver);

                exit(1);
        }
 
                exit(1);
        }
 

diff --git a/usr/src/usr.bin/mail/strings.c b/usr/src/usr.bin/mail/strings.c
index bb7b429..8f6bf7d 100644 (file)
--- a/usr/src/usr.bin/mail/strings.c
+++ b/usr/src/usr.bin/mail/strings.c
@@ -11,7 +11,7 @@
  */
 
 #ifdef notdef
  */
 
 #ifdef notdef

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

 #endif /* notdef */
 
 /*
 #endif /* notdef */
 
 /*


@@ -83,7 +83,6 @@ sreset()
 
        if (noreset)
                return;
 
        if (noreset)
                return;

-       minit();

        index = 0;
        for (sp = &stringdope[0]; sp < &stringdope[NSPACE]; sp++) {
                if (sp->s_topFree == NOSTR)
        index = 0;
        for (sp = &stringdope[0]; sp < &stringdope[NSPACE]; sp++) {
                if (sp->s_topFree == NOSTR)