Solaris portability changes

SCCS-vsn: usr.sbin/sendmail/src/conf.h 6.33
SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 6.58
SCCS-vsn: usr.sbin/sendmail/src/collect.c 6.18
SCCS-vsn: usr.sbin/sendmail/src/alias.c 6.50

diff --git a/usr/src/usr.sbin/sendmail/src/alias.c b/usr/src/usr.sbin/sendmail/src/alias.c
index f87d755..2582d79 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/alias.c
+++ b/usr/src/usr.sbin/sendmail/src/alias.c
@@ -11,7 +11,7 @@
 # include <pwd.h>
 
 #ifndef lint
 # include <pwd.h>
 
 #ifndef lint

-static char sccsid[] = "@(#)alias.c    6.49 (Berkeley) %G%";
+static char sccsid[] = "@(#)alias.c    6.50 (Berkeley) %G%";

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


@@ -191,7 +191,7 @@ setalias(spec)
        {
                while (isspace(*p))
                        p++;
        {
                while (isspace(*p))
                        p++;

-               if (*p == NULL)
+               if (*p == '\0')

                        break;
                spec = p;
 
                        break;
                spec = p;
 

diff --git a/usr/src/usr.sbin/sendmail/src/collect.c b/usr/src/usr.sbin/sendmail/src/collect.c
index e3f0065..31484dc 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/collect.c
+++ b/usr/src/usr.sbin/sendmail/src/collect.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

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


@@ -441,7 +441,7 @@ eatfrom(fm, e)
                        break;
        }
 
                        break;
        }
 

-       if (*p != NULL)
+       if (*p != '\0')

        {
                char *q;
                extern char *arpadate();
        {
                char *q;
                extern char *arpadate();

diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h
index 756a64e..08d99e6 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.h
+++ b/usr/src/usr.sbin/sendmail/src/conf.h
@@ -5,7 +5,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)conf.h      6.32 (Berkeley) %G%
+ *     @(#)conf.h      6.33 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -95,7 +95,7 @@
 # define HASUNAME      1       /* use System V uname system call */
 # endif
 
 # define HASUNAME      1       /* use System V uname system call */
 # endif
 

-#if defined(sun) && !defined(BSD)
+#if defined(sun) && !defined(BSD) && !defined(SOLARIS)

 # include <vfork.h>
 #endif
 
 # include <vfork.h>
 #endif
 

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

-static char sccsid[] = "@(#)parseaddr.c        6.57 (Berkeley) %G%";
+static char sccsid[] = "@(#)parseaddr.c        6.58 (Berkeley) %G%";

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


@@ -955,7 +955,7 @@ _rewrite(pvp, ruleset)
 
                                if (ap == NULL)
                                        break;
 
                                if (ap == NULL)
                                        break;

-                               while (*ap != NULL)
+                               while (*ap != '\0')

                                {
                                        if (*avp == NULL ||
                                            strncasecmp(ap, *avp, strlen(*avp)) != 0)
                                {
                                        if (*avp == NULL ||
                                            strncasecmp(ap, *avp, strlen(*avp)) != 0)