header file cleanup; primarily #include <unistd.h> in sendmail.h

and delete duplicate cruft

SCCS-vsn: usr.sbin/sendmail/src/recipient.c 6.20
SCCS-vsn: usr.sbin/sendmail/src/main.c 6.31
SCCS-vsn: usr.sbin/sendmail/src/envelope.c 6.17
SCCS-vsn: usr.sbin/sendmail/src/arpadate.c 6.8
SCCS-vsn: usr.sbin/sendmail/src/savemail.c 6.17
SCCS-vsn: usr.sbin/sendmail/src/clock.c 6.3
SCCS-vsn: usr.sbin/sendmail/src/util.c 6.10
SCCS-vsn: usr.sbin/sendmail/src/readcf.c 6.15
SCCS-vsn: usr.sbin/sendmail/src/conf.c 6.30
SCCS-vsn: usr.sbin/sendmail/src/alias.c 6.20

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index 8838e48..517d956 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -6,11 +6,10 @@
  * %sccs.include.redist.c%
  */
 
  * %sccs.include.redist.c%
  */
 

-# include <sys/types.h>
+# include "sendmail.h"

 # include <sys/stat.h>
 # include <sys/file.h>
 # include <signal.h>
 # include <sys/stat.h>
 # include <sys/file.h>
 # include <signal.h>

-# include "sendmail.h"

 # include <fcntl.h>
 # include <pwd.h>
 
 # include <fcntl.h>
 # include <pwd.h>
 


@@ -29,15 +28,15 @@ ERROR: DBM is no longer supported -- use NDBM instead.
 #ifndef lint
 #ifdef NEWDB
 #ifdef NDBM
 #ifndef lint
 #ifdef NEWDB
 #ifdef NDBM

-static char sccsid[] = "@(#)alias.c    6.19 (Berkeley) %G% (with NEWDB and NDBM)";
+static char sccsid[] = "@(#)alias.c    6.20 (Berkeley) %G% (with NEWDB and NDBM)";

 #else
 #else

-static char sccsid[] = "@(#)alias.c    6.19 (Berkeley) %G% (with NEWDB)";
+static char sccsid[] = "@(#)alias.c    6.20 (Berkeley) %G% (with NEWDB)";

 #endif
 #else
 #ifdef NDBM
 #endif
 #else
 #ifdef NDBM

-static char sccsid[] = "@(#)alias.c    6.19 (Berkeley) %G% (with NDBM)";
+static char sccsid[] = "@(#)alias.c    6.20 (Berkeley) %G% (with NDBM)";

 #else
 #else

-static char sccsid[] = "@(#)alias.c    6.19 (Berkeley) %G% (without NEWDB or NDBM)";
+static char sccsid[] = "@(#)alias.c    6.20 (Berkeley) %G% (without NEWDB or NDBM)";

 #endif
 #endif
 #endif /* not lint */
 #endif
 #endif
 #endif /* not lint */

diff --git a/usr/src/usr.sbin/sendmail/src/arpadate.c b/usr/src/usr.sbin/sendmail/src/arpadate.c
index b967882..5a783ab 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/arpadate.c
+++ b/usr/src/usr.sbin/sendmail/src/arpadate.c
@@ -7,11 +7,10 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)arpadate.c 6.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)arpadate.c 6.8 (Berkeley) %G%";

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

-# include <sys/types.h>

 
 /*
 **  ARPADATE -- Create date in ARPANET format
 
 /*
 **  ARPADATE -- Create date in ARPANET format

diff --git a/usr/src/usr.sbin/sendmail/src/clock.c b/usr/src/usr.sbin/sendmail/src/clock.c
index eb80343..dba90cb 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/clock.c
+++ b/usr/src/usr.sbin/sendmail/src/clock.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)clock.c    6.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)clock.c    6.3 (Berkeley) %G%";

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


@@ -205,6 +205,7 @@ tick()
 
 static bool    SleepDone;
 
 
 static bool    SleepDone;
 

+unsigned int

 sleep(intvl)
        unsigned int intvl;
 {
 sleep(intvl)
        unsigned int intvl;
 {

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index 4215ad4..6c9d3ea 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)conf.c     6.29 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     6.30 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <sys/ioctl.h>
 #endif /* not lint */
 
 # include <sys/ioctl.h>


@@ -1037,7 +1037,6 @@ initgroups(name, basegid)
 #endif
 
 #if defined(HASUSTAT)
 #endif
 
 #if defined(HASUSTAT)

-# include <sys/types.h>

 # include <sys/stat.h>
 # include <ustat.h>
 #endif
 # include <sys/stat.h>
 # include <ustat.h>
 #endif

diff --git a/usr/src/usr.sbin/sendmail/src/envelope.c b/usr/src/usr.sbin/sendmail/src/envelope.c
index d4386a5..9b3fbaf 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/envelope.c
+++ b/usr/src/usr.sbin/sendmail/src/envelope.c
@@ -7,15 +7,14 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)envelope.c 6.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)envelope.c 6.17 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-#include <sys/types.h>
+#include "sendmail.h"

 #include <sys/time.h>
 #include <sys/stat.h>
 #include <pwd.h>
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <pwd.h>
 #include <fcntl.h>

-#include "sendmail.h"

 
 /*
 **  NEWENVELOPE -- allocate a new envelope
 
 /*
 **  NEWENVELOPE -- allocate a new envelope

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 8fef889..6330105 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -13,12 +13,11 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

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

 #endif /* not lint */
 
 #define        _DEFINE
 
 #endif /* not lint */
 
 #define        _DEFINE
 

-#include <unistd.h>

 #include <fcntl.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <signal.h>

diff --git a/usr/src/usr.sbin/sendmail/src/readcf.c b/usr/src/usr.sbin/sendmail/src/readcf.c
index b963233..a783a87 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/readcf.c
+++ b/usr/src/usr.sbin/sendmail/src/readcf.c
@@ -7,12 +7,11 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)readcf.c   6.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)readcf.c   6.15 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 # include <sys/stat.h>
 #endif /* not lint */
 
 # include "sendmail.h"
 # include <sys/stat.h>

-# include <unistd.h>

 #ifdef NAMED_BIND
 # include <arpa/nameser.h>
 # include <resolv.h>
 #ifdef NAMED_BIND
 # include <arpa/nameser.h>
 # include <resolv.h>

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 837387d..f731806 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -7,14 +7,13 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)recipient.c        6.19 (Berkeley) %G%";
+static char sccsid[] = "@(#)recipient.c        6.20 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-# include <sys/types.h>
+# include "sendmail.h"

 # include <sys/stat.h>
 # include <fcntl.h>
 # include <pwd.h>
 # include <sys/stat.h>
 # include <fcntl.h>
 # include <pwd.h>

-# include "sendmail.h"

 
 /*
 **  SENDTOLIST -- Designate a send list.
 
 /*
 **  SENDTOLIST -- Designate a send list.

diff --git a/usr/src/usr.sbin/sendmail/src/savemail.c b/usr/src/usr.sbin/sendmail/src/savemail.c
index e0c3260..56e1187 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/savemail.c
+++ b/usr/src/usr.sbin/sendmail/src/savemail.c
@@ -7,10 +7,9 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)savemail.c 6.16 (Berkeley) %G%";
+static char sccsid[] = "@(#)savemail.c 6.17 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-# include <sys/types.h>

 # include <pwd.h>
 # include "sendmail.h"
 
 # include <pwd.h>
 # include "sendmail.h"
 

diff --git a/usr/src/usr.sbin/sendmail/src/util.c b/usr/src/usr.sbin/sendmail/src/util.c
index 4ad7a66..50717a4 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/util.c
+++ b/usr/src/usr.sbin/sendmail/src/util.c
@@ -7,16 +7,12 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)util.c     6.9 (Berkeley) %G%";
+static char sccsid[] = "@(#)util.c     6.10 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

-# include <stdio.h>
-# include <pwd.h>
-# include <sys/types.h>
+# include "sendmail.h"

 # include <sys/stat.h>
 # include <sysexits.h>
 # include <sys/stat.h>
 # include <sysexits.h>

-# include <errno.h>
-# include "sendmail.h"

 # include "conf.h"
 \f/*
 **  STRIPQUOTES -- Strip quotes & quote bits from a string.
 # include "conf.h"
 \f/*
 **  STRIPQUOTES -- Strip quotes & quote bits from a string.