Update to SR-2.3.3.

15 files changed, 6 insertions, 558 deletions

diff --git a/lang/sr/Makefile b/lang/sr/Makefile
index 8dd26002c91..7bfff9fd8d9 100644
--- a/lang/sr/Makefile
+++ b/lang/sr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/02/26 18:48:19 is Exp $
+# $NetBSD: Makefile,v 1.4 2005/02/26 22:28:38 is Exp $
 #
 
-DISTNAME=		sr232
-PKGNAME=		sr-2.3.2
+DISTNAME=		sr233
+PKGNAME=		sr-2.3.3
 CATEGORIES=		lang parallel
 MASTER_SITES=		ftp://ftp.cs.arizona.edu/sr/
 EXTRACT_SUFX=		.tar.Z
diff --git a/lang/sr/distinfo b/lang/sr/distinfo
index 5d9b4e7350f..3facea9e288 100644
--- a/lang/sr/distinfo
+++ b/lang/sr/distinfo
@@ -1,24 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/02/26 18:48:19 is Exp $
+$NetBSD: distinfo,v 1.4 2005/02/26 22:28:38 is Exp $
 
-SHA1 (sr232.tar.Z) = 76278a750d900f1d5f6b2fedaa21ad26f93fc72e
-Size (sr232.tar.Z) = 1453739 bytes
+SHA1 (sr233.tar.Z) = 0354987527ed1e84c32d3b1fc6bacb65d647f337
+Size (sr233.tar.Z) = 1424566 bytes
 SHA1 (patch-aa) = 25100667c8a9a48d828253ecba12125d5a7a62aa
 SHA1 (patch-ab) = 3d12695fe38cdc372352279738f593e74599c00d
 SHA1 (patch-ac) = f412be8e1a2bbdf8249d5f1585805fab447a518a
 SHA1 (patch-ad) = 7fc00d7f52a16dc7b814c94c795bb5d7af02e58b
-SHA1 (patch-ae) = 7dadae84f42f16a9448c320fd36c424253fe5aca
-SHA1 (patch-af) = e77f75e3d3e5baeb225ba1b3a1dd2b1d662ef16c
-SHA1 (patch-ag) = 851c7156109d22e30a56f20b70211a016c585b06
-SHA1 (patch-ah) = 66c956161f7a0d1b61e7a887a6ab44d17b398f5e
-SHA1 (patch-ai) = e635785b56e29b1a09ee2b1342b414ef50208fe6
-SHA1 (patch-aj) = 4e1939ce234f4b97748d170b1909e588f6dfc793
-SHA1 (patch-ak) = 9b5093037803782a4eb76362cb14fa6c6cd33630
-SHA1 (patch-al) = cd2928fd5a42d2aba1c103313a7849a52fb988fe
-SHA1 (patch-am) = d5f53666744d8bb2c2fbca8cfe6abebb753367e1
-SHA1 (patch-an) = 7358faf62d8bd82f92bc650bf0a8deaeb7df16ac
-SHA1 (patch-ao) = edb6eaa0d9e7f6adbc9749f0ac5589410a116855
-SHA1 (patch-ap) = c61cb7d239ad08317179fb85c7829736366556f3
-SHA1 (patch-aq) = 364d860fa9ff0019934a6cc43b70f93abffaba24
 SHA1 (patch-ar) = 9a331cdb90959d0cc7475d2fc203d2c302d4bf5c
 SHA1 (patch-as) = 6e959d3d151499dabdc9e9ee056d5f8187d83074
 SHA1 (patch-at) = e66f57026322ff22db9bd7be3dfbaccfb466ccc1
diff --git a/lang/sr/patches/patch-ae b/lang/sr/patches/patch-ae
deleted file mode 100644
index fbf9c52f7cd..00000000000
--- a/lang/sr/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/alloc.c.orig	1999-07-28 22:42:24.000000000 +0200
-+++ rts/alloc.c
-@@ -5,7 +5,6 @@
-  */
- 
- #include "rts.h"
--#include <varargs.h>
- 
- static Memh all_mem;	/* header blocks for SR allocated memory */
- static Mutex mem_mutex;	/* protection for all_mem; acquired after res->rmutex.*/
diff --git a/lang/sr/patches/patch-af b/lang/sr/patches/patch-af
deleted file mode 100644
index aab0869a99a..00000000000
--- a/lang/sr/patches/patch-af
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/array.c.orig	1999-07-28 23:08:48.000000000 +0200
-+++ rts/array.c
-@@ -1,7 +1,7 @@
- /*  array.c -- runtime support of arrays  */
- 
- #include "rts.h"
--#include <varargs.h>
-+#include <stdarg.h>
- 
- 
- static void slices ();
-@@ -22,11 +22,9 @@ static void slices ();
-  */
- /*VARARGS*/
- Array *
--sr_init_array (va_alist)
--va_dcl
-+sr_init_array (char *locn, ...)
- {
-     va_list ap;
--    char *locn;
-     int ndim, elemsize, alcsize, i, n;
-     Array *addr;
-     Dim *d;
-@@ -39,8 +37,7 @@ va_dcl
-     /*
-      *  Calculate the size of each dimension.
-      */
--    va_start (ap);
--    locn = va_arg (ap, char *);
-+    va_start (ap, locn);
-     addr = va_arg (ap, Array *);
-     elemsize = va_arg (ap, int);
-     initvalue = va_arg (ap, Ptr);
-@@ -251,11 +248,9 @@ struct slcinfo {
- 
- /*VARARGS*/
- Ptr
--sr_slice (va_alist)
--va_dcl
-+sr_slice (char *locn, ...)
- {
-     va_list ap;
--    char *locn;
-     Array *a1, *a2;
-     int elemsize, nbounds;
-     int adim, lb[MAX_DIMENS], ub[MAX_DIMENS];	/* array dims*/
-@@ -266,8 +261,7 @@ va_dcl
-     sr_check_stk (CUR_STACK);
- 
-     /* get fixed arguments */
--    va_start (ap);
--    locn = va_arg (ap, char *);		/* SR source code location */
-+    va_start (ap, locn);
-     a1 = va_arg (ap, Array *);		/* contiguous array */
-     a2 = va_arg (ap, Array *);		/* sliced array */
-     elemsize = va_arg (ap, int);	/* array element size */
diff --git a/lang/sr/patches/patch-ag b/lang/sr/patches/patch-ag
deleted file mode 100644
index 72466f1f8bc..00000000000
--- a/lang/sr/patches/patch-ag
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/funcs.h.orig	1999-07-28 22:42:24.000000000 +0200
-+++ rts/funcs.h
-@@ -6,7 +6,7 @@ extern	void	sr_abort ();
- extern	char*	sr_fmt_locn ();
- extern	void	sr_malf ();
- extern	void	sr_message ();
--extern	int	sr_runerr ();
-+extern	int	sr_runerr (char *, ...);
- extern	void	sr_net_abort ();
- extern	void	sr_stk_corrupted ();
- extern	void	sr_stk_overflow ();
-@@ -30,8 +30,8 @@ extern	Ptr	sr_astring ();
- extern	Array*	sr_aswap ();
- extern	String*	sr_chgstr ();
- extern	Ptr	sr_clone ();
--extern	Array*	sr_init_array ();
--extern	Ptr	sr_slice ();
-+extern	Array*	sr_init_array (char *, ...);
-+extern	Ptr	sr_slice (char *, ...);
- extern	Ptr	sr_sslice ();
- extern	Array*	sr_strarr ();
- 
-@@ -97,8 +97,8 @@ extern	int	sr_get_string ();
- extern	int	sr_inchar ();
- extern	void	sr_init_io ();
- extern	File	sr_open ();
--extern	void	sr_printf ();
--extern	int	sr_read ();
-+extern	void	sr_printf (char *, ...);
-+extern	int	sr_read (char *, ...);
- extern	Bool	sr_remove ();
- extern	int	sr_seek ();
- extern	int	sr_where ();
-@@ -111,14 +111,14 @@ extern	void	sr_reaccess ();
- extern	void	sr_rm_iop ();
- 
- /* math.c */
--extern	int	sr_imax ();
--extern	int	sr_imin ();
-+extern	int	sr_imax (int, ...);
-+extern	int	sr_imin (int, ...);
- extern	int	sr_imod ();
- extern	void	sr_init_random ();
- extern	int	sr_itoi ();
- extern	Real	sr_random ();
--extern	Real	sr_rmax ();
--extern	Real	sr_rmin ();
-+extern	Real	sr_rmax (int, ...);
-+extern	Real	sr_rmin (int, ...);
- extern	Real	sr_rmod ();
- extern	Real	sr_round ();
- extern	Real	sr_rtoi ();
-@@ -134,7 +134,7 @@ extern	int	sr_arg_int ();
- extern	int	sr_arg_ptr ();
- extern	int	sr_arg_real ();
- extern	int	sr_arg_string ();
--extern	Ptr	sr_cat ();
-+extern	Ptr	sr_cat (String *, ...);
- extern	void	sr_dispose ();
- extern	Ptr	sr_gswap ();
- extern	void	sr_init_misc ();
-@@ -210,7 +210,7 @@ extern	void	sr_init_res ();
- extern	Ptr	sr_literal_rcap ();
- 
- /* scan.c */
--extern	int	sr_scanf ();
-+extern	int	sr_scanf (char *, ...);
- 
- /* semaphore.c */
- extern	void	P ();
diff --git a/lang/sr/patches/patch-ah b/lang/sr/patches/patch-ah
deleted file mode 100644
index 9f034dc81e9..00000000000
--- a/lang/sr/patches/patch-ah
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/io.c.orig	1999-07-29 00:16:12.000000000 +0200
-+++ rts/io.c
-@@ -7,7 +7,7 @@
-  */
- 
- #include <ctype.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include "rts.h"
- 
- #define NOTHING			/* for use as null macro arg under ANSI C */
-@@ -218,11 +218,9 @@ String *fname;
-  */
- /*VARARGS*/
- int
--sr_read (va_alist)
--va_dcl
-+sr_read (char *locn, ...)
- {
-     va_list ap;
--    char *locn;
-     File fp;
-     char *argt;
-     Array *a;
-@@ -238,8 +236,7 @@ va_dcl
-     double d;
- 
-     sr_check_stk (CUR_STACK);
--    va_start (ap);
--    locn = va_arg (ap, char *);
-+    va_start (ap, locn);
- 
-     fp = va_arg (ap, File);
-     BEGIN_IO (fp);
-@@ -442,8 +439,7 @@ int n;
-  */
- /*VARARGS*/
- void
--sr_printf (va_alist)
--va_dcl
-+sr_printf (char *locn, ...)
- {
-     va_list ap;
-     File fp;
-@@ -451,14 +447,12 @@ va_dcl
-     double v;
-     char xbuf[20], fbuf[512], dbuf[512], obuf[512];
-     int n;
--    char *locn;
-     String *str, *sp;
-     int ssize;
-     Array *arr;
- 
-     sr_check_stk (CUR_STACK);
--    va_start (ap);
--    locn = va_arg (ap, char *);
-+    va_start (ap, locn);
-     fp = va_arg (ap, File);
-     sp = va_arg (ap, String *);
- 
diff --git a/lang/sr/patches/patch-ai b/lang/sr/patches/patch-ai
deleted file mode 100644
index 53c535b22b5..00000000000
--- a/lang/sr/patches/patch-ai
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/main.c.orig	1999-07-28 23:08:48.000000000 +0200
-+++ rts/main.c
-@@ -16,7 +16,7 @@ extern local_message_type;	/* message ty
- #endif
- 
- 
--#include <varargs.h>
-+#include <stdarg.h>
- 
- #define RUNERR(s,n,m) {n, m},
- static struct err {
-@@ -311,20 +311,17 @@ char *buf, *locn;
-  */
- /*VARARGS*/
- int
--sr_runerr (va_alist)
--va_dcl
-+sr_runerr (char *locn, ...)
- {
-     va_list ap;
-     char c, *f, *o;
--    char *locn;
-     int errnum;
-     struct err *ep;
-     char buf[200];
-     Dim *d;
-     String *s;
- 
--    va_start (ap);
--    locn = va_arg (ap, char *);
-+    va_start (ap, locn);
-     errnum = va_arg (ap, int);
- 
- 
diff --git a/lang/sr/patches/patch-aj b/lang/sr/patches/patch-aj
deleted file mode 100644
index 1cfd47284ee..00000000000
--- a/lang/sr/patches/patch-aj
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/math.c.orig	1999-07-28 22:42:24.000000000 +0200
-+++ rts/math.c
-@@ -1,6 +1,6 @@
- /*  math.c -- runtime support of arithmetic and math builtins  */
- 
--#include <varargs.h>
-+#include <stdarg.h>
- #include "rts.h"
- 
- 
-@@ -162,17 +162,15 @@ int x, y;
-  */
- /*VARARGS*/
- int
--sr_imax (va_alist)
--va_dcl
-+sr_imax (int n, ...)
- {
-     va_list ap;
--    int n, r, v;
-+    int r, v;
- 
--    va_start (ap);
--    n = va_arg (ap, int);
-     if (n <= 0)
- 	sr_malf ("no args to sr_imax");
- 
-+    va_start (ap, n);
-     r = va_arg (ap, int);	/* pick off the first one */
-     n--;
- 
-@@ -193,17 +191,15 @@ va_dcl
-  */
- /*VARARGS*/
- int
--sr_imin (va_alist)
--va_dcl
-+sr_imin (int n, ...)
- {
-     va_list ap;
--    int n, r, v;
-+    int r, v;
- 
--    va_start (ap);
--    n = va_arg (ap, int);
-     if (n <= 0)
- 	sr_malf ("no args to sr_imin");
- 
-+    va_start (ap, n);
-     r = va_arg (ap, int);	/* pick off the first one */
-     n--;
- 
-@@ -222,18 +218,15 @@ va_dcl
-  */
- /*VARARGS*/
- Real
--sr_rmax (va_alist)
--va_dcl
-+sr_rmax (int n, ...)
- {
-     va_list ap;
--    int n;
-     Real r, v;
- 
--    va_start (ap);
--    n = va_arg (ap, int);
-     if (n <= 0)
- 	sr_malf ("no args to sr_rmax");
- 
-+    va_start (ap, n);
-     r = va_arg (ap, Real);	/* pick off the first one */
-     n--;
- 
-@@ -254,18 +247,15 @@ va_dcl
-  */
- /*VARARGS*/
- Real
--sr_rmin (va_alist)
--va_dcl
-+sr_rmin (int n, ...)
- {
-     va_list ap;
--    int n;
-     Real r, v;
- 
--    va_start (ap);
--    n = va_arg (ap, int);
-     if (n <= 0)
- 	sr_malf ("no args to sr_rmin");
- 
-+    va_start (ap, n);
-     r = va_arg (ap, Real);	/* pick off the first one */
-     n--;
- 
diff --git a/lang/sr/patches/patch-ak b/lang/sr/patches/patch-ak
deleted file mode 100644
index 26f2e9f0fe1..00000000000
--- a/lang/sr/patches/patch-ak
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/misc.c.orig	1999-07-28 23:08:48.000000000 +0200
-+++ rts/misc.c
-@@ -1,6 +1,6 @@
- /*  misc.c -- miscellaneous routines supporting the generated code  */
- 
--#include <varargs.h>
-+#include <stdarg.h>
- #include "rts.h"
- 
- 
-@@ -15,8 +15,7 @@
-  */
- /*VARARGS*/
- Ptr
--sr_cat (va_alist)
--va_dcl
-+sr_cat (String *q, ...)
- {
-     va_list ap;
-     String *s, *t;
-@@ -24,12 +23,15 @@ va_dcl
-     char *p;
- 
-     n = 0;					/* total the string lengths */
--    va_start (ap);
--    while ((s = va_arg (ap, String *)) != NULL)
-+    s = q;
-+    va_start (ap, q);
-+    while (s != NULL) {
- 	if ((int) s & 1)
- 	    n++;				/* char argument */
- 	else
- 	    n += s->length;			/* String argument */
-+	s = va_arg (ap, String *);
-+    }
-     va_end (ap);
- 
-     t = (String *) sr_alc (n + STRING_OVH, 1);
-@@ -37,14 +39,16 @@ va_dcl
-     t->length = n;
- 
-     p = DATA (t);
--    va_start (ap);
--    while ((s = va_arg (ap, String *)) != NULL) {   /* for each input string: */
-+    va_start (ap, q);
-+    s = q;
-+    while (s != NULL) {   /* for each input string: */
- 	if ((int) s & 1) {
- 	    *p++ = (int) s >> 2;		    /* copy in char argument */
- 	} else {
- 	    memcpy (p, DATA (s), s->length);	    /* copy into new string */
- 	    p += s->length;			    /* advance pointer*/
- 	}
-+	s = va_arg (ap, String *);
-     }
-     va_end (ap);
-     return (Ptr) t;				/* return result address */
diff --git a/lang/sr/patches/patch-al b/lang/sr/patches/patch-al
deleted file mode 100644
index 111cb7cd4cf..00000000000
--- a/lang/sr/patches/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/oper.c.orig	1999-08-03 02:09:20.000000000 +0200
-+++ rts/oper.c
-@@ -1,6 +1,5 @@
- /*  oper.c -- runtime support of operations  */
- 
--#include <varargs.h>
- #include "rts.h"
- 
- static Pool oper_pool;		/* pool of operation descriptors */
diff --git a/lang/sr/patches/patch-am b/lang/sr/patches/patch-am
deleted file mode 100644
index 76096b32db2..00000000000
--- a/lang/sr/patches/patch-am
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/scan.c.orig	1999-07-28 22:42:24.000000000 +0200
-+++ rts/scan.c
-@@ -1,7 +1,7 @@
- /*  scan.c -- scanf and sscanf  */
- 
- #include <ctype.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include "rts.h"
- 
- static int scanToken (), scanInteger (), scanReal (), scanPointer ();
-@@ -58,11 +58,9 @@ static int scanTokenFromSet ();
-  *  (or EOF).  The number of successful conversions is returned otherwise.
-  */
- int
--sr_scanf (va_alist)
--va_dcl
-+sr_scanf (char *locn, ...)
- {
-     va_list ap;
--    char *locn;
-     Array *a;
-     String *sp, *sfmt, *sarg;
-     Real *rp, real;
-@@ -84,8 +82,7 @@ va_dcl
- 
-     sr_check_stk (CUR_STACK);
- 
--    va_start (ap);
--    locn = va_arg (ap, char *);
-+    va_start (ap, locn);
-     fp = va_arg (ap, FILE *);
-     sarg = va_arg (ap, String *);
-     sfmt = va_arg (ap, String *);
diff --git a/lang/sr/patches/patch-an b/lang/sr/patches/patch-an
deleted file mode 100644
index 81dd3c08d84..00000000000
--- a/lang/sr/patches/patch-an
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-an,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- rts/socket.c.orig	1999-08-09 18:34:34.000000000 +0200
-+++ rts/socket.c
-@@ -5,6 +5,7 @@
- 
- #include "rts.h"
- #include <fcntl.h>
-+#include <string.h>
- 
- #ifdef __PARAGON__
- #include <nx.h>
-@@ -481,17 +482,10 @@ static void
- syserr (message)
- char *message;
- {
--    char s1[100], s2[100];
--    extern int sys_nerr;
-+    char *s1;
-+    char s2[100];
- 
--#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__linux__)
--    extern char *sys_errlist[];
--#endif
--
--    if (errno > 0 && errno < sys_nerr)
--	strcpy (s1, sys_errlist[errno]);
--    else
--	sprintf (s1, "error %d", errno);
--    sprintf (s2, "%s: %s", message ? message : "network I/O", s1);
-+    s1 = strerror(errno);
-+    snprintf (s2, sizeof(s2), "%s: %s", message ? message : "network I/O", s1);
-     sr_net_abort (s2);
- }
diff --git a/lang/sr/patches/patch-ao b/lang/sr/patches/patch-ao
deleted file mode 100644
index 714a3c394ec..00000000000
--- a/lang/sr/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- sr.h.orig	1999-07-30 23:11:10.000000000 +0200
-+++ sr.h
-@@ -307,7 +307,7 @@ extern double sin(), cos(), tan(), asin(
- extern void *memcpy();
- #endif
- 
--#if defined(__sgi) && ! defined(RTS)
-+#if (defined(__sgi) && ! defined(RTS)) || defined(__NetBSD__)
-     /* SGI needs new-style prototypes when compiling generated code */
-     extern Ptr	sr_cat(String*, ...);
-     extern int	sr_imax(int, ...);
diff --git a/lang/sr/patches/patch-ap b/lang/sr/patches/patch-ap
deleted file mode 100644
index f7b25d5c78d..00000000000
--- a/lang/sr/patches/patch-ap
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ap,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- sr/output.c.orig	1999-07-28 23:08:50.000000000 +0200
-+++ sr/output.c
-@@ -8,7 +8,7 @@
- #include "compiler.h"
- #include <ctype.h>
- #include <errno.h>
--#include <varargs.h>
-+#include <stdarg.h>
- 
- #define NSTREAMS 10		/* number of output streams */
- #define DEFSTREAM 9		/* default stream number */
-@@ -231,11 +231,9 @@ cflush ()
- 
- /* VARARGS */
- void
--cprintf (va_alist)
--va_dcl
-+cprintf (char *fmt, ...)
- {
-     va_list ap;
--    char *fmt;
-     char *s;
-     char c;
-     int n, oldstream;
-@@ -244,8 +242,7 @@ va_dcl
- 
-     oldstream = outstream;		/* save stream number in case changed */
- 
--    va_start (ap);
--    fmt = va_arg (ap, char *);
-+    va_start (ap, fmt);
- 
-     if (*fmt == ',' && LASTPUT () == '(')
- 	fmt++;				/* skip initial comma inside parens */
diff --git a/lang/sr/patches/patch-aq b/lang/sr/patches/patch-aq
deleted file mode 100644
index a8f7a1db8c4..00000000000
--- a/lang/sr/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1.1.1 2005/02/25 15:54:59 is Exp $
-
---- sr/protos.h.orig	1999-08-03 02:09:32.000000000 +0200
-+++ sr/protos.h
-@@ -148,7 +148,7 @@ extern	void	mkinter		PARAMS ((NOARGS));
- extern	void	copen		PARAMS ((char *fname));
- extern	void	cdivert		PARAMS ((int n));
- extern	void	undivert	PARAMS ((int n));
--extern	void	cprintf		PARAMS ((/* VARARGS */));
-+extern	void	cprintf		PARAMS ((char *, ...));
- extern	void	cflush		PARAMS (());
- extern	void	cclose		PARAMS ((NOARGS));	
- extern	void	setstream	PARAMS ((int n));