From 25e2468c3c4edc1b022c62b7ec1141f360729bed Mon Sep 17 00:00:00 2001 From: Eric Allman Date: Tue, 17 May 1994 15:10:50 -0800 Subject: [PATCH] portability for System V Release 4 SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.90 SCCS-vsn: usr.sbin/sendmail/src/conf.h 8.106 --- usr/src/usr.sbin/sendmail/src/conf.c | 13 ++++++++++--- usr/src/usr.sbin/sendmail/src/conf.h | 5 ++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c index 80c54a6149..f792fe1883 100644 --- a/usr/src/usr.sbin/sendmail/src/conf.c +++ b/usr/src/usr.sbin/sendmail/src/conf.c @@ -7,7 +7,7 @@ */ #ifndef lint -static char sccsid[] = "@(#)conf.c 8.89 (Berkeley) %G%"; +static char sccsid[] = "@(#)conf.c 8.90 (Berkeley) %G%"; #endif /* not lint */ # include "sendmail.h" @@ -523,6 +523,9 @@ setsignal(sig, handler) bzero(&n, sizeof n); n.sa_handler = handler; +# ifdef SA_RESTART + n.sa_flags = SA_RESTART; +# endif if (sigaction(sig, &n, &o) < 0) return SIG_ERR; return o.sa_handler; @@ -1650,10 +1653,14 @@ freespace(dir, bsize) # if SFS_TYPE == SFS_4ARGS if (statfs(dir, &fs, sizeof fs, 0) == 0) # else -# if defined(ultrix) - if (statfs(dir, &fs) > 0) +# if SFS_TYPE == SFS_STATVFS + if (statvfs(dir, &fs) == 0) # else +# if defined(ultrix) + if (statfs(dir, &fs) > 0) +# else if (statfs(dir, &fs) == 0) +# endif # endif # endif # endif diff --git a/usr/src/usr.sbin/sendmail/src/conf.h b/usr/src/usr.sbin/sendmail/src/conf.h index e90e27f808..0d3be85da4 100644 --- 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% * - * @(#)conf.h 8.105 (Berkeley) %G% + * @(#)conf.h 8.106 (Berkeley) %G% */ /* @@ -909,6 +909,9 @@ typedef int pid_t; # ifndef SYSLOG_BUFSIZE # define SYSLOG_BUFSIZE 128 # endif +# ifndef SFS_TYPE +# define SFS_TYPE SFS_STATVFS +# endif #endif /* general System V defines */ -- 2.20.1