Patch installed: fix formatting for libf2c part 5/6

Kaveh R. Ghazi ghazi@caip.rutgers.edu
Sat Jun 1 05:45:00 GMT 2002


Fix formatting part5

diff -rup orig/egcc-CVS20020531/libf2c/libI77/rewind.c egcc-CVS20020531/libf2c/libI77/rewind.c
--- orig/egcc-CVS20020531/libf2c/libI77/rewind.c	2002-05-31 21:47:45.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/rewind.c	2002-05-31 23:15:41.286671403 -0400
@@ -1,23 +1,25 @@
 #include "config.h"
 #include "f2c.h"
 #include "fio.h"
-integer f_rew(alist *a)
+integer
+f_rew (alist * a)
 {
-	unit *b;
-	if (f__init & 2)
-		f__fatal (131, "I/O recursion");
-	if(a->aunit>=MXUNIT || a->aunit<0)
-		err(a->aerr,101,"rewind");
-	b = &f__units[a->aunit];
-	if(b->ufd == NULL || b->uwrt == 3)
-		return(0);
-	if(!b->useek)
-		err(a->aerr,106,"rewind");
-	if(b->uwrt) {
-		(void) t_runc(a);
-		b->uwrt = 3;
-		}
-	FSEEK(b->ufd, 0, SEEK_SET);
-	b->uend=0;
-	return(0);
+  unit *b;
+  if (f__init & 2)
+    f__fatal (131, "I/O recursion");
+  if (a->aunit >= MXUNIT || a->aunit < 0)
+    err (a->aerr, 101, "rewind");
+  b = &f__units[a->aunit];
+  if (b->ufd == NULL || b->uwrt == 3)
+    return (0);
+  if (!b->useek)
+    err (a->aerr, 106, "rewind");
+  if (b->uwrt)
+    {
+      (void) t_runc (a);
+      b->uwrt = 3;
+    }
+  FSEEK (b->ufd, 0, SEEK_SET);
+  b->uend = 0;
+  return (0);
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/rsfe.c egcc-CVS20020531/libf2c/libI77/rsfe.c
--- orig/egcc-CVS20020531/libf2c/libI77/rsfe.c	2002-05-31 21:56:19.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/rsfe.c	2002-05-31 23:15:41.286671403 -0400
@@ -4,74 +4,90 @@
 #include "fio.h"
 #include "fmt.h"
 
-xrd_SL(void)
-{	int ch;
-	if(!f__curunit->uend)
-		while((ch=getc(f__cf))!='\n')
-			if (ch == EOF) {
-				f__curunit->uend = 1;
-				break;
-				}
-	f__cursor=f__recpos=0;
-	return(1);
-}
-x_getc(void)
-{	int ch;
-	if(f__curunit->uend) return(EOF);
-	ch = getc(f__cf);
-	if(ch!=EOF && ch!='\n')
-	{	f__recpos++;
-		return(ch);
-	}
-	if(ch=='\n')
-	{	(void) ungetc(ch,f__cf);
-		return(ch);
-	}
-	if(f__curunit->uend || feof(f__cf))
-	{	errno=0;
-		f__curunit->uend=1;
-		return(-1);
+xrd_SL (void)
+{
+  int ch;
+  if (!f__curunit->uend)
+    while ((ch = getc (f__cf)) != '\n')
+      if (ch == EOF)
+	{
+	  f__curunit->uend = 1;
+	  break;
 	}
-	return(-1);
+  f__cursor = f__recpos = 0;
+  return (1);
 }
-x_endp(void)
+
+x_getc (void)
 {
-	xrd_SL();
-	return f__curunit->uend == 1 ? EOF : 0;
+  int ch;
+  if (f__curunit->uend)
+    return (EOF);
+  ch = getc (f__cf);
+  if (ch != EOF && ch != '\n')
+    {
+      f__recpos++;
+      return (ch);
+    }
+  if (ch == '\n')
+    {
+      (void) ungetc (ch, f__cf);
+      return (ch);
+    }
+  if (f__curunit->uend || feof (f__cf))
+    {
+      errno = 0;
+      f__curunit->uend = 1;
+      return (-1);
+    }
+  return (-1);
 }
-x_rev(void)
+
+x_endp (void)
 {
-	(void) xrd_SL();
-	return(0);
+  xrd_SL ();
+  return f__curunit->uend == 1 ? EOF : 0;
 }
-integer s_rsfe(cilist *a) /* start */
-{	int n;
-	if(f__init != 1) f_init();
-	f__init = 3;
-	f__reading=1;
-	f__sequential=1;
-	f__formatted=1;
-	f__external=1;
-	if(n=c_sfe(a)) return(n);
-	f__elist=a;
-	f__cursor=f__recpos=0;
-	f__scale=0;
-	f__fmtbuf=a->cifmt;
-	f__curunit= &f__units[a->ciunit];
-	f__cf=f__curunit->ufd;
-	if(pars_f(f__fmtbuf)<0) err(a->cierr,100,"startio");
-	f__getn= x_getc;
-	f__doed= rd_ed;
-	f__doned= rd_ned;
-	fmt_bg();
-	f__doend=x_endp;
-	f__donewrec=xrd_SL;
-	f__dorevert=x_rev;
-	f__cblank=f__curunit->ublnk;
-	f__cplus=0;
-	if(f__curunit->uwrt && f__nowreading(f__curunit))
-		err(a->cierr,errno,"read start");
-	if(f__curunit->uend)
-		err(f__elist->ciend,(EOF),"read start");
-	return(0);
+
+x_rev (void)
+{
+  (void) xrd_SL ();
+  return (0);
+}
+
+integer
+s_rsfe (cilist * a)		/* start */
+{
+  int n;
+  if (f__init != 1)
+    f_init ();
+  f__init = 3;
+  f__reading = 1;
+  f__sequential = 1;
+  f__formatted = 1;
+  f__external = 1;
+  if (n = c_sfe (a))
+    return (n);
+  f__elist = a;
+  f__cursor = f__recpos = 0;
+  f__scale = 0;
+  f__fmtbuf = a->cifmt;
+  f__curunit = &f__units[a->ciunit];
+  f__cf = f__curunit->ufd;
+  if (pars_f (f__fmtbuf) < 0)
+    err (a->cierr, 100, "startio");
+  f__getn = x_getc;
+  f__doed = rd_ed;
+  f__doned = rd_ned;
+  fmt_bg ();
+  f__doend = x_endp;
+  f__donewrec = xrd_SL;
+  f__dorevert = x_rev;
+  f__cblank = f__curunit->ublnk;
+  f__cplus = 0;
+  if (f__curunit->uwrt && f__nowreading (f__curunit))
+    err (a->cierr, errno, "read start");
+  if (f__curunit->uend)
+    err (f__elist->ciend, (EOF), "read start");
+  return (0);
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/rsli.c egcc-CVS20020531/libf2c/libI77/rsli.c
--- orig/egcc-CVS20020531/libf2c/libI77/rsli.c	2002-05-31 21:56:19.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/rsli.c	2002-05-31 23:15:41.286671403 -0400
@@ -1,7 +1,7 @@
 #include "f2c.h"
 #include "fio.h"
 #include "lio.h"
-#include "fmt.h" /* for f__doend */
+#include "fmt.h"		/* for f__doend */
 
 extern flag f__lquit;
 extern int f__lcount;
@@ -10,80 +10,89 @@ extern char *f__icend;
 extern icilist *f__svic;
 extern int f__icnum, f__recpos;
 
-static int i_getc(void)
+static int
+i_getc (void)
 {
-	if(f__recpos >= f__svic->icirlen) {
-		if (f__recpos++ == f__svic->icirlen)
-			return '\n';
-		z_rnew();
-		}
-	f__recpos++;
-	if(f__icptr >= f__icend)
-		return EOF;
-	return(*f__icptr++);
-	}
-
- static
-int i_ungetc(int ch, FILE *f)
-{
-	if (--f__recpos == f__svic->icirlen)
-		return '\n';
-	if (f__recpos < -1)
-		err(f__svic->icierr,110,"recend");
-	/* *--icptr == ch, and icptr may point to read-only memory */
-	return *--f__icptr /* = ch */;
-	}
-
- static void
-c_lir(icilist *a)
-{
-	extern int l_eof;
-	if(f__init != 1) f_init();
-	f__init = 3;
-	f__reading = 1;
-	f__external = 0;
-	f__formatted = 1;
-	f__svic = a;
-	L_len = a->icirlen;
-	f__recpos = -1;
-	f__icnum = f__recpos = 0;
-	f__cursor = 0;
-	l_getc = i_getc;
-	l_ungetc = i_ungetc;
-	l_eof = 0;
-	f__icptr = a->iciunit;
-	f__icend = f__icptr + a->icirlen*a->icirnum;
-	f__cf = 0;
-	f__curunit = 0;
-	f__elist = (cilist *)a;
-	}
-
-
-integer s_rsli(icilist *a)
-{
-	f__lioproc = l_read;
-	f__lquit = 0;
-	f__lcount = 0;
-	c_lir(a);
-	f__doend = 0;
-	return(0);
-	}
-
-integer e_rsli(void)
-{ f__init = 1; return 0; }
-
-extern int x_rsne(cilist*);
-
-integer s_rsni(icilist *a)
-{
-	extern int nml_read;
-	integer rv;
-	cilist ca;
-	ca.ciend = a->iciend;
-	ca.cierr = a->icierr;
-	ca.cifmt = a->icifmt;
-	c_lir(a);
-	rv = x_rsne(&ca);
-	nml_read = 0;
-	return rv;
-	}
+  if (f__recpos >= f__svic->icirlen)
+    {
+      if (f__recpos++ == f__svic->icirlen)
+	return '\n';
+      z_rnew ();
+    }
+  f__recpos++;
+  if (f__icptr >= f__icend)
+    return EOF;
+  return (*f__icptr++);
+}
+
+static int
+i_ungetc (int ch, FILE * f)
+{
+  if (--f__recpos == f__svic->icirlen)
+    return '\n';
+  if (f__recpos < -1)
+    err (f__svic->icierr, 110, "recend");
+  /* *--icptr == ch, and icptr may point to read-only memory */
+  return *--f__icptr /* = ch */ ;
+}
+
+static void
+c_lir (icilist * a)
+{
+  extern int l_eof;
+  if (f__init != 1)
+    f_init ();
+  f__init = 3;
+  f__reading = 1;
+  f__external = 0;
+  f__formatted = 1;
+  f__svic = a;
+  L_len = a->icirlen;
+  f__recpos = -1;
+  f__icnum = f__recpos = 0;
+  f__cursor = 0;
+  l_getc = i_getc;
+  l_ungetc = i_ungetc;
+  l_eof = 0;
+  f__icptr = a->iciunit;
+  f__icend = f__icptr + a->icirlen * a->icirnum;
+  f__cf = 0;
+  f__curunit = 0;
+  f__elist = (cilist *) a;
+}
+
+
+integer
+s_rsli (icilist * a)
+{
+  f__lioproc = l_read;
+  f__lquit = 0;
+  f__lcount = 0;
+  c_lir (a);
+  f__doend = 0;
+  return (0);
+}
+
+integer
+e_rsli (void)
+{
+  f__init = 1;
+  return 0;
+}
+
+extern int x_rsne (cilist *);
+
+integer
+s_rsni (icilist * a)
+{
+  extern int nml_read;
+  integer rv;
+  cilist ca;
+  ca.ciend = a->iciend;
+  ca.cierr = a->icierr;
+  ca.cifmt = a->icifmt;
+  c_lir (a);
+  rv = x_rsne (&ca);
+  nml_read = 0;
+  return rv;
+}
diff -rup orig/egcc-CVS20020531/libf2c/libI77/rsne.c egcc-CVS20020531/libf2c/libI77/rsne.c
--- orig/egcc-CVS20020531/libf2c/libI77/rsne.c	2002-05-31 21:56:20.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/rsne.c	2002-05-31 23:15:41.306671215 -0400
@@ -3,41 +3,44 @@
 #include "fio.h"
 #include "lio.h"
 
-#define MAX_NL_CACHE 3	/* maximum number of namelist hash tables to cache */
-#define MAXDIM 20	/* maximum number of subscripts */
+#define MAX_NL_CACHE 3		/* maximum number of namelist hash tables to cache */
+#define MAXDIM 20		/* maximum number of subscripts */
 
- struct dimen {
-	ftnlen extent;
-	ftnlen curval;
-	ftnlen delta;
-	ftnlen stride;
-	};
- typedef struct dimen dimen;
-
- struct hashentry {
-	struct hashentry *next;
-	char *name;
-	Vardesc *vd;
-	};
- typedef struct hashentry hashentry;
-
- struct hashtab {
-	struct hashtab *next;
-	Namelist *nl;
-	int htsize;
-	hashentry *tab[1];
-	};
- typedef struct hashtab hashtab;
-
- static hashtab *nl_cache;
- static int n_nlcache;
- static hashentry **zot;
- static int colonseen;
- extern ftnlen f__typesize[];
-
- extern flag f__lquit;
- extern int f__lcount, nml_read;
- extern t_getc(void);
+struct dimen
+{
+  ftnlen extent;
+  ftnlen curval;
+  ftnlen delta;
+  ftnlen stride;
+};
+typedef struct dimen dimen;
+
+struct hashentry
+{
+  struct hashentry *next;
+  char *name;
+  Vardesc *vd;
+};
+typedef struct hashentry hashentry;
+
+struct hashtab
+{
+  struct hashtab *next;
+  Namelist *nl;
+  int htsize;
+  hashentry *tab[1];
+};
+typedef struct hashtab hashtab;
+
+static hashtab *nl_cache;
+static int n_nlcache;
+static hashentry **zot;
+static int colonseen;
+extern ftnlen f__typesize[];
+
+extern flag f__lquit;
+extern int f__lcount, nml_read;
+extern t_getc (void);
 
 #undef abs
 #undef min
@@ -46,516 +49,548 @@
 #include <string.h>
 
 #ifdef ungetc
- static int
-un_getc(int x, FILE *f__cf)
-{ return ungetc(x,f__cf); }
+static int
+un_getc (int x, FILE * f__cf)
+{
+  return ungetc (x, f__cf);
+}
 #else
 #define un_getc ungetc
-extern int ungetc(int, FILE*);	/* for systems with a buggy stdio.h */
+extern int ungetc (int, FILE *);	/* for systems with a buggy stdio.h */
 #endif
 
- static Vardesc *
-hash(hashtab *ht, register char *s)
+static Vardesc *
+hash (hashtab * ht, register char *s)
 {
-	register int c, x;
-	register hashentry *h;
-	char *s0 = s;
-
-	for(x = 0; c = *s++; x = x & 0x4000 ? ((x << 1) & 0x7fff) + 1 : x << 1)
-		x += c;
-	for(h = *(zot = ht->tab + x % ht->htsize); h; h = h->next)
-		if (!strcmp(s0, h->name))
-			return h->vd;
-	return 0;
-	}
+  register int c, x;
+  register hashentry *h;
+  char *s0 = s;
+
+  for (x = 0; c = *s++; x = x & 0x4000 ? ((x << 1) & 0x7fff) + 1 : x << 1)
+    x += c;
+  for (h = *(zot = ht->tab + x % ht->htsize); h; h = h->next)
+    if (!strcmp (s0, h->name))
+      return h->vd;
+  return 0;
+}
 
- hashtab *
-mk_hashtab(Namelist *nl)
+hashtab *
+mk_hashtab (Namelist * nl)
 {
-	int nht, nv;
-	hashtab *ht;
-	Vardesc *v, **vd, **vde;
-	hashentry *he;
-
-	hashtab **x, **x0, *y;
-	for(x = &nl_cache; y = *x; x0 = x, x = &y->next)
-		if (nl == y->nl)
-			return y;
-	if (n_nlcache >= MAX_NL_CACHE) {
-		/* discard least recently used namelist hash table */
-		y = *x0;
-		free((char *)y->next);
-		y->next = 0;
-		}
-	else
-		n_nlcache++;
-	nv = nl->nvars;
-	if (nv >= 0x4000)
-		nht = 0x7fff;
-	else {
-		for(nht = 1; nht < nv; nht <<= 1);
-		nht += nht - 1;
-		}
-	ht = (hashtab *)malloc(sizeof(hashtab) + (nht-1)*sizeof(hashentry *)
-				+ nv*sizeof(hashentry));
-	if (!ht)
-		return 0;
-	he = (hashentry *)&ht->tab[nht];
-	ht->nl = nl;
-	ht->htsize = nht;
-	ht->next = nl_cache;
-	nl_cache = ht;
-	memset((char *)ht->tab, 0, nht*sizeof(hashentry *));
-	vd = nl->vars;
-	vde = vd + nv;
-	while(vd < vde) {
-		v = *vd++;
-		if (!hash(ht, v->name)) {
-			he->next = *zot;
-			*zot = he;
-			he->name = v->name;
-			he->vd = v;
-			he++;
-			}
-		}
-	return ht;
+  int nht, nv;
+  hashtab *ht;
+  Vardesc *v, **vd, **vde;
+  hashentry *he;
+
+  hashtab **x, **x0, *y;
+  for (x = &nl_cache; y = *x; x0 = x, x = &y->next)
+    if (nl == y->nl)
+      return y;
+  if (n_nlcache >= MAX_NL_CACHE)
+    {
+      /* discard least recently used namelist hash table */
+      y = *x0;
+      free ((char *) y->next);
+      y->next = 0;
+    }
+  else
+    n_nlcache++;
+  nv = nl->nvars;
+  if (nv >= 0x4000)
+    nht = 0x7fff;
+  else
+    {
+      for (nht = 1; nht < nv; nht <<= 1);
+      nht += nht - 1;
+    }
+  ht = (hashtab *) malloc (sizeof (hashtab) + (nht - 1) * sizeof (hashentry *)
+			   + nv * sizeof (hashentry));
+  if (!ht)
+    return 0;
+  he = (hashentry *) & ht->tab[nht];
+  ht->nl = nl;
+  ht->htsize = nht;
+  ht->next = nl_cache;
+  nl_cache = ht;
+  memset ((char *) ht->tab, 0, nht * sizeof (hashentry *));
+  vd = nl->vars;
+  vde = vd + nv;
+  while (vd < vde)
+    {
+      v = *vd++;
+      if (!hash (ht, v->name))
+	{
+	  he->next = *zot;
+	  *zot = he;
+	  he->name = v->name;
+	  he->vd = v;
+	  he++;
 	}
+    }
+  return ht;
+}
 
 static char Alpha[256], Alphanum[256];
 
 static void
-nl_init(void) {
-	register char *s;
-	register int c;
-
-	for(s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; c = *s++; )
-		Alpha[c]
-		= Alphanum[c]
-		= Alpha[c + 'a' - 'A']
-		= Alphanum[c + 'a' - 'A']
-		= c;
-	for(s = "0123456789_"; c = *s++; )
-		Alphanum[c] = c;
-	}
+nl_init (void)
+{
+  register char *s;
+  register int c;
+
+  for (s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; c = *s++;)
+    Alpha[c]
+      = Alphanum[c] = Alpha[c + 'a' - 'A'] = Alphanum[c + 'a' - 'A'] = c;
+  for (s = "0123456789_"; c = *s++;)
+    Alphanum[c] = c;
+}
 
 #define GETC(x) (x=(*l_getc)())
 #define Ungetc(x,y) (*l_ungetc)(x,y)
 
- static int
-getname(register char *s, int slen)
+static int
+getname (register char *s, int slen)
 {
-	register char *se = s + slen - 1;
-	register int ch;
+  register char *se = s + slen - 1;
+  register int ch;
 
-	GETC(ch);
-	if (!(*s++ = Alpha[ch & 0xff])) {
-		if (ch != EOF)
-			ch = 115;
-		errfl(f__elist->cierr, ch, "namelist read");
-		}
-	while(*s = Alphanum[GETC(ch) & 0xff])
-		if (s < se)
-			s++;
-	if (ch == EOF)
-		err(f__elist->cierr, EOF, "namelist read");
-	if (ch > ' ')
-		Ungetc(ch,f__cf);
-	return *s = 0;
-	}
+  GETC (ch);
+  if (!(*s++ = Alpha[ch & 0xff]))
+    {
+      if (ch != EOF)
+	ch = 115;
+      errfl (f__elist->cierr, ch, "namelist read");
+    }
+  while (*s = Alphanum[GETC (ch) & 0xff])
+    if (s < se)
+      s++;
+  if (ch == EOF)
+    err (f__elist->cierr, EOF, "namelist read");
+  if (ch > ' ')
+    Ungetc (ch, f__cf);
+  return *s = 0;
+}
 
- static int
-getnum(int *chp, ftnlen *val)
+static int
+getnum (int *chp, ftnlen * val)
 {
-	register int ch, sign;
-	register ftnlen x;
+  register int ch, sign;
+  register ftnlen x;
 
-	while(GETC(ch) <= ' ' && ch >= 0);
-	if (ch == '-') {
-		sign = 1;
-		GETC(ch);
-		}
-	else {
-		sign = 0;
-		if (ch == '+')
-			GETC(ch);
-		}
-	x = ch - '0';
-	if (x < 0 || x > 9)
-		return 115;
-	while(GETC(ch) >= '0' && ch <= '9')
-		x = 10*x + ch - '0';
-	while(ch <= ' ' && ch >= 0)
-		GETC(ch);
-	if (ch == EOF)
-		return EOF;
-	*val = sign ? -x : x;
-	*chp = ch;
-	return 0;
-	}
+  while (GETC (ch) <= ' ' && ch >= 0);
+  if (ch == '-')
+    {
+      sign = 1;
+      GETC (ch);
+    }
+  else
+    {
+      sign = 0;
+      if (ch == '+')
+	GETC (ch);
+    }
+  x = ch - '0';
+  if (x < 0 || x > 9)
+    return 115;
+  while (GETC (ch) >= '0' && ch <= '9')
+    x = 10 * x + ch - '0';
+  while (ch <= ' ' && ch >= 0)
+    GETC (ch);
+  if (ch == EOF)
+    return EOF;
+  *val = sign ? -x : x;
+  *chp = ch;
+  return 0;
+}
 
- static int
-getdimen(int *chp, dimen *d, ftnlen delta, ftnlen extent, ftnlen *x1)
+static int
+getdimen (int *chp, dimen * d, ftnlen delta, ftnlen extent, ftnlen * x1)
 {
-	register int k;
-	ftnlen x2, x3;
+  register int k;
+  ftnlen x2, x3;
 
-	if (k = getnum(chp, x1))
-		return k;
-	x3 = 1;
-	if (*chp == ':') {
-		if (k = getnum(chp, &x2))
-			return k;
-		x2 -= *x1;
-		if (*chp == ':') {
-			if (k = getnum(chp, &x3))
-				return k;
-			if (!x3)
-				return 123;
-			x2 /= x3;
-			colonseen = 1;
-			}
-		if (x2 < 0 || x2 >= extent)
-			return 123;
-		d->extent = x2 + 1;
-		}
-	else
-		d->extent = 1;
-	d->curval = 0;
-	d->delta = delta;
-	d->stride = x3;
-	return 0;
+  if (k = getnum (chp, x1))
+    return k;
+  x3 = 1;
+  if (*chp == ':')
+    {
+      if (k = getnum (chp, &x2))
+	return k;
+      x2 -= *x1;
+      if (*chp == ':')
+	{
+	  if (k = getnum (chp, &x3))
+	    return k;
+	  if (!x3)
+	    return 123;
+	  x2 /= x3;
+	  colonseen = 1;
 	}
+      if (x2 < 0 || x2 >= extent)
+	return 123;
+      d->extent = x2 + 1;
+    }
+  else
+    d->extent = 1;
+  d->curval = 0;
+  d->delta = delta;
+  d->stride = x3;
+  return 0;
+}
 
 #ifndef No_Namelist_Questions
 static void
-print_ne(cilist *a)
+print_ne (cilist * a)
 {
-	flag intext = f__external;
-	int rpsave = f__recpos;
-	FILE *cfsave = f__cf;
-	unit *usave = f__curunit;
-	cilist t;
-	t = *a;
-	t.ciunit = 6;
-	s_wsne(&t);
-	fflush(f__cf);
-	f__external = intext;
-	f__reading = 1;
-	f__recpos = rpsave;
-	f__cf = cfsave;
-	f__curunit = usave;
-	f__elist = a;
-	}
+  flag intext = f__external;
+  int rpsave = f__recpos;
+  FILE *cfsave = f__cf;
+  unit *usave = f__curunit;
+  cilist t;
+  t = *a;
+  t.ciunit = 6;
+  s_wsne (&t);
+  fflush (f__cf);
+  f__external = intext;
+  f__reading = 1;
+  f__recpos = rpsave;
+  f__cf = cfsave;
+  f__curunit = usave;
+  f__elist = a;
+}
 #endif
 
- static char where0[] = "namelist read start ";
+static char where0[] = "namelist read start ";
 
-x_rsne(cilist *a)
+x_rsne (cilist * a)
 {
-	int ch, got1, k, n, nd, quote, readall;
-	Namelist *nl;
-	static char where[] = "namelist read";
-	char buf[64];
-	hashtab *ht;
-	Vardesc *v;
-	dimen *dn, *dn0, *dn1;
-	ftnlen *dims, *dims1;
-	ftnlen b, b0, b1, ex, no, nomax, size, span;
-	ftnint no1, type;
-	char *vaddr;
-	long iva, ivae;
-	dimen dimens[MAXDIM], substr;
-
-	if (!Alpha['a'])
-		nl_init();
-	f__reading=1;
-	f__formatted=1;
-	got1 = 0;
- top:
-	for(;;) switch(GETC(ch)) {
-		case EOF:
- eof:
-			err(a->ciend,(EOF),where0);
-		case '&':
-		case '$':
-			goto have_amp;
+  int ch, got1, k, n, nd, quote, readall;
+  Namelist *nl;
+  static char where[] = "namelist read";
+  char buf[64];
+  hashtab *ht;
+  Vardesc *v;
+  dimen *dn, *dn0, *dn1;
+  ftnlen *dims, *dims1;
+  ftnlen b, b0, b1, ex, no, nomax, size, span;
+  ftnint no1, type;
+  char *vaddr;
+  long iva, ivae;
+  dimen dimens[MAXDIM], substr;
+
+  if (!Alpha['a'])
+    nl_init ();
+  f__reading = 1;
+  f__formatted = 1;
+  got1 = 0;
+top:
+  for (;;)
+    switch (GETC (ch))
+      {
+      case EOF:
+      eof:
+	err (a->ciend, (EOF), where0);
+      case '&':
+      case '$':
+	goto have_amp;
 #ifndef No_Namelist_Questions
-		case '?':
-			print_ne(a);
-			continue;
+      case '?':
+	print_ne (a);
+	continue;
 #endif
-		default:
-			if (ch <= ' ' && ch >= 0)
-				continue;
+      default:
+	if (ch <= ' ' && ch >= 0)
+	  continue;
 #ifndef No_Namelist_Comments
-			while(GETC(ch) != '\n')
-				if (ch == EOF)
-					goto eof;
+	while (GETC (ch) != '\n')
+	  if (ch == EOF)
+	    goto eof;
 #else
-			errfl(a->cierr, 115, where0);
+	errfl (a->cierr, 115, where0);
 #endif
-		}
- have_amp:
-	if (ch = getname(buf,sizeof(buf)))
-		return ch;
-	nl = (Namelist *)a->cifmt;
-	if (strcmp(buf, nl->name))
+      }
+have_amp:
+  if (ch = getname (buf, sizeof (buf)))
+    return ch;
+  nl = (Namelist *) a->cifmt;
+  if (strcmp (buf, nl->name))
 #ifdef No_Bad_Namelist_Skip
-		errfl(a->cierr, 118, where0);
+    errfl (a->cierr, 118, where0);
 #else
+    {
+      fprintf (stderr,
+	       "Skipping namelist \"%s\": seeking namelist \"%s\".\n",
+	       buf, nl->name);
+      fflush (stderr);
+      for (;;)
+	switch (GETC (ch))
+	  {
+	  case EOF:
+	    err (a->ciend, EOF, where0);
+	  case '/':
+	  case '&':
+	  case '$':
+	    if (f__external)
+	      e_rsle ();
+	    else
+	      z_rnew ();
+	    goto top;
+	  case '"':
+	  case '\'':
+	    quote = ch;
+	  more_quoted:
+	    while (GETC (ch) != quote)
+	      if (ch == EOF)
+		err (a->ciend, EOF, where0);
+	    if (GETC (ch) == quote)
+	      goto more_quoted;
+	    Ungetc (ch, f__cf);
+	  default:
+	    continue;
+	  }
+    }
+#endif
+  ht = mk_hashtab (nl);
+  if (!ht)
+    errfl (f__elist->cierr, 113, where0);
+  for (;;)
+    {
+      for (;;)
+	switch (GETC (ch))
+	  {
+	  case EOF:
+	    if (got1)
+	      return 0;
+	    err (a->ciend, EOF, where0);
+	  case '/':
+	  case '$':
+	  case '&':
+	    return 0;
+	  default:
+	    if (ch <= ' ' && ch >= 0 || ch == ',')
+	      continue;
+	    Ungetc (ch, f__cf);
+	    if (ch = getname (buf, sizeof (buf)))
+	      return ch;
+	    goto havename;
+	  }
+    havename:
+      v = hash (ht, buf);
+      if (!v)
+	errfl (a->cierr, 119, where);
+      while (GETC (ch) <= ' ' && ch >= 0);
+      vaddr = v->addr;
+      type = v->type;
+      if (type < 0)
+	{
+	  size = -type;
+	  type = TYCHAR;
+	}
+      else
+	size = f__typesize[type];
+      ivae = size;
+      iva = readall = 0;
+      if (ch == '(' /*) */ )
+	{
+	  dn = dimens;
+	  if (!(dims = v->dims))
+	    {
+	      if (type != TYCHAR)
+		errfl (a->cierr, 122, where);
+	      if (k = getdimen (&ch, dn, (ftnlen) size, (ftnlen) size, &b))
+		errfl (a->cierr, k, where);
+	      if (ch != ')')
+		errfl (a->cierr, 115, where);
+	      b1 = dn->extent;
+	      if (--b < 0 || b + b1 > size)
+		return 124;
+	      iva += b;
+	      size = b1;
+	      while (GETC (ch) <= ' ' && ch >= 0);
+	      goto scalar;
+	    }
+	  nd = (int) dims[0];
+	  nomax = span = dims[1];
+	  ivae = iva + size * nomax;
+	  colonseen = 0;
+	  if (k = getdimen (&ch, dn, size, nomax, &b))
+	    errfl (a->cierr, k, where);
+	  no = dn->extent;
+	  b0 = dims[2];
+	  dims1 = dims += 3;
+	  ex = 1;
+	  for (n = 1; n++ < nd; dims++)
+	    {
+	      if (ch != ',')
+		errfl (a->cierr, 115, where);
+	      dn1 = dn + 1;
+	      span /= *dims;
+	      if (k = getdimen (&ch, dn1, dn->delta ** dims, span, &b1))
+		errfl (a->cierr, k, where);
+	      ex *= *dims;
+	      b += b1 * ex;
+	      no *= dn1->extent;
+	      dn = dn1;
+	    }
+	  if (ch != ')')
+	    errfl (a->cierr, 115, where);
+	  readall = 1 - colonseen;
+	  b -= b0;
+	  if (b < 0 || b >= nomax)
+	    errfl (a->cierr, 125, where);
+	  iva += size * b;
+	  dims = dims1;
+	  while (GETC (ch) <= ' ' && ch >= 0);
+	  no1 = 1;
+	  dn0 = dimens;
+	  if (type == TYCHAR && ch == '(' /*) */ )
+	    {
+	      if (k = getdimen (&ch, &substr, size, size, &b))
+		errfl (a->cierr, k, where);
+	      if (ch != ')')
+		errfl (a->cierr, 115, where);
+	      b1 = substr.extent;
+	      if (--b < 0 || b + b1 > size)
+		return 124;
+	      iva += b;
+	      b0 = size;
+	      size = b1;
+	      while (GETC (ch) <= ' ' && ch >= 0);
+	      if (b1 < b0)
+		goto delta_adj;
+	    }
+	  if (readall)
+	    goto delta_adj;
+	  for (; dn0 < dn; dn0++)
+	    {
+	      if (dn0->extent != *dims++ || dn0->stride != 1)
+		break;
+	      no1 *= dn0->extent;
+	    }
+	  if (dn0 == dimens && dimens[0].stride == 1)
+	    {
+	      no1 = dimens[0].extent;
+	      dn0++;
+	    }
+	delta_adj:
+	  ex = 0;
+	  for (dn1 = dn0; dn1 <= dn; dn1++)
+	    ex += (dn1->extent - 1) * (dn1->delta *= dn1->stride);
+	  for (dn1 = dn; dn1 > dn0; dn1--)
+	    {
+	      ex -= (dn1->extent - 1) * dn1->delta;
+	      dn1->delta -= ex;
+	    }
+	}
+      else if (dims = v->dims)
+	{
+	  no = no1 = dims[1];
+	  ivae = iva + no * size;
+	}
+      else
+      scalar:
+	no = no1 = 1;
+      if (ch != '=')
+	errfl (a->cierr, 115, where);
+      got1 = nml_read = 1;
+      f__lcount = 0;
+    readloop:
+      for (;;)
 	{
-		fprintf(stderr,
-			"Skipping namelist \"%s\": seeking namelist \"%s\".\n",
-			buf, nl->name);
-		fflush(stderr);
-		for(;;) switch(GETC(ch)) {
-			case EOF:
-				err(a->ciend, EOF, where0);
-			case '/':
-			case '&':
-			case '$':
-				if (f__external)
-					e_rsle();
-				else
-					z_rnew();
-				goto top;
-			case '"':
-			case '\'':
-				quote = ch;
- more_quoted:
-				while(GETC(ch) != quote)
-					if (ch == EOF)
-						err(a->ciend, EOF, where0);
-				if (GETC(ch) == quote)
-					goto more_quoted;
-				Ungetc(ch,f__cf);
-			default:
-				continue;
-			}
+	  if (iva >= ivae || iva < 0)
+	    {
+	      f__lquit = 1;
+	      goto mustend;
+	    }
+	  else if (iva + no1 * size > ivae)
+	    no1 = (ivae - iva) / size;
+	  f__lquit = 0;
+	  if (k = l_read (&no1, vaddr + iva, size, type))
+	    return k;
+	  if (f__lquit == 1)
+	    return 0;
+	  if (readall)
+	    {
+	      iva += dn0->delta;
+	      if (f__lcount > 0)
+		{
+		  no1 = (ivae - iva) / size;
+		  if (no1 > f__lcount)
+		    no1 = f__lcount;
+		  if (k = l_read (&no1, vaddr + iva, size, type))
+		    return k;
+		  iva += no1 * dn0->delta;
 		}
-#endif
-	ht = mk_hashtab(nl);
-	if (!ht)
-		errfl(f__elist->cierr, 113, where0);
-	for(;;) {
-		for(;;) switch(GETC(ch)) {
-			case EOF:
-				if (got1)
-					return 0;
-				err(a->ciend, EOF, where0);
-			case '/':
-			case '$':
-			case '&':
-				return 0;
-			default:
-				if (ch <= ' ' && ch >= 0 || ch == ',')
-					continue;
-				Ungetc(ch,f__cf);
-				if (ch = getname(buf,sizeof(buf)))
-					return ch;
-				goto havename;
-			}
- havename:
-		v = hash(ht,buf);
-		if (!v)
-			errfl(a->cierr, 119, where);
-		while(GETC(ch) <= ' ' && ch >= 0);
-		vaddr = v->addr;
-		type = v->type;
-		if (type < 0) {
-			size = -type;
-			type = TYCHAR;
-			}
-		else
-			size = f__typesize[type];
-		ivae = size;
-		iva = readall = 0;
-		if (ch == '(' /*)*/ ) {
-			dn = dimens;
-			if (!(dims = v->dims)) {
-				if (type != TYCHAR)
-					errfl(a->cierr, 122, where);
-				if (k = getdimen(&ch, dn, (ftnlen)size,
-						(ftnlen)size, &b))
-					errfl(a->cierr, k, where);
-				if (ch != ')')
-					errfl(a->cierr, 115, where);
-				b1 = dn->extent;
-				if (--b < 0 || b + b1 > size)
-					return 124;
-				iva += b;
-				size = b1;
-				while(GETC(ch) <= ' ' && ch >= 0);
-				goto scalar;
-				}
-			nd = (int)dims[0];
-			nomax = span = dims[1];
-			ivae = iva + size*nomax;
-			colonseen = 0;
-			if (k = getdimen(&ch, dn, size, nomax, &b))
-				errfl(a->cierr, k, where);
-			no = dn->extent;
-			b0 = dims[2];
-			dims1 = dims += 3;
-			ex = 1;
-			for(n = 1; n++ < nd; dims++) {
-				if (ch != ',')
-					errfl(a->cierr, 115, where);
-				dn1 = dn + 1;
-				span /= *dims;
-				if (k = getdimen(&ch, dn1, dn->delta**dims,
-						span, &b1))
-					errfl(a->cierr, k, where);
-				ex *= *dims;
-				b += b1*ex;
-				no *= dn1->extent;
-				dn = dn1;
-				}
-			if (ch != ')')
-				errfl(a->cierr, 115, where);
-			readall = 1 - colonseen;
-			b -= b0;
-			if (b < 0 || b >= nomax)
-				errfl(a->cierr, 125, where);
-			iva += size * b;
-			dims = dims1;
-			while(GETC(ch) <= ' ' && ch >= 0);
-			no1 = 1;
-			dn0 = dimens;
-			if (type == TYCHAR && ch == '(' /*)*/) {
-				if (k = getdimen(&ch, &substr, size, size, &b))
-					errfl(a->cierr, k, where);
-				if (ch != ')')
-					errfl(a->cierr, 115, where);
-				b1 = substr.extent;
-				if (--b < 0 || b + b1 > size)
-					return 124;
-				iva += b;
-				b0 = size;
-				size = b1;
-				while(GETC(ch) <= ' ' && ch >= 0);
-				if (b1 < b0)
-					goto delta_adj;
-				}
-			if (readall)
-				goto delta_adj;
-			for(; dn0 < dn; dn0++) {
-				if (dn0->extent != *dims++ || dn0->stride != 1)
-					break;
-				no1 *= dn0->extent;
-				}
-			if (dn0 == dimens && dimens[0].stride == 1) {
-				no1 = dimens[0].extent;
-				dn0++;
-				}
- delta_adj:
-			ex = 0;
-			for(dn1 = dn0; dn1 <= dn; dn1++)
-				ex += (dn1->extent-1)
-					* (dn1->delta *= dn1->stride);
-			for(dn1 = dn; dn1 > dn0; dn1--) {
-				ex -= (dn1->extent - 1) * dn1->delta;
-				dn1->delta -= ex;
-				}
-			}
-		else if (dims = v->dims) {
-			no = no1 = dims[1];
-			ivae = iva + no*size;
-			}
-		else
- scalar:
-			no = no1 = 1;
-		if (ch != '=')
-			errfl(a->cierr, 115, where);
-		got1 = nml_read = 1;
-		f__lcount = 0;
-	 readloop:
-		for(;;) {
-			if (iva >= ivae || iva < 0) {
-				f__lquit = 1;
-				goto mustend;
-				}
-			else if (iva + no1*size > ivae)
-				no1 = (ivae - iva)/size;
-			f__lquit = 0;
-			if (k = l_read(&no1, vaddr + iva, size, type))
-				return k;
-			if (f__lquit == 1)
-				return 0;
-			if (readall) {
-				iva += dn0->delta;
-				if (f__lcount > 0) {
-					no1 = (ivae - iva)/size;
-					if (no1 > f__lcount)
-						no1 = f__lcount;
-					if (k = l_read(&no1, vaddr + iva,
-							size, type))
-						return k;
-					iva += no1 * dn0->delta;
-					}
-				}
- mustend:
-			GETC(ch);
-			if (readall)
-				if (iva >= ivae)
-					readall = 0;
-				else for(;;) {
-					switch(ch) {
-						case ' ':
-						case '\t':
-						case '\n':
-							GETC(ch);
-							continue;
-						}
-					break;
-					}
-			if (ch == '/' || ch == '$' || ch == '&') {
-				f__lquit = 1;
-				return 0;
-				}
-			else if (f__lquit) {
-				while(ch <= ' ' && ch >= 0)
-					GETC(ch);
-				Ungetc(ch,f__cf);
-				if (!Alpha[ch & 0xff] && ch >= 0)
-					errfl(a->cierr, 125, where);
-				break;
-				}
-			Ungetc(ch,f__cf);
-			if (readall && !Alpha[ch & 0xff])
-				goto readloop;
-			if ((no -= no1) <= 0)
-				break;
-			for(dn1 = dn0; dn1 <= dn; dn1++) {
-				if (++dn1->curval < dn1->extent) {
-					iva += dn1->delta;
-					goto readloop;
-					}
-				dn1->curval = 0;
-				}
-			break;
-			}
+	    }
+	mustend:
+	  GETC (ch);
+	  if (readall)
+	    if (iva >= ivae)
+	      readall = 0;
+	    else
+	      for (;;)
+		{
+		  switch (ch)
+		    {
+		    case ' ':
+		    case '\t':
+		    case '\n':
+		      GETC (ch);
+		      continue;
+		    }
+		  break;
 		}
+	  if (ch == '/' || ch == '$' || ch == '&')
+	    {
+	      f__lquit = 1;
+	      return 0;
+	    }
+	  else if (f__lquit)
+	    {
+	      while (ch <= ' ' && ch >= 0)
+		GETC (ch);
+	      Ungetc (ch, f__cf);
+	      if (!Alpha[ch & 0xff] && ch >= 0)
+		errfl (a->cierr, 125, where);
+	      break;
+	    }
+	  Ungetc (ch, f__cf);
+	  if (readall && !Alpha[ch & 0xff])
+	    goto readloop;
+	  if ((no -= no1) <= 0)
+	    break;
+	  for (dn1 = dn0; dn1 <= dn; dn1++)
+	    {
+	      if (++dn1->curval < dn1->extent)
+		{
+		  iva += dn1->delta;
+		  goto readloop;
+		}
+	      dn1->curval = 0;
+	    }
+	  break;
 	}
+    }
+}
 
- integer
-s_rsne(cilist *a)
+integer
+s_rsne (cilist * a)
 {
-	extern int l_eof;
-	int n;
+  extern int l_eof;
+  int n;
 
-	f__external=1;
-	l_eof = 0;
-	if(n = c_le(a))
-		return n;
-	if(f__curunit->uwrt && f__nowreading(f__curunit))
-		err(a->cierr,errno,where0);
-	l_getc = t_getc;
-	l_ungetc = un_getc;
-	f__doend = xrd_SL;
-	n = x_rsne(a);
-	nml_read = 0;
-	if (n)
-		return n;
-	return e_rsle();
-	}
+  f__external = 1;
+  l_eof = 0;
+  if (n = c_le (a))
+    return n;
+  if (f__curunit->uwrt && f__nowreading (f__curunit))
+    err (a->cierr, errno, where0);
+  l_getc = t_getc;
+  l_ungetc = un_getc;
+  f__doend = xrd_SL;
+  n = x_rsne (a);
+  nml_read = 0;
+  if (n)
+    return n;
+  return e_rsle ();
+}
diff -rup orig/egcc-CVS20020531/libf2c/libI77/sfe.c egcc-CVS20020531/libf2c/libI77/sfe.c
--- orig/egcc-CVS20020531/libf2c/libI77/sfe.c	2002-05-31 21:56:20.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/sfe.c	2002-05-31 23:15:41.306671215 -0400
@@ -5,31 +5,39 @@
 
 extern char *f__fmtbuf;
 
-integer e_rsfe(void)
-{	int n;
-	f__init = 1;
-	n=en_fio();
-	f__fmtbuf=NULL;
-	return(n);
+integer
+e_rsfe (void)
+{
+  int n;
+  f__init = 1;
+  n = en_fio ();
+  f__fmtbuf = NULL;
+  return (n);
 }
-c_sfe(cilist *a) /* check */
-{	unit *p;
-	if(a->ciunit >= MXUNIT || a->ciunit<0)
-		err(a->cierr,101,"startio");
-	p = &f__units[a->ciunit];
-	if(p->ufd==NULL && fk_open(SEQ,FMT,a->ciunit)) err(a->cierr,114,"sfe");
-	if(!p->ufmt) err(a->cierr,102,"sfe");
-	return(0);
+
+c_sfe (cilist * a)		/* check */
+{
+  unit *p;
+  if (a->ciunit >= MXUNIT || a->ciunit < 0)
+    err (a->cierr, 101, "startio");
+  p = &f__units[a->ciunit];
+  if (p->ufd == NULL && fk_open (SEQ, FMT, a->ciunit))
+    err (a->cierr, 114, "sfe");
+  if (!p->ufmt)
+    err (a->cierr, 102, "sfe");
+  return (0);
 }
-integer e_wsfe(void)
+
+integer
+e_wsfe (void)
 {
-	int n;
-	f__init = 1;
-	n = en_fio();
-	f__fmtbuf=NULL;
+  int n;
+  f__init = 1;
+  n = en_fio ();
+  f__fmtbuf = NULL;
 #ifdef ALWAYS_FLUSH
-	if (!n && fflush(f__cf))
-		err(f__elist->cierr, errno, "write end");
+  if (!n && fflush (f__cf))
+    err (f__elist->cierr, errno, "write end");
 #endif
-	return n;
+  return n;
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/sue.c egcc-CVS20020531/libf2c/libI77/sue.c
--- orig/egcc-CVS20020531/libf2c/libI77/sue.c	2002-05-31 21:56:20.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/sue.c	2002-05-31 23:15:41.306671215 -0400
@@ -4,73 +4,89 @@
 extern uiolen f__reclen;
 off_t f__recloc;
 
-c_sue(cilist *a)
+c_sue (cilist * a)
 {
-	f__external=f__sequential=1;
-	f__formatted=0;
-	f__curunit = &f__units[a->ciunit];
-	if(a->ciunit >= MXUNIT || a->ciunit < 0)
-		err(a->cierr,101,"startio");
-	f__elist=a;
-	if(f__curunit->ufd==NULL && fk_open(SEQ,UNF,a->ciunit))
-		err(a->cierr,114,"sue");
-	f__cf=f__curunit->ufd;
-	if(f__curunit->ufmt) err(a->cierr,103,"sue");
-	if(!f__curunit->useek) err(a->cierr,103,"sue");
-	return(0);
+  f__external = f__sequential = 1;
+  f__formatted = 0;
+  f__curunit = &f__units[a->ciunit];
+  if (a->ciunit >= MXUNIT || a->ciunit < 0)
+    err (a->cierr, 101, "startio");
+  f__elist = a;
+  if (f__curunit->ufd == NULL && fk_open (SEQ, UNF, a->ciunit))
+    err (a->cierr, 114, "sue");
+  f__cf = f__curunit->ufd;
+  if (f__curunit->ufmt)
+    err (a->cierr, 103, "sue");
+  if (!f__curunit->useek)
+    err (a->cierr, 103, "sue");
+  return (0);
 }
-integer s_rsue(cilist *a)
+
+integer
+s_rsue (cilist * a)
 {
-	int n;
-	if(f__init != 1) f_init();
-	f__init = 3;
-	f__reading=1;
-	if(n=c_sue(a)) return(n);
-	f__recpos=0;
-	if(f__curunit->uwrt && f__nowreading(f__curunit))
-		err(a->cierr, errno, "read start");
-	if(fread((char *)&f__reclen,sizeof(uiolen),1,f__cf)
-		!= 1)
-	{	if(feof(f__cf))
-		{	f__curunit->uend = 1;
-			err(a->ciend, EOF, "start");
-		}
-		clearerr(f__cf);
-		err(a->cierr, errno, "start");
+  int n;
+  if (f__init != 1)
+    f_init ();
+  f__init = 3;
+  f__reading = 1;
+  if (n = c_sue (a))
+    return (n);
+  f__recpos = 0;
+  if (f__curunit->uwrt && f__nowreading (f__curunit))
+    err (a->cierr, errno, "read start");
+  if (fread ((char *) &f__reclen, sizeof (uiolen), 1, f__cf) != 1)
+    {
+      if (feof (f__cf))
+	{
+	  f__curunit->uend = 1;
+	  err (a->ciend, EOF, "start");
 	}
-	return(0);
+      clearerr (f__cf);
+      err (a->cierr, errno, "start");
+    }
+  return (0);
 }
-integer s_wsue(cilist *a)
+
+integer
+s_wsue (cilist * a)
 {
-	int n;
-	if(f__init != 1) f_init();
-	f__init = 3;
-	if(n=c_sue(a)) return(n);
-	f__reading=0;
-	f__reclen=0;
-	if(f__curunit->uwrt != 1 && f__nowwriting(f__curunit))
-		err(a->cierr, errno, "write start");
-	f__recloc=FTELL(f__cf);
-	FSEEK(f__cf,(off_t)sizeof(uiolen),SEEK_CUR);
-	return(0);
+  int n;
+  if (f__init != 1)
+    f_init ();
+  f__init = 3;
+  if (n = c_sue (a))
+    return (n);
+  f__reading = 0;
+  f__reclen = 0;
+  if (f__curunit->uwrt != 1 && f__nowwriting (f__curunit))
+    err (a->cierr, errno, "write start");
+  f__recloc = FTELL (f__cf);
+  FSEEK (f__cf, (off_t) sizeof (uiolen), SEEK_CUR);
+  return (0);
 }
-integer e_wsue(void)
-{	off_t loc;
-	f__init = 1;
-	fwrite((char *)&f__reclen,sizeof(uiolen),1,f__cf);
+
+integer
+e_wsue (void)
+{
+  off_t loc;
+  f__init = 1;
+  fwrite ((char *) &f__reclen, sizeof (uiolen), 1, f__cf);
 #ifdef ALWAYS_FLUSH
-	if (fflush(f__cf))
-		err(f__elist->cierr, errno, "write end");
+  if (fflush (f__cf))
+    err (f__elist->cierr, errno, "write end");
 #endif
-	loc=FTELL(f__cf);
-	FSEEK(f__cf,f__recloc,SEEK_SET);
-	fwrite((char *)&f__reclen,sizeof(uiolen),1,f__cf);
-	FSEEK(f__cf,loc,SEEK_SET);
-	return(0);
+  loc = FTELL (f__cf);
+  FSEEK (f__cf, f__recloc, SEEK_SET);
+  fwrite ((char *) &f__reclen, sizeof (uiolen), 1, f__cf);
+  FSEEK (f__cf, loc, SEEK_SET);
+  return (0);
 }
-integer e_rsue(void)
+
+integer
+e_rsue (void)
 {
-	f__init = 1;
-	FSEEK(f__cf,(off_t)(f__reclen-f__recpos+sizeof(uiolen)),SEEK_CUR);
-	return(0);
+  f__init = 1;
+  FSEEK (f__cf, (off_t) (f__reclen - f__recpos + sizeof (uiolen)), SEEK_CUR);
+  return (0);
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/typesize.c egcc-CVS20020531/libf2c/libI77/typesize.c
--- orig/egcc-CVS20020531/libf2c/libI77/typesize.c	2001-05-16 16:30:36.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/typesize.c	2002-05-31 23:15:41.306671215 -0400
@@ -1,13 +1,14 @@
 #include "config.h"
 #include "f2c.h"
 
-ftnlen f__typesize[] = { 0, 0, sizeof(shortint), sizeof(integer),
-			sizeof(real), sizeof(doublereal),
-			sizeof(complex), sizeof(doublecomplex),
-			sizeof(logical), sizeof(char),
-			0, sizeof(integer1),
-			sizeof(logical1), sizeof(shortlogical),
+ftnlen f__typesize[] = { 0, 0, sizeof (shortint), sizeof (integer),
+  sizeof (real), sizeof (doublereal),
+  sizeof (complex), sizeof (doublecomplex),
+  sizeof (logical), sizeof (char),
+  0, sizeof (integer1),
+  sizeof (logical1), sizeof (shortlogical),
 #ifdef Allow_TYQUAD
-			sizeof(longint),
+  sizeof (longint),
 #endif
-			0};
+  0
+};
diff -rup orig/egcc-CVS20020531/libf2c/libI77/uio.c egcc-CVS20020531/libf2c/libI77/uio.c
--- orig/egcc-CVS20020531/libf2c/libI77/uio.c	2002-05-31 21:47:45.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/uio.c	2002-05-31 23:15:41.306671215 -0400
@@ -3,51 +3,56 @@
 #include <sys/types.h>
 uiolen f__reclen;
 
-do_us(ftnint *number, char *ptr, ftnlen len)
+do_us (ftnint * number, char *ptr, ftnlen len)
 {
-	if(f__reading)
-	{
-		f__recpos += (int)(*number * len);
-		if(f__recpos>f__reclen)
-			err(f__elist->cierr, 110, "do_us");
-		if (fread(ptr,(size_t)len,(size_t)(*number),f__cf) != *number)
-			err(f__elist->ciend, EOF, "do_us");
-		return(0);
-	}
-	else
-	{
-		f__reclen += *number * len;
-		(void) fwrite(ptr,(size_t)len,(size_t)(*number),f__cf);
-		return(0);
-	}
+  if (f__reading)
+    {
+      f__recpos += (int) (*number * len);
+      if (f__recpos > f__reclen)
+	err (f__elist->cierr, 110, "do_us");
+      if (fread (ptr, (size_t) len, (size_t) (*number), f__cf) != *number)
+	err (f__elist->ciend, EOF, "do_us");
+      return (0);
+    }
+  else
+    {
+      f__reclen += *number * len;
+      (void) fwrite (ptr, (size_t) len, (size_t) (*number), f__cf);
+      return (0);
+    }
 }
-integer do_ud(ftnint *number, char *ptr, ftnlen len)
+integer
+do_ud (ftnint * number, char *ptr, ftnlen len)
 {
-	f__recpos += (int)(*number * len);
-	if(f__recpos > f__curunit->url && f__curunit->url!=1)
-		err(f__elist->cierr,110,"do_ud");
-	if(f__reading)
-	{
+  f__recpos += (int) (*number * len);
+  if (f__recpos > f__curunit->url && f__curunit->url != 1)
+    err (f__elist->cierr, 110, "do_ud");
+  if (f__reading)
+    {
 #ifdef Pad_UDread
-	size_t i;
-		if (!(i = fread(ptr,(size_t)len,(size_t)(*number),f__cf))
-		 && !(f__recpos - *number*len))
-			err(f__elist->cierr,EOF,"do_ud");
-		if (i < *number)
-			memset(ptr + i*len, 0, (*number - i)*len);
-		return 0;
+      size_t i;
+      if (!(i = fread (ptr, (size_t) len, (size_t) (*number), f__cf))
+	  && !(f__recpos - *number * len))
+	err (f__elist->cierr, EOF, "do_ud");
+      if (i < *number)
+	memset (ptr + i * len, 0, (*number - i) * len);
+      return 0;
 #else
-		if(fread(ptr,(size_t)len,(size_t)(*number),f__cf) != *number)
-			err(f__elist->cierr,EOF,"do_ud");
-		else return(0);
+      if (fread (ptr, (size_t) len, (size_t) (*number), f__cf) != *number)
+	err (f__elist->cierr, EOF, "do_ud");
+      else
+	return (0);
 #endif
-	}
-	(void) fwrite(ptr,(size_t)len,(size_t)(*number),f__cf);
-	return(0);
+    }
+  (void) fwrite (ptr, (size_t) len, (size_t) (*number), f__cf);
+  return (0);
 }
-integer do_uio(ftnint *number, char *ptr, ftnlen len)
+
+integer
+do_uio (ftnint * number, char *ptr, ftnlen len)
 {
-	if(f__sequential)
-		return(do_us(number,ptr,len));
-	else	return(do_ud(number,ptr,len));
+  if (f__sequential)
+    return (do_us (number, ptr, len));
+  else
+    return (do_ud (number, ptr, len));
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/util.c egcc-CVS20020531/libf2c/libI77/util.c
--- orig/egcc-CVS20020531/libf2c/libI77/util.c	2002-05-31 21:56:20.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/util.c	2002-05-31 23:15:41.316671532 -0400
@@ -9,34 +9,44 @@
 #include "fio.h"
 
 void
-g_char(char *a, ftnlen alen, char *b)
+g_char (char *a, ftnlen alen, char *b)
 {
-	char *x = a + alen, *y = b + alen;
+  char *x = a + alen, *y = b + alen;
 
-	for(;; y--) {
-		if (x <= a) {
-			*b = 0;
-			return;
-			}
-		if (*--x != ' ')
-			break;
-		}
-	*y-- = 0;
-	do *y-- = *x;
-		while(x-- > a);
+  for (;; y--)
+    {
+      if (x <= a)
+	{
+	  *b = 0;
+	  return;
 	}
+      if (*--x != ' ')
+	break;
+    }
+  *y-- = 0;
+  do
+    *y-- = *x;
+  while (x-- > a);
+}
 
 void
-b_char(char *a, char *b, ftnlen blen)
-{	int i;
-	for(i=0;i<blen && *a!=0;i++) *b++= *a++;
-	for(;i<blen;i++) *b++=' ';
+b_char (char *a, char *b, ftnlen blen)
+{
+  int i;
+  for (i = 0; i < blen && *a != 0; i++)
+    *b++ = *a++;
+  for (; i < blen; i++)
+    *b++ = ' ';
 }
+
 #ifndef NON_UNIX_STDIO
-long f__inode(char *a, int *dev)
-{	struct stat x;
-	if(stat(a,&x)<0) return(-1);
-	*dev = x.st_dev;
-	return(x.st_ino);
+long
+f__inode (char *a, int *dev)
+{
+  struct stat x;
+  if (stat (a, &x) < 0)
+    return (-1);
+  *dev = x.st_dev;
+  return (x.st_ino);
 }
 #endif
diff -rup orig/egcc-CVS20020531/libf2c/libI77/wref.c egcc-CVS20020531/libf2c/libI77/wref.c
--- orig/egcc-CVS20020531/libf2c/libI77/wref.c	2002-05-31 21:47:45.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/wref.c	2002-05-31 23:15:41.316671532 -0400
@@ -13,254 +13,290 @@
 #include "fmt.h"
 #include "fp.h"
 
-wrt_E(ufloat *p, int w, int d, int e, ftnlen len)
+wrt_E (ufloat * p, int w, int d, int e, ftnlen len)
 {
-	char buf[FMAX+EXPMAXDIGS+4], *s, *se;
-	int d1, delta, e1, i, sign, signspace;
-	double dd;
+  char buf[FMAX + EXPMAXDIGS + 4], *s, *se;
+  int d1, delta, e1, i, sign, signspace;
+  double dd;
 #ifdef WANT_LEAD_0
-	int insert0 = 0;
+  int insert0 = 0;
 #endif
 #ifndef VAX
-	int e0 = e;
+  int e0 = e;
 #endif
 
-	if(e <= 0)
-		e = 2;
-	if(f__scale) {
-		if(f__scale >= d + 2 || f__scale <= -d)
-			goto nogood;
-		}
-	if(f__scale <= 0)
-		--d;
-	if (len == sizeof(real))
-		dd = p->pf;
-	else
-		dd = p->pd;
-	if (dd < 0.) {
-		signspace = sign = 1;
-		dd = -dd;
-		}
-	else {
-		sign = 0;
-		signspace = (int)f__cplus;
+  if (e <= 0)
+    e = 2;
+  if (f__scale)
+    {
+      if (f__scale >= d + 2 || f__scale <= -d)
+	goto nogood;
+    }
+  if (f__scale <= 0)
+    --d;
+  if (len == sizeof (real))
+    dd = p->pf;
+  else
+    dd = p->pd;
+  if (dd < 0.)
+    {
+      signspace = sign = 1;
+      dd = -dd;
+    }
+  else
+    {
+      sign = 0;
+      signspace = (int) f__cplus;
 #ifndef VAX
-		if (!dd)
-			dd = 0.;	/* avoid -0 */
+      if (!dd)
+	dd = 0.;		/* avoid -0 */
 #endif
-		}
-	delta = w - (2 /* for the . and the d adjustment above */
-			+ 2 /* for the E+ */ + signspace + d + e);
+    }
+  delta = w - (2		/* for the . and the d adjustment above */
+	       + 2 /* for the E+ */  + signspace + d + e);
 #ifdef WANT_LEAD_0
-	if (f__scale <= 0 && delta > 0) {
-		delta--;
-		insert0 = 1;
-		}
-	else
-#endif
-	if (delta < 0) {
-nogood:
-		while(--w >= 0)
-			PUT('*');
-		return(0);
-		}
-	if (f__scale < 0)
-		d += f__scale;
-	if (d > FMAX) {
-		d1 = d - FMAX;
-		d = FMAX;
-		}
-	else
-		d1 = 0;
-	sprintf(buf,"%#.*E", d, dd);
+  if (f__scale <= 0 && delta > 0)
+    {
+      delta--;
+      insert0 = 1;
+    }
+  else
+#endif
+  if (delta < 0)
+    {
+    nogood:
+      while (--w >= 0)
+	PUT ('*');
+      return (0);
+    }
+  if (f__scale < 0)
+    d += f__scale;
+  if (d > FMAX)
+    {
+      d1 = d - FMAX;
+      d = FMAX;
+    }
+  else
+    d1 = 0;
+  sprintf (buf, "%#.*E", d, dd);
 #ifndef VAX
-	/* check for NaN, Infinity */
-	if (!isdigit(buf[0])) {
-		switch(buf[0]) {
-			case 'n':
-			case 'N':
-				signspace = 0;	/* no sign for NaNs */
-			}
-		delta = w - strlen(buf) - signspace;
-		if (delta < 0)
-			goto nogood;
-		while(--delta >= 0)
-			PUT(' ');
-		if (signspace)
-			PUT(sign ? '-' : '+');
-		for(s = buf; *s; s++)
-			PUT(*s);
-		return 0;
-		}
-#endif
-	se = buf + d + 3;
-#ifdef GOOD_SPRINTF_EXPONENT /* When possible, exponent has 2 digits. */
-	if (f__scale != 1 && dd)
-		sprintf(se, "%+.2d", atoi(se) + 1 - f__scale);
+  /* check for NaN, Infinity */
+  if (!isdigit (buf[0]))
+    {
+      switch (buf[0])
+	{
+	case 'n':
+	case 'N':
+	  signspace = 0;	/* no sign for NaNs */
+	}
+      delta = w - strlen (buf) - signspace;
+      if (delta < 0)
+	goto nogood;
+      while (--delta >= 0)
+	PUT (' ');
+      if (signspace)
+	PUT (sign ? '-' : '+');
+      for (s = buf; *s; s++)
+	PUT (*s);
+      return 0;
+    }
+#endif
+  se = buf + d + 3;
+#ifdef GOOD_SPRINTF_EXPONENT	/* When possible, exponent has 2 digits. */
+  if (f__scale != 1 && dd)
+    sprintf (se, "%+.2d", atoi (se) + 1 - f__scale);
 #else
-	if (dd)
-		sprintf(se, "%+.2d", atoi(se) + 1 - f__scale);
-	else
-		strcpy(se, "+00");
-#endif
-	s = ++se;
-	if (e < 2) {
-		if (*s != '0')
-			goto nogood;
-		}
+  if (dd)
+    sprintf (se, "%+.2d", atoi (se) + 1 - f__scale);
+  else
+    strcpy (se, "+00");
+#endif
+  s = ++se;
+  if (e < 2)
+    {
+      if (*s != '0')
+	goto nogood;
+    }
 #ifndef VAX
-	/* accommodate 3 significant digits in exponent */
-	if (s[2]) {
+  /* accommodate 3 significant digits in exponent */
+  if (s[2])
+    {
 #ifdef Pedantic
-		if (!e0 && !s[3])
-			for(s -= 2, e1 = 2; s[0] = s[1]; s++);
+      if (!e0 && !s[3])
+	for (s -= 2, e1 = 2; s[0] = s[1]; s++);
 
-	/* Pedantic gives the behavior that Fortran 77 specifies,	*/
-	/* i.e., requires that E be specified for exponent fields	*/
-	/* of more than 3 digits.  With Pedantic undefined, we get	*/
-	/* the behavior that Cray displays -- you get a bigger		*/
-	/* exponent field if it fits.	*/
+      /* Pedantic gives the behavior that Fortran 77 specifies,       */
+      /* i.e., requires that E be specified for exponent fields       */
+      /* of more than 3 digits.  With Pedantic undefined, we get      */
+      /* the behavior that Cray displays -- you get a bigger          */
+      /* exponent field if it fits.   */
 #else
-		if (!e0) {
-			for(s -= 2, e1 = 2; s[0] = s[1]; s++)
+      if (!e0)
+	{
+	  for (s -= 2, e1 = 2; s[0] = s[1]; s++)
 #ifdef CRAY
-				delta--;
-			if ((delta += 4) < 0)
-				goto nogood
-#endif
-				;
-			}
-#endif
-		else if (e0 >= 0)
-			goto shift;
-		else
-			e1 = e;
-		}
-	else
- shift:
-#endif
-		for(s += 2, e1 = 2; *s; ++e1, ++s)
-			if (e1 >= e)
-				goto nogood;
-	while(--delta >= 0)
-		PUT(' ');
-	if (signspace)
-		PUT(sign ? '-' : '+');
-	s = buf;
-	i = f__scale;
-	if (f__scale <= 0) {
-#ifdef WANT_LEAD_0
-		if (insert0)
-			PUT('0');
+	    delta--;
+	  if ((delta += 4) < 0)
+	    goto nogood
 #endif
-		PUT('.');
-		for(; i < 0; ++i)
-			PUT('0');
-		PUT(*s);
-		s += 2;
-		}
-	else if (f__scale > 1) {
-		PUT(*s);
-		s += 2;
-		while(--i > 0)
-			PUT(*s++);
-		PUT('.');
-		}
-	if (d1) {
-		se -= 2;
-		while(s < se) PUT(*s++);
-		se += 2;
-		do PUT('0'); while(--d1 > 0);
-		}
-	while(s < se)
-		PUT(*s++);
-	if (e < 2)
-		PUT(s[1]);
-	else {
-		while(++e1 <= e)
-			PUT('0');
-		while(*s)
-			PUT(*s++);
-		}
-	return 0;
+	      ;
 	}
+#endif
+      else if (e0 >= 0)
+	goto shift;
+      else
+	e1 = e;
+    }
+  else
+  shift:
+#endif
+    for (s += 2, e1 = 2; *s; ++e1, ++s)
+      if (e1 >= e)
+	goto nogood;
+  while (--delta >= 0)
+    PUT (' ');
+  if (signspace)
+    PUT (sign ? '-' : '+');
+  s = buf;
+  i = f__scale;
+  if (f__scale <= 0)
+    {
+#ifdef WANT_LEAD_0
+      if (insert0)
+	PUT ('0');
+#endif
+      PUT ('.');
+      for (; i < 0; ++i)
+	PUT ('0');
+      PUT (*s);
+      s += 2;
+    }
+  else if (f__scale > 1)
+    {
+      PUT (*s);
+      s += 2;
+      while (--i > 0)
+	PUT (*s++);
+      PUT ('.');
+    }
+  if (d1)
+    {
+      se -= 2;
+      while (s < se)
+	PUT (*s++);
+      se += 2;
+      do
+	PUT ('0');
+      while (--d1 > 0);
+    }
+  while (s < se)
+    PUT (*s++);
+  if (e < 2)
+    PUT (s[1]);
+  else
+    {
+      while (++e1 <= e)
+	PUT ('0');
+      while (*s)
+	PUT (*s++);
+    }
+  return 0;
+}
 
-wrt_F(ufloat *p, int w, int d, ftnlen len)
+wrt_F (ufloat * p, int w, int d, ftnlen len)
 {
-	int d1, sign, n;
-	double x;
-	char *b, buf[MAXINTDIGS+MAXFRACDIGS+4], *s;
-
-	x= (len==sizeof(real)?p->pf:p->pd);
-	if (d < MAXFRACDIGS)
-		d1 = 0;
-	else {
-		d1 = d - MAXFRACDIGS;
-		d = MAXFRACDIGS;
-		}
-	if (x < 0.)
-		{ x = -x; sign = 1; }
-	else {
-		sign = 0;
+  int d1, sign, n;
+  double x;
+  char *b, buf[MAXINTDIGS + MAXFRACDIGS + 4], *s;
+
+  x = (len == sizeof (real) ? p->pf : p->pd);
+  if (d < MAXFRACDIGS)
+    d1 = 0;
+  else
+    {
+      d1 = d - MAXFRACDIGS;
+      d = MAXFRACDIGS;
+    }
+  if (x < 0.)
+    {
+      x = -x;
+      sign = 1;
+    }
+  else
+    {
+      sign = 0;
 #ifndef VAX
-		if (!x)
-			x = 0.;
+      if (!x)
+	x = 0.;
 #endif
-		}
+    }
 
-	if (n = f__scale)
-		if (n > 0)
-			do x *= 10.; while(--n > 0);
-		else
-			do x *= 0.1; while(++n < 0);
+  if (n = f__scale)
+    if (n > 0)
+      do
+	x *= 10.;
+      while (--n > 0);
+    else
+      do
+	x *= 0.1;
+      while (++n < 0);
 
 #ifdef USE_STRLEN
-	sprintf(b = buf, "%#.*f", d, x);
-	n = strlen(b) + d1;
+  sprintf (b = buf, "%#.*f", d, x);
+  n = strlen (b) + d1;
 #else
-	n = sprintf(b = buf, "%#.*f", d, x) + d1;
+  n = sprintf (b = buf, "%#.*f", d, x) + d1;
 #endif
 
 #ifndef WANT_LEAD_0
-	if (buf[0] == '0' && d)
-		{ ++b; --n; }
-#endif
-	if (sign) {
-		/* check for all zeros */
-		for(s = b;;) {
-			while(*s == '0') s++;
-			switch(*s) {
-				case '.':
-					s++; continue;
-				case 0:
-					sign = 0;
-				}
-			break;
-			}
-		}
-	if (sign || f__cplus)
-		++n;
-	if (n > w) {
+  if (buf[0] == '0' && d)
+    {
+      ++b;
+      --n;
+    }
+#endif
+  if (sign)
+    {
+      /* check for all zeros */
+      for (s = b;;)
+	{
+	  while (*s == '0')
+	    s++;
+	  switch (*s)
+	    {
+	    case '.':
+	      s++;
+	      continue;
+	    case 0:
+	      sign = 0;
+	    }
+	  break;
+	}
+    }
+  if (sign || f__cplus)
+    ++n;
+  if (n > w)
+    {
 #ifdef WANT_LEAD_0
-		if (buf[0] == '0' && --n == w)
-			++b;
-		else
-#endif
-		{
-			while(--w >= 0)
-				PUT('*');
-			return 0;
-			}
-		}
-	for(w -= n; --w >= 0; )
-		PUT(' ');
-	if (sign)
-		PUT('-');
-	else if (f__cplus)
-		PUT('+');
-	while(n = *b++)
-		PUT(n);
-	while(--d1 >= 0)
-		PUT('0');
-	return 0;
+      if (buf[0] == '0' && --n == w)
+	++b;
+      else
+#endif
+	{
+	  while (--w >= 0)
+	    PUT ('*');
+	  return 0;
 	}
+    }
+  for (w -= n; --w >= 0;)
+    PUT (' ');
+  if (sign)
+    PUT ('-');
+  else if (f__cplus)
+    PUT ('+');
+  while (n = *b++)
+    PUT (n);
+  while (--d1 >= 0)
+    PUT ('0');
+  return 0;
+}
diff -rup orig/egcc-CVS20020531/libf2c/libI77/wrtfmt.c egcc-CVS20020531/libf2c/libI77/wrtfmt.c
--- orig/egcc-CVS20020531/libf2c/libI77/wrtfmt.c	2002-05-31 21:56:20.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/wrtfmt.c	2002-05-31 23:15:41.326671449 -0400
@@ -6,317 +6,393 @@
 extern icilist *f__svic;
 extern char *f__icptr;
 
- static int
-mv_cur(void)	/* shouldn't use fseek because it insists on calling fflush */
+static int
+mv_cur (void)			/* shouldn't use fseek because it insists on calling fflush */
 		/* instead we know too much about stdio */
 {
-	int cursor = f__cursor;
-	f__cursor = 0;
-	if(f__external == 0) {
-		if(cursor < 0) {
-			if(f__hiwater < f__recpos)
-				f__hiwater = f__recpos;
-			f__recpos += cursor;
-			f__icptr += cursor;
-			if(f__recpos < 0)
-				err(f__elist->cierr, 110, "left off");
-		}
-		else if(cursor > 0) {
-			if(f__recpos + cursor >= f__svic->icirlen)
-				err(f__elist->cierr, 110, "recend");
-			if(f__hiwater <= f__recpos)
-				for(; cursor > 0; cursor--)
-					(*f__putn)(' ');
-			else if(f__hiwater <= f__recpos + cursor) {
-				cursor -= f__hiwater - f__recpos;
-				f__icptr += f__hiwater - f__recpos;
-				f__recpos = f__hiwater;
-				for(; cursor > 0; cursor--)
-					(*f__putn)(' ');
-			}
-			else {
-				f__icptr += cursor;
-				f__recpos += cursor;
-			}
-		}
-		return(0);
+  int cursor = f__cursor;
+  f__cursor = 0;
+  if (f__external == 0)
+    {
+      if (cursor < 0)
+	{
+	  if (f__hiwater < f__recpos)
+	    f__hiwater = f__recpos;
+	  f__recpos += cursor;
+	  f__icptr += cursor;
+	  if (f__recpos < 0)
+	    err (f__elist->cierr, 110, "left off");
 	}
-	if (cursor > 0) {
-		if(f__hiwater <= f__recpos)
-			for(;cursor>0;cursor--) (*f__putn)(' ');
-		else if(f__hiwater <= f__recpos + cursor) {
-			cursor -= f__hiwater - f__recpos;
-			f__recpos = f__hiwater;
-			for(; cursor > 0; cursor--)
-				(*f__putn)(' ');
-		}
-		else {
-			f__recpos += cursor;
-		}
+      else if (cursor > 0)
+	{
+	  if (f__recpos + cursor >= f__svic->icirlen)
+	    err (f__elist->cierr, 110, "recend");
+	  if (f__hiwater <= f__recpos)
+	    for (; cursor > 0; cursor--)
+	      (*f__putn) (' ');
+	  else if (f__hiwater <= f__recpos + cursor)
+	    {
+	      cursor -= f__hiwater - f__recpos;
+	      f__icptr += f__hiwater - f__recpos;
+	      f__recpos = f__hiwater;
+	      for (; cursor > 0; cursor--)
+		(*f__putn) (' ');
+	    }
+	  else
+	    {
+	      f__icptr += cursor;
+	      f__recpos += cursor;
+	    }
+	}
+      return (0);
+    }
+  if (cursor > 0)
+    {
+      if (f__hiwater <= f__recpos)
+	for (; cursor > 0; cursor--)
+	  (*f__putn) (' ');
+      else if (f__hiwater <= f__recpos + cursor)
+	{
+	  cursor -= f__hiwater - f__recpos;
+	  f__recpos = f__hiwater;
+	  for (; cursor > 0; cursor--)
+	    (*f__putn) (' ');
 	}
-	else if (cursor < 0)
+      else
 	{
-		if(cursor + f__recpos < 0)
-			err(f__elist->cierr,110,"left off");
-		if(f__hiwater < f__recpos)
-			f__hiwater = f__recpos;
-		f__recpos += cursor;
+	  f__recpos += cursor;
 	}
-	return(0);
+    }
+  else if (cursor < 0)
+    {
+      if (cursor + f__recpos < 0)
+	err (f__elist->cierr, 110, "left off");
+      if (f__hiwater < f__recpos)
+	f__hiwater = f__recpos;
+      f__recpos += cursor;
+    }
+  return (0);
 }
 
- static int
-wrt_Z(Uint *n, int w, int minlen, ftnlen len)
+static int
+wrt_Z (Uint * n, int w, int minlen, ftnlen len)
 {
-	register char *s, *se;
-	register int i, w1;
-	static int one = 1;
-	static char hex[] = "0123456789ABCDEF";
-	s = (char *)n;
-	--len;
-	if (*(char *)&one) {
-		/* little endian */
-		se = s;
-		s += len;
-		i = -1;
-		}
-	else {
-		se = s + len;
-		i = 1;
-		}
-	for(;; s += i)
-		if (s == se || *s)
-			break;
-	w1 = (i*(se-s) << 1) + 1;
-	if (*s & 0xf0)
-		w1++;
-	if (w1 > w)
-		for(i = 0; i < w; i++)
-			(*f__putn)('*');
-	else {
-		if ((minlen -= w1) > 0)
-			w1 += minlen;
-		while(--w >= w1)
-			(*f__putn)(' ');
-		while(--minlen >= 0)
-			(*f__putn)('0');
-		if (!(*s & 0xf0)) {
-			(*f__putn)(hex[*s & 0xf]);
-			if (s == se)
-				return 0;
-			s += i;
-			}
-		for(;; s += i) {
-			(*f__putn)(hex[*s >> 4 & 0xf]);
-			(*f__putn)(hex[*s & 0xf]);
-			if (s == se)
-				break;
-			}
-		}
-	return 0;
+  register char *s, *se;
+  register int i, w1;
+  static int one = 1;
+  static char hex[] = "0123456789ABCDEF";
+  s = (char *) n;
+  --len;
+  if (*(char *) &one)
+    {
+      /* little endian */
+      se = s;
+      s += len;
+      i = -1;
+    }
+  else
+    {
+      se = s + len;
+      i = 1;
+    }
+  for (;; s += i)
+    if (s == se || *s)
+      break;
+  w1 = (i * (se - s) << 1) + 1;
+  if (*s & 0xf0)
+    w1++;
+  if (w1 > w)
+    for (i = 0; i < w; i++)
+      (*f__putn) ('*');
+  else
+    {
+      if ((minlen -= w1) > 0)
+	w1 += minlen;
+      while (--w >= w1)
+	(*f__putn) (' ');
+      while (--minlen >= 0)
+	(*f__putn) ('0');
+      if (!(*s & 0xf0))
+	{
+	  (*f__putn) (hex[*s & 0xf]);
+	  if (s == se)
+	    return 0;
+	  s += i;
 	}
+      for (;; s += i)
+	{
+	  (*f__putn) (hex[*s >> 4 & 0xf]);
+	  (*f__putn) (hex[*s & 0xf]);
+	  if (s == se)
+	    break;
+	}
+    }
+  return 0;
+}
 
- static int
-wrt_I(Uint *n, int w, ftnlen len, register int base)
-{	int ndigit,sign,spare,i;
-	longint x;
-	char *ans;
-	if(len==sizeof(integer)) x=n->il;
-	else if(len == sizeof(char)) x = n->ic;
+static int
+wrt_I (Uint * n, int w, ftnlen len, register int base)
+{
+  int ndigit, sign, spare, i;
+  longint x;
+  char *ans;
+  if (len == sizeof (integer))
+    x = n->il;
+  else if (len == sizeof (char))
+    x = n->ic;
 #ifdef Allow_TYQUAD
-	else if (len == sizeof(longint)) x = n->ili;
+  else if (len == sizeof (longint))
+    x = n->ili;
 #endif
-	else x=n->is;
-	ans=f__icvt(x,&ndigit,&sign, base);
-	spare=w-ndigit;
-	if(sign || f__cplus) spare--;
-	if(spare<0)
-		for(i=0;i<w;i++) (*f__putn)('*');
-	else
-	{	for(i=0;i<spare;i++) (*f__putn)(' ');
-		if(sign) (*f__putn)('-');
-		else if(f__cplus) (*f__putn)('+');
-		for(i=0;i<ndigit;i++) (*f__putn)(*ans++);
-	}
-	return(0);
+  else
+    x = n->is;
+  ans = f__icvt (x, &ndigit, &sign, base);
+  spare = w - ndigit;
+  if (sign || f__cplus)
+    spare--;
+  if (spare < 0)
+    for (i = 0; i < w; i++)
+      (*f__putn) ('*');
+  else
+    {
+      for (i = 0; i < spare; i++)
+	(*f__putn) (' ');
+      if (sign)
+	(*f__putn) ('-');
+      else if (f__cplus)
+	(*f__putn) ('+');
+      for (i = 0; i < ndigit; i++)
+	(*f__putn) (*ans++);
+    }
+  return (0);
 }
- static int
-wrt_IM(Uint *n, int w, int m, ftnlen len, int base)
-{	int ndigit,sign,spare,i,xsign;
-	longint x;
-	char *ans;
-	if(sizeof(integer)==len) x=n->il;
-	else if(len == sizeof(char)) x = n->ic;
+static int
+wrt_IM (Uint * n, int w, int m, ftnlen len, int base)
+{
+  int ndigit, sign, spare, i, xsign;
+  longint x;
+  char *ans;
+  if (sizeof (integer) == len)
+    x = n->il;
+  else if (len == sizeof (char))
+    x = n->ic;
 #ifdef Allow_TYQUAD
-	else if (len == sizeof(longint)) x = n->ili;
+  else if (len == sizeof (longint))
+    x = n->ili;
 #endif
-	else x=n->is;
-	ans=f__icvt(x,&ndigit,&sign, base);
-	if(sign || f__cplus) xsign=1;
-	else xsign=0;
-	if(ndigit+xsign>w || m+xsign>w)
-	{	for(i=0;i<w;i++) (*f__putn)('*');
-		return(0);
-	}
-	if(x==0 && m==0)
-	{	for(i=0;i<w;i++) (*f__putn)(' ');
-		return(0);
-	}
-	if(ndigit>=m)
-		spare=w-ndigit-xsign;
-	else
-		spare=w-m-xsign;
-	for(i=0;i<spare;i++) (*f__putn)(' ');
-	if(sign) (*f__putn)('-');
-	else if(f__cplus) (*f__putn)('+');
-	for(i=0;i<m-ndigit;i++) (*f__putn)('0');
-	for(i=0;i<ndigit;i++) (*f__putn)(*ans++);
-	return(0);
-}
- static int
-wrt_AP(char *s)
-{	char quote;
-	int i;
-
-	if(f__cursor && (i = mv_cur()))
-		return i;
-	quote = *s++;
-	for(;*s;s++)
-	{	if(*s!=quote) (*f__putn)(*s);
-		else if(*++s==quote) (*f__putn)(*s);
-		else return(1);
-	}
-	return(1);
+  else
+    x = n->is;
+  ans = f__icvt (x, &ndigit, &sign, base);
+  if (sign || f__cplus)
+    xsign = 1;
+  else
+    xsign = 0;
+  if (ndigit + xsign > w || m + xsign > w)
+    {
+      for (i = 0; i < w; i++)
+	(*f__putn) ('*');
+      return (0);
+    }
+  if (x == 0 && m == 0)
+    {
+      for (i = 0; i < w; i++)
+	(*f__putn) (' ');
+      return (0);
+    }
+  if (ndigit >= m)
+    spare = w - ndigit - xsign;
+  else
+    spare = w - m - xsign;
+  for (i = 0; i < spare; i++)
+    (*f__putn) (' ');
+  if (sign)
+    (*f__putn) ('-');
+  else if (f__cplus)
+    (*f__putn) ('+');
+  for (i = 0; i < m - ndigit; i++)
+    (*f__putn) ('0');
+  for (i = 0; i < ndigit; i++)
+    (*f__putn) (*ans++);
+  return (0);
 }
- static int
-wrt_H(int a, char *s)
+static int
+wrt_AP (char *s)
 {
-	int i;
+  char quote;
+  int i;
 
-	if(f__cursor && (i = mv_cur()))
-		return i;
-	while(a--) (*f__putn)(*s++);
-	return(1);
-}
-wrt_L(Uint *n, int len, ftnlen sz)
-{	int i;
-	long x;
-	if(sizeof(long)==sz) x=n->il;
-	else if(sz == sizeof(char)) x = n->ic;
-	else x=n->is;
-	for(i=0;i<len-1;i++)
-		(*f__putn)(' ');
-	if(x) (*f__putn)('T');
-	else (*f__putn)('F');
-	return(0);
-}
- static int
-wrt_A(char *p, ftnlen len)
-{
-	while(len-- > 0) (*f__putn)(*p++);
-	return(0);
-}
- static int
-wrt_AW(char * p, int w, ftnlen len)
-{
-	while(w>len)
-	{	w--;
-		(*f__putn)(' ');
-	}
-	while(w-- > 0)
-		(*f__putn)(*p++);
-	return(0);
-}
-
- static int
-wrt_G(ufloat *p, int w, int d, int e, ftnlen len)
-{	double up = 1,x;
-	int i=0,oldscale,n,j;
-	x = len==sizeof(real)?p->pf:p->pd;
-	if(x < 0 ) x = -x;
-	if(x<.1) {
-		if (x != 0.)
-			return(wrt_E(p,w,d,e,len));
-		i = 1;
-		goto have_i;
-		}
-	for(;i<=d;i++,up*=10)
-	{	if(x>=up) continue;
- have_i:
-		oldscale = f__scale;
-		f__scale = 0;
-		if(e==0) n=4;
-		else	n=e+2;
-		i=wrt_F(p,w-n,d-i,len);
-		for(j=0;j<n;j++) (*f__putn)(' ');
-		f__scale=oldscale;
-		return(i);
-	}
-	return(wrt_E(p,w,d,e,len));
+  if (f__cursor && (i = mv_cur ()))
+    return i;
+  quote = *s++;
+  for (; *s; s++)
+    {
+      if (*s != quote)
+	(*f__putn) (*s);
+      else if (*++s == quote)
+	(*f__putn) (*s);
+      else
+	return (1);
+    }
+  return (1);
 }
-w_ed(struct syl *p, char *ptr, ftnlen len)
+static int
+wrt_H (int a, char *s)
 {
-	int i;
+  int i;
 
-	if(f__cursor && (i = mv_cur()))
-		return i;
-	switch(p->op)
-	{
-	default:
-		fprintf(stderr,"w_ed, unexpected code: %d\n", p->op);
-		sig_die(f__fmtbuf, 1);
-	case I:	return(wrt_I((Uint *)ptr,p->p1,len, 10));
-	case IM:
-		return(wrt_IM((Uint *)ptr,p->p1,p->p2.i[0],len,10));
-
-		/* O and OM don't work right for character, double, complex, */
-		/* or doublecomplex, and they differ from Fortran 90 in */
-		/* showing a minus sign for negative values. */
-
-	case O:	return(wrt_I((Uint *)ptr, p->p1, len, 8));
-	case OM:
-		return(wrt_IM((Uint *)ptr,p->p1,p->p2.i[0],len,8));
-	case L:	return(wrt_L((Uint *)ptr,p->p1, len));
-	case A: return(wrt_A(ptr,len));
-	case AW:
-		return(wrt_AW(ptr,p->p1,len));
-	case D:
-	case E:
-	case EE:
-		return(wrt_E((ufloat *)ptr,p->p1,p->p2.i[0],p->p2.i[1],len));
-	case G:
-	case GE:
-		return(wrt_G((ufloat *)ptr,p->p1,p->p2.i[0],p->p2.i[1],len));
-	case F:	return(wrt_F((ufloat *)ptr,p->p1,p->p2.i[0],len));
-
-		/* Z and ZM assume 8-bit bytes. */
-
-	case Z: return(wrt_Z((Uint *)ptr,p->p1,0,len));
-	case ZM:
-		return(wrt_Z((Uint *)ptr,p->p1,p->p2.i[0],len));
-	}
+  if (f__cursor && (i = mv_cur ()))
+    return i;
+  while (a--)
+    (*f__putn) (*s++);
+  return (1);
 }
-w_ned(struct syl *p)
+
+wrt_L (Uint * n, int len, ftnlen sz)
 {
-	switch(p->op)
-	{
-	default: fprintf(stderr,"w_ned, unexpected code: %d\n", p->op);
-		sig_die(f__fmtbuf, 1);
-	case SLASH:
-		return((*f__donewrec)());
-	case T: f__cursor = p->p1-f__recpos - 1;
-		return(1);
-	case TL: f__cursor -= p->p1;
-		if(f__cursor < -f__recpos)	/* TL1000, 1X */
-			f__cursor = -f__recpos;
-		return(1);
-	case TR:
-	case X:
-		f__cursor += p->p1;
-		return(1);
-	case APOS:
-		return(wrt_AP(p->p2.s));
-	case H:
-		return(wrt_H(p->p1,p->p2.s));
-	}
+  int i;
+  long x;
+  if (sizeof (long) == sz)
+    x = n->il;
+  else if (sz == sizeof (char))
+    x = n->ic;
+  else
+    x = n->is;
+  for (i = 0; i < len - 1; i++)
+    (*f__putn) (' ');
+  if (x)
+    (*f__putn) ('T');
+  else
+    (*f__putn) ('F');
+  return (0);
+}
+static int
+wrt_A (char *p, ftnlen len)
+{
+  while (len-- > 0)
+    (*f__putn) (*p++);
+  return (0);
+}
+static int
+wrt_AW (char *p, int w, ftnlen len)
+{
+  while (w > len)
+    {
+      w--;
+      (*f__putn) (' ');
+    }
+  while (w-- > 0)
+    (*f__putn) (*p++);
+  return (0);
+}
+
+static int
+wrt_G (ufloat * p, int w, int d, int e, ftnlen len)
+{
+  double up = 1, x;
+  int i = 0, oldscale, n, j;
+  x = len == sizeof (real) ? p->pf : p->pd;
+  if (x < 0)
+    x = -x;
+  if (x < .1)
+    {
+      if (x != 0.)
+	return (wrt_E (p, w, d, e, len));
+      i = 1;
+      goto have_i;
+    }
+  for (; i <= d; i++, up *= 10)
+    {
+      if (x >= up)
+	continue;
+    have_i:
+      oldscale = f__scale;
+      f__scale = 0;
+      if (e == 0)
+	n = 4;
+      else
+	n = e + 2;
+      i = wrt_F (p, w - n, d - i, len);
+      for (j = 0; j < n; j++)
+	(*f__putn) (' ');
+      f__scale = oldscale;
+      return (i);
+    }
+  return (wrt_E (p, w, d, e, len));
+}
+
+w_ed (struct syl * p, char *ptr, ftnlen len)
+{
+  int i;
+
+  if (f__cursor && (i = mv_cur ()))
+    return i;
+  switch (p->op)
+    {
+    default:
+      fprintf (stderr, "w_ed, unexpected code: %d\n", p->op);
+      sig_die (f__fmtbuf, 1);
+    case I:
+      return (wrt_I ((Uint *) ptr, p->p1, len, 10));
+    case IM:
+      return (wrt_IM ((Uint *) ptr, p->p1, p->p2.i[0], len, 10));
+
+      /* O and OM don't work right for character, double, complex, */
+      /* or doublecomplex, and they differ from Fortran 90 in */
+      /* showing a minus sign for negative values. */
+
+    case O:
+      return (wrt_I ((Uint *) ptr, p->p1, len, 8));
+    case OM:
+      return (wrt_IM ((Uint *) ptr, p->p1, p->p2.i[0], len, 8));
+    case L:
+      return (wrt_L ((Uint *) ptr, p->p1, len));
+    case A:
+      return (wrt_A (ptr, len));
+    case AW:
+      return (wrt_AW (ptr, p->p1, len));
+    case D:
+    case E:
+    case EE:
+      return (wrt_E ((ufloat *) ptr, p->p1, p->p2.i[0], p->p2.i[1], len));
+    case G:
+    case GE:
+      return (wrt_G ((ufloat *) ptr, p->p1, p->p2.i[0], p->p2.i[1], len));
+    case F:
+      return (wrt_F ((ufloat *) ptr, p->p1, p->p2.i[0], len));
+
+      /* Z and ZM assume 8-bit bytes. */
+
+    case Z:
+      return (wrt_Z ((Uint *) ptr, p->p1, 0, len));
+    case ZM:
+      return (wrt_Z ((Uint *) ptr, p->p1, p->p2.i[0], len));
+    }
+}
+
+w_ned (struct syl * p)
+{
+  switch (p->op)
+    {
+    default:
+      fprintf (stderr, "w_ned, unexpected code: %d\n", p->op);
+      sig_die (f__fmtbuf, 1);
+    case SLASH:
+      return ((*f__donewrec) ());
+    case T:
+      f__cursor = p->p1 - f__recpos - 1;
+      return (1);
+    case TL:
+      f__cursor -= p->p1;
+      if (f__cursor < -f__recpos)	/* TL1000, 1X */
+	f__cursor = -f__recpos;
+      return (1);
+    case TR:
+    case X:
+      f__cursor += p->p1;
+      return (1);
+    case APOS:
+      return (wrt_AP (p->p2.s));
+    case H:
+      return (wrt_H (p->p1, p->p2.s));
+    }
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/wsfe.c egcc-CVS20020531/libf2c/libI77/wsfe.c
--- orig/egcc-CVS20020531/libf2c/libI77/wsfe.c	2002-05-31 21:56:20.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/wsfe.c	2002-05-31 23:15:41.326671449 -0400
@@ -5,68 +5,75 @@
 #include "fmt.h"
 extern int f__hiwater;
 
- int
-x_wSL(void)
+int
+x_wSL (void)
 {
-	int n = f__putbuf('\n');
-	f__hiwater = f__recpos = f__cursor = 0;
-	return(n == 0);
+  int n = f__putbuf ('\n');
+  f__hiwater = f__recpos = f__cursor = 0;
+  return (n == 0);
 }
 
- static int
-xw_end(void)
+static int
+xw_end (void)
 {
-	int n;
+  int n;
 
-	if(f__nonl) {
-		f__putbuf(n = 0);
-		fflush(f__cf);
-		}
-	else
-		n = f__putbuf('\n');
-	f__hiwater = f__recpos = f__cursor = 0;
-	return n;
+  if (f__nonl)
+    {
+      f__putbuf (n = 0);
+      fflush (f__cf);
+    }
+  else
+    n = f__putbuf ('\n');
+  f__hiwater = f__recpos = f__cursor = 0;
+  return n;
 }
 
- static int
-xw_rev(void)
+static int
+xw_rev (void)
 {
-	int n = 0;
-	if(f__workdone) {
-		n = f__putbuf('\n');
-		f__workdone = 0;
-		}
-	f__hiwater = f__recpos = f__cursor = 0;
-	return n;
+  int n = 0;
+  if (f__workdone)
+    {
+      n = f__putbuf ('\n');
+      f__workdone = 0;
+    }
+  f__hiwater = f__recpos = f__cursor = 0;
+  return n;
 }
 
-integer s_wsfe(cilist *a)	/*start*/
-{	int n;
-	if(f__init != 1) f_init();
-	f__init = 3;
-	f__reading=0;
-	f__sequential=1;
-	f__formatted=1;
-	f__external=1;
-	if(n=c_sfe(a)) return(n);
-	f__elist=a;
-	f__hiwater = f__cursor=f__recpos=0;
-	f__nonl = 0;
-	f__scale=0;
-	f__fmtbuf=a->cifmt;
-	f__curunit = &f__units[a->ciunit];
-	f__cf=f__curunit->ufd;
-	if(pars_f(f__fmtbuf)<0) err(a->cierr,100,"startio");
-	f__putn= x_putc;
-	f__doed= w_ed;
-	f__doned= w_ned;
-	f__doend=xw_end;
-	f__dorevert=xw_rev;
-	f__donewrec=x_wSL;
-	fmt_bg();
-	f__cplus=0;
-	f__cblank=f__curunit->ublnk;
-	if(f__curunit->uwrt != 1 && f__nowwriting(f__curunit))
-		err(a->cierr,errno,"write start");
-	return(0);
+integer
+s_wsfe (cilist * a)		/*start */
+{
+  int n;
+  if (f__init != 1)
+    f_init ();
+  f__init = 3;
+  f__reading = 0;
+  f__sequential = 1;
+  f__formatted = 1;
+  f__external = 1;
+  if (n = c_sfe (a))
+    return (n);
+  f__elist = a;
+  f__hiwater = f__cursor = f__recpos = 0;
+  f__nonl = 0;
+  f__scale = 0;
+  f__fmtbuf = a->cifmt;
+  f__curunit = &f__units[a->ciunit];
+  f__cf = f__curunit->ufd;
+  if (pars_f (f__fmtbuf) < 0)
+    err (a->cierr, 100, "startio");
+  f__putn = x_putc;
+  f__doed = w_ed;
+  f__doned = w_ned;
+  f__doend = xw_end;
+  f__dorevert = xw_rev;
+  f__donewrec = x_wSL;
+  fmt_bg ();
+  f__cplus = 0;
+  f__cblank = f__curunit->ublnk;
+  if (f__curunit->uwrt != 1 && f__nowwriting (f__curunit))
+    err (a->cierr, errno, "write start");
+  return (0);
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/wsle.c egcc-CVS20020531/libf2c/libI77/wsle.c
--- orig/egcc-CVS20020531/libf2c/libI77/wsle.c	2002-05-31 21:56:20.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/wsle.c	2002-05-31 23:15:41.336671485 -0400
@@ -5,31 +5,34 @@
 #include "lio.h"
 #include "string.h"
 
-integer s_wsle(cilist *a)
+integer
+s_wsle (cilist * a)
 {
-	int n;
-	if(n=c_le(a)) return(n);
-	f__reading=0;
-	f__external=1;
-	f__formatted=1;
-	f__putn = x_putc;
-	f__lioproc = l_write;
-	L_len = LINE;
-	f__donewrec = x_wSL;
-	if(f__curunit->uwrt != 1 && f__nowwriting(f__curunit))
-		err(a->cierr, errno, "list output start");
-	return(0);
-	}
+  int n;
+  if (n = c_le (a))
+    return (n);
+  f__reading = 0;
+  f__external = 1;
+  f__formatted = 1;
+  f__putn = x_putc;
+  f__lioproc = l_write;
+  L_len = LINE;
+  f__donewrec = x_wSL;
+  if (f__curunit->uwrt != 1 && f__nowwriting (f__curunit))
+    err (a->cierr, errno, "list output start");
+  return (0);
+}
 
-integer e_wsle(void)
+integer
+e_wsle (void)
 {
-	int n;
-	f__init = 1;
-	n = f__putbuf('\n');
-	f__recpos=0;
+  int n;
+  f__init = 1;
+  n = f__putbuf ('\n');
+  f__recpos = 0;
 #ifdef ALWAYS_FLUSH
-	if (!n && fflush(f__cf))
-		err(f__elist->cierr, errno, "write end");
+  if (!n && fflush (f__cf))
+    err (f__elist->cierr, errno, "write end");
 #endif
-	return(n);
-	}
+  return (n);
+}
diff -rup orig/egcc-CVS20020531/libf2c/libI77/wsne.c egcc-CVS20020531/libf2c/libI77/wsne.c
--- orig/egcc-CVS20020531/libf2c/libI77/wsne.c	2002-05-31 21:47:45.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/wsne.c	2002-05-31 23:15:41.336671485 -0400
@@ -2,21 +2,21 @@
 #include "fio.h"
 #include "lio.h"
 
- integer
-s_wsne(cilist *a)
+integer
+s_wsne (cilist * a)
 {
-	int n;
+  int n;
 
-	if(n=c_le(a))
-		return(n);
-	f__reading=0;
-	f__external=1;
-	f__formatted=1;
-	f__putn = x_putc;
-	L_len = LINE;
-	f__donewrec = x_wSL;
-	if(f__curunit->uwrt != 1 && f__nowwriting(f__curunit))
-		err(a->cierr, errno, "namelist output start");
-	x_wsne(a);
-	return e_wsle();
-	}
+  if (n = c_le (a))
+    return (n);
+  f__reading = 0;
+  f__external = 1;
+  f__formatted = 1;
+  f__putn = x_putc;
+  L_len = LINE;
+  f__donewrec = x_wSL;
+  if (f__curunit->uwrt != 1 && f__nowwriting (f__curunit))
+    err (a->cierr, errno, "namelist output start");
+  x_wsne (a);
+  return e_wsle ();
+}
diff -rup orig/egcc-CVS20020531/libf2c/libI77/xwsne.c egcc-CVS20020531/libf2c/libI77/xwsne.c
--- orig/egcc-CVS20020531/libf2c/libI77/xwsne.c	2002-05-31 21:56:20.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/xwsne.c	2002-05-31 23:15:41.336671485 -0400
@@ -7,62 +7,65 @@
 extern int f__Aquote;
 
 static void
-nl_donewrec(void)
+nl_donewrec (void)
 {
-	(*f__donewrec)();
-	PUT(' ');
-	}
+  (*f__donewrec) ();
+  PUT (' ');
+}
 
 #include <string.h>
 
 void
-x_wsne(cilist *a)
+x_wsne (cilist * a)
 {
-	Namelist *nl;
-	char *s;
-	Vardesc *v, **vd, **vde;
-	ftnint number, type;
-	ftnlen *dims;
-	ftnlen size;
-	extern ftnlen f__typesize[];
+  Namelist *nl;
+  char *s;
+  Vardesc *v, **vd, **vde;
+  ftnint number, type;
+  ftnlen *dims;
+  ftnlen size;
+  extern ftnlen f__typesize[];
 
-	nl = (Namelist *)a->cifmt;
-	PUT('&');
-	for(s = nl->name; *s; s++)
-		PUT(*s);
-	PUT(' ');
-	f__Aquote = 1;
-	vd = nl->vars;
-	vde = vd + nl->nvars;
-	while(vd < vde) {
-		v = *vd++;
-		s = v->name;
+  nl = (Namelist *) a->cifmt;
+  PUT ('&');
+  for (s = nl->name; *s; s++)
+    PUT (*s);
+  PUT (' ');
+  f__Aquote = 1;
+  vd = nl->vars;
+  vde = vd + nl->nvars;
+  while (vd < vde)
+    {
+      v = *vd++;
+      s = v->name;
 #ifdef No_Extra_Namelist_Newlines
-		if (f__recpos+strlen(s)+2 >= L_len)
+      if (f__recpos + strlen (s) + 2 >= L_len)
 #endif
-			nl_donewrec();
-		while(*s)
-			PUT(*s++);
-		PUT(' ');
-		PUT('=');
-		number = (dims = v->dims) ? dims[1] : 1;
-		type = v->type;
-		if (type < 0) {
-			size = -type;
-			type = TYCHAR;
-			}
-		else
-			size = f__typesize[type];
-		l_write(&number, v->addr, size, type);
-		if (vd < vde) {
-			if (f__recpos+2 >= L_len)
-				nl_donewrec();
-			PUT(',');
-			PUT(' ');
-			}
-		else if (f__recpos+1 >= L_len)
-			nl_donewrec();
-		}
-	f__Aquote = 0;
-	PUT('/');
+	nl_donewrec ();
+      while (*s)
+	PUT (*s++);
+      PUT (' ');
+      PUT ('=');
+      number = (dims = v->dims) ? dims[1] : 1;
+      type = v->type;
+      if (type < 0)
+	{
+	  size = -type;
+	  type = TYCHAR;
+	}
+      else
+	size = f__typesize[type];
+      l_write (&number, v->addr, size, type);
+      if (vd < vde)
+	{
+	  if (f__recpos + 2 >= L_len)
+	    nl_donewrec ();
+	  PUT (',');
+	  PUT (' ');
 	}
+      else if (f__recpos + 1 >= L_len)
+	nl_donewrec ();
+    }
+  f__Aquote = 0;
+  PUT ('/');
+}



More information about the Gcc-patches mailing list