diff options
Diffstat (limited to 'net/sup')
| -rw-r--r-- | net/sup/Makefile | 4 | ||||
| -rw-r--r-- | net/sup/files/patch-aa | 59 |
2 files changed, 28 insertions, 35 deletions
diff --git a/net/sup/Makefile b/net/sup/Makefile index a7d4774bcc27..768e519f8a8a 100644 --- a/net/sup/Makefile +++ b/net/sup/Makefile @@ -3,7 +3,7 @@ # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.9 1996/11/18 14:09:10 asami Exp $ +# $Id: Makefile,v 1.10 1997/04/30 03:18:07 asami Exp $ # DISTNAME= sup @@ -11,8 +11,6 @@ PKGNAME= sup-2.0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} -MAINTAINER= gibbs@FreeBSD.org - MAN1= sup.1 MAN8= supservers.8 diff --git a/net/sup/files/patch-aa b/net/sup/files/patch-aa index 458c795b5ec2..751e69ba0188 100644 --- a/net/sup/files/patch-aa +++ b/net/sup/files/patch-aa @@ -735,15 +735,16 @@ diff -c /var/tmp/sup/scm.c sup/scm.c } #if __STDC__ -! int scmerr (int errno,FILE *filedes,char *fmt,...) +! int scmerr (int eno,FILE *filedes,char *fmt,...) #else /*VARARGS*//*ARGSUSED*/ int scmerr (va_alist) *************** -*** 544,558 **** +*** 543,569 **** + #endif { #if !__STDC__ - int errno; +! int errno; char *fmt; #endif va_list ap; @@ -756,11 +757,23 @@ diff -c /var/tmp/sup/scm.c sup/scm.c #if __STDC__ va_start(ap,fmt); #else ---- 546,561 ---- + va_start(ap); +! errno = va_arg(ap,int); + fmt = va_arg(ap,char *); + #endif + vfprintf(stderr, fmt, ap); + va_end(ap); +! if (errno >= 0) +! fprintf (stderr,": %s\n",errmsg(errno)); + else + fprintf (stderr,"\n"); + (void) fflush (stderr); +--- 545,572 ---- + #endif { #if !__STDC__ - int errno; -+ FILE *filedes; +! int eno; +! FILE *filedes; char *fmt; #endif va_list ap; @@ -773,35 +786,17 @@ diff -c /var/tmp/sup/scm.c sup/scm.c #if __STDC__ va_start(ap,fmt); #else -*************** -*** 560,572 **** - errno = va_arg(ap,int); - fmt = va_arg(ap,char *); - #endif -! vfprintf(stderr, fmt, ap); - va_end(ap); - if (errno >= 0) -! fprintf (stderr,": %s\n",errmsg(errno)); - else -! fprintf (stderr,"\n"); -! (void) fflush (stderr); - return (SCMERR); - } - ---- 563,575 ---- - errno = va_arg(ap,int); + va_start(ap); +! eno = va_arg(ap,int); fmt = va_arg(ap,char *); #endif -! vfprintf(filedes, fmt, ap); + vfprintf(stderr, fmt, ap); va_end(ap); - if (errno >= 0) -! fprintf (filedes,": %s\n",errmsg(errno)); +! if (eno >= 0) +! fprintf (stderr,": %s\n",errmsg(eno)); else -! fprintf (filedes,"\n"); -! (void) fflush (filedes); - return (SCMERR); - } - + fprintf (stderr,"\n"); + (void) fflush (stderr); diff -c /var/tmp/sup/scmio.c sup/scmio.c *** scmio.c Fri Aug 20 17:46:33 1993 --- sup/scmio.c Sun Aug 13 19:12:45 1995 @@ -2837,7 +2832,7 @@ diff -c /var/tmp/sup/vprintf.c sup/vprintf.c + * SUCH DAMAGE. + * + * from: "@(#)daemon.c 5.3 (Berkeley) 12/28/90 -+ * $Id: daemon.c,v 1.3 1994/02/23 09:56:41 rgrimes Exp $ ++ * $Id: patch-aa,v 1.2 1995/08/14 08:57:27 gibbs Exp $ + */ + + #if defined(LIBC_SCCS) && !defined(lint) |