4.4BSD snapshot (revision 8.1); add 1993 to copyright

[unix-history] / usr / src / usr.bin / mail / def.h

diff --git a/usr/src/usr.bin/mail/def.h b/usr/src/usr.bin/mail/def.h
index 65f6252..758ae71 100644 (file)
--- a/usr/src/usr.bin/mail/def.h
+++ b/usr/src/usr.bin/mail/def.h
@@ -1,36 +1,32 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)def.h       5.18 (Berkeley) %G%
+ *     @(#)def.h       8.1 (Berkeley) %G%

  */
 
  */
 

-#include <sys/param.h>         /* includes <sys/types.h> */
-#include <sys/signal.h>
-#include <stdio.h>
-#include <sgtty.h>
-#include <ctype.h>
-#include <strings.h>
-#include "local.h"
-

 /*
  * Mail -- a mail program
  *
  * Author: Kurt Shoens (UCB) March 25, 1978
  */
 
 /*
  * Mail -- a mail program
  *
  * Author: Kurt Shoens (UCB) March 25, 1978
  */
 

+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+#include <signal.h>
+#include <sgtty.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string.h>
+#include "pathnames.h"
+
+#define        APPEND                          /* New mail goes to end of mailbox */

 
 #define        ESCAPE          '~'             /* Default escape for sending */
 #define        NMLSIZE         1024            /* max names in a message list */
 
 #define        ESCAPE          '~'             /* Default escape for sending */
 #define        NMLSIZE         1024            /* max names in a message list */


@@ -80,7 +76,6 @@ struct message {
  * The actual table is declared and initialized
  * in lex.c
  */
  * The actual table is declared and initialized
  * in lex.c
  */

-

 struct cmd {
        char    *c_name;                /* Name of command */
        int     (*c_func)();            /* Implementor of the command */
 struct cmd {
        char    *c_name;                /* Name of command */
        int     (*c_func)();            /* Implementor of the command */


@@ -250,56 +245,3 @@ struct ignoretab {
  * for read/write.
  */
 #define trunc(stream)  ftruncate(fileno(stream), (long) ftell(stream))
  * for read/write.
  */
 #define trunc(stream)  ftruncate(fileno(stream), (long) ftell(stream))

-
-/*
- * Forward declarations of routine types to keep lint and cc happy.
- */
-
-FILE   *Fdopen();
-FILE   *Popen();
-FILE   *collect();
-FILE   *infix();
-FILE   *run_editor();
-FILE   *setinput();
-char   **unpack();
-char   *calloc();
-char   *copy();
-char   *copyin();
-char   *detract();
-char   *expand();
-char   *getdeadletter();
-char   *gets();
-char   *hfield();
-char   *name1();
-char   *nameof();
-char   *nextword();
-char   *getenv();
-char   *getname();
-char   *fgets();
-char   *ishfield();
-char   *malloc();
-char   *mktemp();
-char   *readtty();
-char   *reedit();
-char   *salloc();
-char   *savestr();
-char   *skin();
-char   *snarf();
-char   *username();
-char   *value();
-char   *vcopy();
-char   *yankword();
-off_t  fsize();
-uid_t  getuid();
-struct cmd     *lex();
-struct grouphead       *findgroup();
-struct name    *nalloc();
-struct name    *cat();
-struct name    *delname();
-struct name    *elide();
-struct name    *extract();
-struct name    *gexpand();
-struct name    *outof();
-struct name    *put();
-struct name    *usermap();
-struct var     *lookup();