Patch installed: fix formatting for libf2c part 3/6

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


Fix formatting part3

diff -rup orig/egcc-CVS20020531/libf2c/libI77/backspace.c egcc-CVS20020531/libf2c/libI77/backspace.c
--- orig/egcc-CVS20020531/libf2c/libI77/backspace.c	2002-05-31 21:47:44.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/backspace.c	2002-05-31 23:15:41.186670757 -0400
@@ -2,69 +2,80 @@
 #include <sys/types.h>
 #include "f2c.h"
 #include "fio.h"
-integer f_back(alist *a)
-{	unit *b;
-	off_t v, w, x, y, z;
-	uiolen n;
-	FILE *f;
+integer
+f_back (alist * a)
+{
+  unit *b;
+  off_t v, w, x, y, z;
+  uiolen n;
+  FILE *f;
 
-	f__curunit = b = &f__units[a->aunit];	/* curunit for error messages */
-	if (f__init & 2)
-		f__fatal (131, "I/O recursion");
-	if(a->aunit >= MXUNIT || a->aunit < 0)
-		err(a->aerr,101,"backspace");
-	if(b->useek==0) err(a->aerr,106,"backspace");
-	if(b->ufd == NULL) {
-		fk_open(1, 1, a->aunit);
-		return(0);
-		}
-	if(b->uend==1)
-	{	b->uend=0;
-		return(0);
-	}
-	if(b->uwrt) {
-		t_runc(a);
-		if (f__nowreading(b))
-			err(a->aerr,errno,"backspace");
-		}
-	f = b->ufd;	/* may have changed in t_runc() */
-	if(b->url>0)
-	{
-		x=FTELL(f);
-		y = x % b->url;
-		if(y == 0) x--;
-		x /= b->url;
-		x *= b->url;
-		FSEEK(f,x,SEEK_SET);
-		return(0);
-	}
+  f__curunit = b = &f__units[a->aunit];	/* curunit for error messages */
+  if (f__init & 2)
+    f__fatal (131, "I/O recursion");
+  if (a->aunit >= MXUNIT || a->aunit < 0)
+    err (a->aerr, 101, "backspace");
+  if (b->useek == 0)
+    err (a->aerr, 106, "backspace");
+  if (b->ufd == NULL)
+    {
+      fk_open (1, 1, a->aunit);
+      return (0);
+    }
+  if (b->uend == 1)
+    {
+      b->uend = 0;
+      return (0);
+    }
+  if (b->uwrt)
+    {
+      t_runc (a);
+      if (f__nowreading (b))
+	err (a->aerr, errno, "backspace");
+    }
+  f = b->ufd;			/* may have changed in t_runc() */
+  if (b->url > 0)
+    {
+      x = FTELL (f);
+      y = x % b->url;
+      if (y == 0)
+	x--;
+      x /= b->url;
+      x *= b->url;
+      FSEEK (f, x, SEEK_SET);
+      return (0);
+    }
 
-	if(b->ufmt==0)
-	{	FSEEK(f,-(off_t)sizeof(uiolen),SEEK_CUR);
-		fread((char *)&n,sizeof(uiolen),1,f);
-		FSEEK(f,-(off_t)n-2*sizeof(uiolen),SEEK_CUR);
-		return(0);
+  if (b->ufmt == 0)
+    {
+      FSEEK (f, -(off_t) sizeof (uiolen), SEEK_CUR);
+      fread ((char *) &n, sizeof (uiolen), 1, f);
+      FSEEK (f, -(off_t) n - 2 * sizeof (uiolen), SEEK_CUR);
+      return (0);
+    }
+  w = x = FTELL (f);
+  z = 0;
+loop:
+  while (x)
+    {
+      x -= x < 64 ? x : 64;
+      FSEEK (f, x, SEEK_SET);
+      for (y = x; y < w; y++)
+	{
+	  if (getc (f) != '\n')
+	    continue;
+	  v = FTELL (f);
+	  if (v == w)
+	    {
+	      if (z)
+		goto break2;
+	      goto loop;
+	    }
+	  z = v;
 	}
-	w = x = FTELL(f);
-	z = 0;
- loop:
-	while(x) {
-		x -= x < 64 ? x : 64;
-		FSEEK(f,x,SEEK_SET);
-		for(y = x; y < w; y++) {
-			if (getc(f) != '\n')
-				continue;
-			v = FTELL(f);
-			if (v == w) {
-				if (z)
-					goto break2;
-				goto loop;
-				}
-			z = v;
-			}
-		err(a->aerr,(EOF),"backspace");
-		}
- break2:
-	FSEEK(f, z, SEEK_SET);
-	return 0;
+      err (a->aerr, (EOF), "backspace");
+    }
+break2:
+  FSEEK (f, z, SEEK_SET);
+  return 0;
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/close.c egcc-CVS20020531/libf2c/libI77/close.c
--- orig/egcc-CVS20020531/libf2c/libI77/close.c	2002-05-31 21:54:26.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/close.c	2002-05-31 23:15:41.186670757 -0400
@@ -14,78 +14,88 @@
 #if defined (MSDOS) && !defined (GO32)
 #include "io.h"
 #else
-extern int unlink(const char*);
+extern int unlink (const char *);
 #endif
 #endif
 
-integer f_clos(cllist *a)
-{	unit *b;
+integer
+f_clos (cllist * a)
+{
+  unit *b;
 
-	if (f__init & 2)
-		f__fatal (131, "I/O recursion");
-	if(a->cunit >= MXUNIT) return(0);
-	b= &f__units[a->cunit];
-	if(b->ufd==NULL)
-		goto done;
-	if (b->uscrtch == 1)
-		goto Delete;
-	if (!a->csta)
-		goto Keep;
-	switch(*a->csta) {
-		default:
-	 	Keep:
-		case 'k':
-		case 'K':
-			if(b->uwrt == 1)
-				t_runc((alist *)a);
-			if(b->ufnm) {
-				fclose(b->ufd);
-				free(b->ufnm);
-				}
-			break;
-		case 'd':
-		case 'D':
-		Delete:
-			fclose(b->ufd);
-			if(b->ufnm) {
-				unlink(b->ufnm); /*SYSDEP*/
-				free(b->ufnm);
-				}
-		}
-	b->ufd=NULL;
- done:
-	b->uend=0;
-	b->ufnm=NULL;
-	return(0);
+  if (f__init & 2)
+    f__fatal (131, "I/O recursion");
+  if (a->cunit >= MXUNIT)
+    return (0);
+  b = &f__units[a->cunit];
+  if (b->ufd == NULL)
+    goto done;
+  if (b->uscrtch == 1)
+    goto Delete;
+  if (!a->csta)
+    goto Keep;
+  switch (*a->csta)
+    {
+    default:
+    Keep:
+    case 'k':
+    case 'K':
+      if (b->uwrt == 1)
+	t_runc ((alist *) a);
+      if (b->ufnm)
+	{
+	  fclose (b->ufd);
+	  free (b->ufnm);
 	}
- void
-f_exit(void)
-{	int i;
-	static cllist xx;
-	if (! (f__init & 1))
-		return;		/* Not initialized, so no open units. */
-	/* I/O no longer in progress.  If, during an I/O operation (such
-	   as waiting for the user to enter a line), there is an
-	   interrupt (such as ^C to stop the program on a UNIX system),
-	   f_exit() is called, but there is no longer any I/O in
-	   progress.  Without turning off this flag, f_clos() would
-	   think that there is an I/O recursion in this circumstance. */
-	f__init &= ~2;
-	if (!xx.cerr) {
-		xx.cerr=1;
-		xx.csta=NULL;
-		for(i=0;i<MXUNIT;i++)
-		{
-			xx.cunit=i;
-			(void) f_clos(&xx);
-		}
+      break;
+    case 'd':
+    case 'D':
+    Delete:
+      fclose (b->ufd);
+      if (b->ufnm)
+	{
+	  unlink (b->ufnm);
+	  /*SYSDEP*/ free (b->ufnm);
 	}
+    }
+  b->ufd = NULL;
+done:
+  b->uend = 0;
+  b->ufnm = NULL;
+  return (0);
 }
- int
+
+void
+f_exit (void)
+{
+  int i;
+  static cllist xx;
+  if (!(f__init & 1))
+    return;			/* Not initialized, so no open units. */
+  /* I/O no longer in progress.  If, during an I/O operation (such
+     as waiting for the user to enter a line), there is an
+     interrupt (such as ^C to stop the program on a UNIX system),
+     f_exit() is called, but there is no longer any I/O in
+     progress.  Without turning off this flag, f_clos() would
+     think that there is an I/O recursion in this circumstance. */
+  f__init &= ~2;
+  if (!xx.cerr)
+    {
+      xx.cerr = 1;
+      xx.csta = NULL;
+      for (i = 0; i < MXUNIT; i++)
+	{
+	  xx.cunit = i;
+	  (void) f_clos (&xx);
+	}
+    }
+}
+int
 G77_flush_0 (void)
-{	int i;
-	for(i=0;i<MXUNIT;i++)
-		if(f__units[i].ufd != NULL && f__units[i].uwrt)
-			fflush(f__units[i].ufd);
-return 0;
+{
+  int i;
+  for (i = 0; i < MXUNIT; i++)
+    if (f__units[i].ufd != NULL && f__units[i].uwrt)
+      fflush (f__units[i].ufd);
+  return 0;
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/dfe.c egcc-CVS20020531/libf2c/libI77/dfe.c
--- orig/egcc-CVS20020531/libf2c/libI77/dfe.c	2002-05-31 21:56:19.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/dfe.c	2002-05-31 23:15:41.186670757 -0400
@@ -3,133 +3,151 @@
 #include "fio.h"
 #include "fmt.h"
 
-y_rsk(void)
+y_rsk (void)
 {
-	if(f__curunit->uend || f__curunit->url <= f__recpos
-		|| f__curunit->url == 1) return 0;
-	do {
-		getc(f__cf);
-	} while(++f__recpos < f__curunit->url);
-	return 0;
-}
-y_getc(void)
-{
-	int ch;
-	if(f__curunit->uend) return(-1);
-	if((ch=getc(f__cf))!=EOF)
-	{
-		f__recpos++;
-		if(f__curunit->url>=f__recpos ||
-			f__curunit->url==1)
-			return(ch);
-		else	return(' ');
-	}
-	if(feof(f__cf))
-	{
-		f__curunit->uend=1;
-		errno=0;
-		return(-1);
-	}
-	err(f__elist->cierr,errno,"readingd");
-}
-
- static int
-y_rev(void)
-{
-	if (f__recpos < f__hiwater)
-		f__recpos = f__hiwater;
-	if (f__curunit->url > 1)
-		while(f__recpos < f__curunit->url)
-			(*f__putn)(' ');
-	if (f__recpos)
-		f__putbuf(0);
-	f__recpos = 0;
-	return(0);
-}
-
- static int
-y_err(void)
-{
-	err(f__elist->cierr, 110, "dfe");
-}
-
- static int
-y_newrec(void)
-{
-	y_rev();
-	f__hiwater = f__cursor = 0;
-	return(1);
-}
-
-c_dfe(cilist *a)
-{
-	f__sequential=0;
-	f__formatted=f__external=1;
-	f__elist=a;
-	f__cursor=f__scale=f__recpos=0;
-	f__curunit = &f__units[a->ciunit];
-	if(a->ciunit>MXUNIT || a->ciunit<0)
-		err(a->cierr,101,"startchk");
-	if(f__curunit->ufd==NULL && fk_open(DIR,FMT,a->ciunit))
-		err(a->cierr,104,"dfe");
-	f__cf=f__curunit->ufd;
-	if(!f__curunit->ufmt) err(a->cierr,102,"dfe");
-	if(!f__curunit->useek) err(a->cierr,104,"dfe");
-	f__fmtbuf=a->cifmt;
-	if(a->cirec <= 0)
-		err(a->cierr,130,"dfe");
-	FSEEK(f__cf,(off_t)f__curunit->url * (a->cirec-1),SEEK_SET);
-	f__curunit->uend = 0;
-	return(0);
-}
-integer s_rdfe(cilist *a)
-{
-	int n;
-	if(f__init != 1) f_init();
-	f__init = 3;
-	f__reading=1;
-	if(n=c_dfe(a))return(n);
-	if(f__curunit->uwrt && f__nowreading(f__curunit))
-		err(a->cierr,errno,"read start");
-	f__getn = y_getc;
-	f__doed = rd_ed;
-	f__doned = rd_ned;
-	f__dorevert = f__donewrec = y_err;
-	f__doend = y_rsk;
-	if(pars_f(f__fmtbuf)<0)
-		err(a->cierr,100,"read start");
-	fmt_bg();
-	return(0);
-}
-integer s_wdfe(cilist *a)
-{
-	int n;
-	if(f__init != 1) f_init();
-	f__init = 3;
-	f__reading=0;
-	if(n=c_dfe(a)) return(n);
-	if(f__curunit->uwrt != 1 && f__nowwriting(f__curunit))
-		err(a->cierr,errno,"startwrt");
-	f__putn = x_putc;
-	f__doed = w_ed;
-	f__doned= w_ned;
-	f__dorevert = y_err;
-	f__donewrec = y_newrec;
-	f__doend = y_rev;
-	if(pars_f(f__fmtbuf)<0)
-		err(a->cierr,100,"startwrt");
-	fmt_bg();
-	return(0);
-}
-integer e_rdfe(void)
-{
-	f__init = 1;
-	en_fio();
-	return(0);
+  if (f__curunit->uend || f__curunit->url <= f__recpos
+      || f__curunit->url == 1)
+    return 0;
+  do
+    {
+      getc (f__cf);
+    }
+  while (++f__recpos < f__curunit->url);
+  return 0;
+}
+
+y_getc (void)
+{
+  int ch;
+  if (f__curunit->uend)
+    return (-1);
+  if ((ch = getc (f__cf)) != EOF)
+    {
+      f__recpos++;
+      if (f__curunit->url >= f__recpos || f__curunit->url == 1)
+	return (ch);
+      else
+	return (' ');
+    }
+  if (feof (f__cf))
+    {
+      f__curunit->uend = 1;
+      errno = 0;
+      return (-1);
+    }
+  err (f__elist->cierr, errno, "readingd");
+}
+
+static int
+y_rev (void)
+{
+  if (f__recpos < f__hiwater)
+    f__recpos = f__hiwater;
+  if (f__curunit->url > 1)
+    while (f__recpos < f__curunit->url)
+      (*f__putn) (' ');
+  if (f__recpos)
+    f__putbuf (0);
+  f__recpos = 0;
+  return (0);
+}
+
+static int
+y_err (void)
+{
+  err (f__elist->cierr, 110, "dfe");
+}
+
+static int
+y_newrec (void)
+{
+  y_rev ();
+  f__hiwater = f__cursor = 0;
+  return (1);
+}
+
+c_dfe (cilist * a)
+{
+  f__sequential = 0;
+  f__formatted = f__external = 1;
+  f__elist = a;
+  f__cursor = f__scale = f__recpos = 0;
+  f__curunit = &f__units[a->ciunit];
+  if (a->ciunit > MXUNIT || a->ciunit < 0)
+    err (a->cierr, 101, "startchk");
+  if (f__curunit->ufd == NULL && fk_open (DIR, FMT, a->ciunit))
+    err (a->cierr, 104, "dfe");
+  f__cf = f__curunit->ufd;
+  if (!f__curunit->ufmt)
+    err (a->cierr, 102, "dfe");
+  if (!f__curunit->useek)
+    err (a->cierr, 104, "dfe");
+  f__fmtbuf = a->cifmt;
+  if (a->cirec <= 0)
+    err (a->cierr, 130, "dfe");
+  FSEEK (f__cf, (off_t) f__curunit->url * (a->cirec - 1), SEEK_SET);
+  f__curunit->uend = 0;
+  return (0);
+}
+
+integer
+s_rdfe (cilist * a)
+{
+  int n;
+  if (f__init != 1)
+    f_init ();
+  f__init = 3;
+  f__reading = 1;
+  if (n = c_dfe (a))
+    return (n);
+  if (f__curunit->uwrt && f__nowreading (f__curunit))
+    err (a->cierr, errno, "read start");
+  f__getn = y_getc;
+  f__doed = rd_ed;
+  f__doned = rd_ned;
+  f__dorevert = f__donewrec = y_err;
+  f__doend = y_rsk;
+  if (pars_f (f__fmtbuf) < 0)
+    err (a->cierr, 100, "read start");
+  fmt_bg ();
+  return (0);
+}
+
+integer
+s_wdfe (cilist * a)
+{
+  int n;
+  if (f__init != 1)
+    f_init ();
+  f__init = 3;
+  f__reading = 0;
+  if (n = c_dfe (a))
+    return (n);
+  if (f__curunit->uwrt != 1 && f__nowwriting (f__curunit))
+    err (a->cierr, errno, "startwrt");
+  f__putn = x_putc;
+  f__doed = w_ed;
+  f__doned = w_ned;
+  f__dorevert = y_err;
+  f__donewrec = y_newrec;
+  f__doend = y_rev;
+  if (pars_f (f__fmtbuf) < 0)
+    err (a->cierr, 100, "startwrt");
+  fmt_bg ();
+  return (0);
+}
+
+integer
+e_rdfe (void)
+{
+  f__init = 1;
+  en_fio ();
+  return (0);
 }
 
-integer e_wdfe(void)
+integer
+e_wdfe (void)
 {
-	f__init = 1;
-	return en_fio();
+  f__init = 1;
+  return en_fio ();
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/dolio.c egcc-CVS20020531/libf2c/libI77/dolio.c
--- orig/egcc-CVS20020531/libf2c/libI77/dolio.c	2002-05-31 21:54:26.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/dolio.c	2002-05-31 23:15:41.186670757 -0400
@@ -1,9 +1,10 @@
 #include "config.h"
 #include "f2c.h"
 
-extern int (*f__lioproc)(ftnint*, char*, ftnlen, ftnint);
+extern int (*f__lioproc) (ftnint *, char *, ftnlen, ftnint);
 
-integer do_lio(ftnint *type, ftnint *number, char *ptr, ftnlen len)
+integer
+do_lio (ftnint * type, ftnint * number, char *ptr, ftnlen len)
 {
-	return((*f__lioproc)(number,ptr,len,*type));
+  return ((*f__lioproc) (number, ptr, len, *type));
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/due.c egcc-CVS20020531/libf2c/libI77/due.c
--- orig/egcc-CVS20020531/libf2c/libI77/due.c	2002-05-31 21:56:19.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/due.c	2002-05-31 23:15:41.196671875 -0400
@@ -2,63 +2,78 @@
 #include "f2c.h"
 #include "fio.h"
 
-c_due(cilist *a)
+c_due (cilist * a)
 {
-	if(f__init != 1) f_init();
-	f__init = 3;
-	if(a->ciunit>=MXUNIT || a->ciunit<0)
-		err(a->cierr,101,"startio");
-	f__sequential=f__formatted=f__recpos=0;
-	f__external=1;
-	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(DIR,UNF,a->ciunit) ) err(a->cierr,104,"due");
-	f__cf=f__curunit->ufd;
-	if(f__curunit->ufmt) err(a->cierr,102,"cdue");
-	if(!f__curunit->useek) err(a->cierr,104,"cdue");
-	if(f__curunit->ufd==NULL) err(a->cierr,114,"cdue");
-	if(a->cirec <= 0)
-		err(a->cierr,130,"due");
-	FSEEK(f__cf,(off_t)(a->cirec-1)*f__curunit->url,SEEK_SET);
-	f__curunit->uend = 0;
-	return(0);
+  if (f__init != 1)
+    f_init ();
+  f__init = 3;
+  if (a->ciunit >= MXUNIT || a->ciunit < 0)
+    err (a->cierr, 101, "startio");
+  f__sequential = f__formatted = f__recpos = 0;
+  f__external = 1;
+  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 (DIR, UNF, a->ciunit))
+    err (a->cierr, 104, "due");
+  f__cf = f__curunit->ufd;
+  if (f__curunit->ufmt)
+    err (a->cierr, 102, "cdue");
+  if (!f__curunit->useek)
+    err (a->cierr, 104, "cdue");
+  if (f__curunit->ufd == NULL)
+    err (a->cierr, 114, "cdue");
+  if (a->cirec <= 0)
+    err (a->cierr, 130, "due");
+  FSEEK (f__cf, (off_t) (a->cirec - 1) * f__curunit->url, SEEK_SET);
+  f__curunit->uend = 0;
+  return (0);
 }
-integer s_rdue(cilist *a)
+
+integer
+s_rdue (cilist * a)
 {
-	int n;
-	f__reading=1;
-	if(n=c_due(a)) return(n);
-	if(f__curunit->uwrt && f__nowreading(f__curunit))
-		err(a->cierr,errno,"read start");
-	return(0);
+  int n;
+  f__reading = 1;
+  if (n = c_due (a))
+    return (n);
+  if (f__curunit->uwrt && f__nowreading (f__curunit))
+    err (a->cierr, errno, "read start");
+  return (0);
 }
-integer s_wdue(cilist *a)
+
+integer
+s_wdue (cilist * a)
 {
-	int n;
-	f__reading=0;
-	if(n=c_due(a)) return(n);
-	if(f__curunit->uwrt != 1 && f__nowwriting(f__curunit))
-		err(a->cierr,errno,"write start");
-	return(0);
+  int n;
+  f__reading = 0;
+  if (n = c_due (a))
+    return (n);
+  if (f__curunit->uwrt != 1 && f__nowwriting (f__curunit))
+    err (a->cierr, errno, "write start");
+  return (0);
 }
-integer e_rdue(void)
+
+integer
+e_rdue (void)
 {
-	f__init = 1;
-	if(f__curunit->url==1 || f__recpos==f__curunit->url)
-		return(0);
-	FSEEK(f__cf,(off_t)(f__curunit->url-f__recpos),SEEK_CUR);
-	if(FTELL(f__cf)%f__curunit->url)
-		err(f__elist->cierr,200,"syserr");
-	return(0);
+  f__init = 1;
+  if (f__curunit->url == 1 || f__recpos == f__curunit->url)
+    return (0);
+  FSEEK (f__cf, (off_t) (f__curunit->url - f__recpos), SEEK_CUR);
+  if (FTELL (f__cf) % f__curunit->url)
+    err (f__elist->cierr, 200, "syserr");
+  return (0);
 }
-integer e_wdue(void)
+
+integer
+e_wdue (void)
 {
-	f__init = 1;
+  f__init = 1;
 #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
-	return(e_rdue());
+  return (e_rdue ());
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/endfile.c egcc-CVS20020531/libf2c/libI77/endfile.c
--- orig/egcc-CVS20020531/libf2c/libI77/endfile.c	2002-05-31 21:47:44.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/endfile.c	2002-05-31 23:15:41.196671875 -0400
@@ -13,111 +13,118 @@
 
 extern char *f__r_mode[], *f__w_mode[];
 
-integer f_end(alist *a)
+integer
+f_end (alist * a)
 {
-	unit *b;
-	FILE *tf;
+  unit *b;
+  FILE *tf;
 
-	if (f__init & 2)
-		f__fatal (131, "I/O recursion");
-	if(a->aunit>=MXUNIT || a->aunit<0) err(a->aerr,101,"endfile");
-	b = &f__units[a->aunit];
-	if(b->ufd==NULL) {
-		char nbuf[10];
-		sprintf(nbuf,"fort.%ld",(long)a->aunit);
-		if (tf = fopen(nbuf, f__w_mode[0]))
-			fclose(tf);
-		return(0);
-		}
-	b->uend=1;
-	return(b->useek ? t_runc(a) : 0);
+  if (f__init & 2)
+    f__fatal (131, "I/O recursion");
+  if (a->aunit >= MXUNIT || a->aunit < 0)
+    err (a->aerr, 101, "endfile");
+  b = &f__units[a->aunit];
+  if (b->ufd == NULL)
+    {
+      char nbuf[10];
+      sprintf (nbuf, "fort.%ld", (long) a->aunit);
+      if (tf = fopen (nbuf, f__w_mode[0]))
+	fclose (tf);
+      return (0);
+    }
+  b->uend = 1;
+  return (b->useek ? t_runc (a) : 0);
 }
 
 #ifndef HAVE_FTRUNCATE
- static int
-copy(FILE *from, register long len, FILE *to)
+static int
+copy (FILE * from, register long len, FILE * to)
 {
-	int len1;
-	char buf[BUFSIZ];
+  int len1;
+  char buf[BUFSIZ];
 
-	while(fread(buf, len1 = len > BUFSIZ ? BUFSIZ : (int)len, 1, from)) {
-		if (!fwrite(buf, len1, 1, to))
-			return 1;
-		if ((len -= len1) <= 0)
-			break;
-		}
-	return 0;
-	}
+  while (fread (buf, len1 = len > BUFSIZ ? BUFSIZ : (int) len, 1, from))
+    {
+      if (!fwrite (buf, len1, 1, to))
+	return 1;
+      if ((len -= len1) <= 0)
+	break;
+    }
+  return 0;
+}
 #endif /* !defined(HAVE_FTRUNCATE) */
 
- int
-t_runc(alist *a)
+int
+t_runc (alist * a)
 {
-	off_t loc, len;
-	unit *b;
-	int rc;
-	FILE *bf;
+  off_t loc, len;
+  unit *b;
+  int rc;
+  FILE *bf;
 #ifndef HAVE_FTRUNCATE
-	FILE *tf;
+  FILE *tf;
 #endif /* !defined(HAVE_FTRUNCATE) */
 
-	b = &f__units[a->aunit];
-	if(b->url)
-		return(0);	/*don't truncate direct files*/
-	loc=FTELL(bf = b->ufd);
-	FSEEK(bf,0,SEEK_END);
-	len=FTELL(bf);
-	if (loc >= len || b->useek == 0 || b->ufnm == NULL)
-		return(0);
+  b = &f__units[a->aunit];
+  if (b->url)
+    return (0);			/*don't truncate direct files */
+  loc = FTELL (bf = b->ufd);
+  FSEEK (bf, 0, SEEK_END);
+  len = FTELL (bf);
+  if (loc >= len || b->useek == 0 || b->ufnm == NULL)
+    return (0);
 #ifndef HAVE_FTRUNCATE
-	rc = 0;
-	fclose(b->ufd);
-	if (!loc) {
-		if (!(bf = fopen(b->ufnm, f__w_mode[b->ufmt])))
-			rc = 1;
-		if (b->uwrt)
-			b->uwrt = 1;
-		goto done;
-		}
-	if (!(bf = fopen(b->ufnm, f__r_mode[0]))
-	 || !(tf = tmpfile())) {
+  rc = 0;
+  fclose (b->ufd);
+  if (!loc)
+    {
+      if (!(bf = fopen (b->ufnm, f__w_mode[b->ufmt])))
+	rc = 1;
+      if (b->uwrt)
+	b->uwrt = 1;
+      goto done;
+    }
+  if (!(bf = fopen (b->ufnm, f__r_mode[0])) || !(tf = tmpfile ()))
+    {
 #ifdef NON_UNIX_STDIO
- bad:
+    bad:
 #endif
-		rc = 1;
-		goto done;
-		}
-	if (copy(bf, loc, tf)) {
- bad1:
-		rc = 1;
-		goto done1;
-		}
-	if (!(bf = freopen(b->ufnm, f__w_mode[0], bf)))
-		goto bad1;
-	FSEEK(tf, 0, SEEK_SET);
-	if (copy(tf, loc, bf))
-		goto bad1;
-	b->uwrt = 1;
-	b->urw = 2;
+      rc = 1;
+      goto done;
+    }
+  if (copy (bf, loc, tf))
+    {
+    bad1:
+      rc = 1;
+      goto done1;
+    }
+  if (!(bf = freopen (b->ufnm, f__w_mode[0], bf)))
+    goto bad1;
+  FSEEK (tf, 0, SEEK_SET);
+  if (copy (tf, loc, bf))
+    goto bad1;
+  b->uwrt = 1;
+  b->urw = 2;
 #ifdef NON_UNIX_STDIO
-	if (b->ufmt) {
-		fclose(bf);
-		if (!(bf = fopen(b->ufnm, f__w_mode[3])))
-			goto bad;
-		FSEEK(bf,0,SEEK_END);
-		b->urw = 3;
-		}
+  if (b->ufmt)
+    {
+      fclose (bf);
+      if (!(bf = fopen (b->ufnm, f__w_mode[3])))
+	goto bad;
+      FSEEK (bf, 0, SEEK_END);
+      b->urw = 3;
+    }
 #endif
 done1:
-	fclose(tf);
+  fclose (tf);
 done:
-	f__cf = b->ufd = bf;
-#else  /* !defined(HAVE_FTRUNCATE) */
-	fflush(b->ufd);
-	rc = ftruncate(fileno(b->ufd), loc);
-        FSEEK(bf,loc,SEEK_SET);
+  f__cf = b->ufd = bf;
+#else /* !defined(HAVE_FTRUNCATE) */
+  fflush (b->ufd);
+  rc = ftruncate (fileno (b->ufd), loc);
+  FSEEK (bf, loc, SEEK_SET);
 #endif /* !defined(HAVE_FTRUNCATE) */
-	if (rc)
-		err(a->aerr,111,"endfile");
-	return 0;
-	}
+  if (rc)
+    err (a->aerr, 111, "endfile");
+  return 0;
+}
diff -rup orig/egcc-CVS20020531/libf2c/libI77/err.c egcc-CVS20020531/libf2c/libI77/err.c
--- orig/egcc-CVS20020531/libf2c/libI77/err.c	2002-05-31 21:56:19.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/err.c	2002-05-31 23:15:41.206671271 -0400
@@ -11,249 +11,266 @@
 #undef max
 #include <stdlib.h>
 #include "fio.h"
-#include "fmt.h"	/* for struct syl */
+#include "fmt.h"		/* for struct syl */
 
 /*global definitions*/
-unit f__units[MXUNIT];	/*unit table*/
-int f__init;	/*bit 0: set after initializations;
-		  bit 1: set during I/O involving returns to
-		    caller of library (or calls to user code)*/
-cilist *f__elist;	/*active external io list*/
-icilist *f__svic;	/*active internal io list*/
-flag f__reading;	/*1 if reading, 0 if writing*/
-flag f__cplus,f__cblank;
+unit f__units[MXUNIT];		/*unit table */
+int f__init;			/*bit 0: set after initializations;
+				   bit 1: set during I/O involving returns to
+				   caller of library (or calls to user code) */
+cilist *f__elist;		/*active external io list */
+icilist *f__svic;		/*active internal io list */
+flag f__reading;		/*1 if reading, 0 if writing */
+flag f__cplus, f__cblank;
 char *f__fmtbuf;
 int f__fmtlen;
-flag f__external;	/*1 if external io, 0 if internal */
-int (*f__getn)(void);	/* for formatted input */
-void (*f__putn)(int);	/* for formatted output */
-int (*f__doed)(struct syl*, char*, ftnlen),(*f__doned)(struct syl*);
-int (*f__dorevert)(void),(*f__donewrec)(void),(*f__doend)(void);
-flag f__sequential;	/*1 if sequential io, 0 if direct*/
-flag f__formatted;	/*1 if formatted io, 0 if unformatted*/
-FILE *f__cf;	/*current file*/
-unit *f__curunit;	/*current unit*/
-int f__recpos;	/*place in current record*/
+flag f__external;		/*1 if external io, 0 if internal */
+int (*f__getn) (void);		/* for formatted input */
+void (*f__putn) (int);		/* for formatted output */
+int (*f__doed) (struct syl *, char *, ftnlen), (*f__doned) (struct syl *);
+int (*f__dorevert) (void), (*f__donewrec) (void), (*f__doend) (void);
+flag f__sequential;		/*1 if sequential io, 0 if direct */
+flag f__formatted;		/*1 if formatted io, 0 if unformatted */
+FILE *f__cf;			/*current file */
+unit *f__curunit;		/*current unit */
+int f__recpos;			/*place in current record */
 int f__cursor, f__hiwater, f__scale;
 char *f__icptr;
 
 /*error messages*/
-char *F_err[] =
-{
-	"error in format",				/* 100 */
-	"illegal unit number",				/* 101 */
-	"formatted io not allowed",			/* 102 */
-	"unformatted io not allowed",			/* 103 */
-	"direct io not allowed",			/* 104 */
-	"sequential io not allowed",			/* 105 */
-	"can't backspace file",				/* 106 */
-	"null file name",				/* 107 */
-	"can't stat file",				/* 108 */
-	"unit not connected",				/* 109 */
-	"off end of record",				/* 110 */
-	"truncation failed in endfile",			/* 111 */
-	"incomprehensible list input",			/* 112 */
-	"out of free space",				/* 113 */
-	"unit not connected",				/* 114 */
-	"read unexpected character",			/* 115 */
-	"bad logical input field",			/* 116 */
-	"bad variable type",				/* 117 */
-	"bad namelist name",				/* 118 */
-	"variable not in namelist",			/* 119 */
-	"no end record",				/* 120 */
-	"variable count incorrect",			/* 121 */
-	"subscript for scalar variable",		/* 122 */
-	"invalid array section",			/* 123 */
-	"substring out of bounds",			/* 124 */
-	"subscript out of bounds",			/* 125 */
-	"can't read file",				/* 126 */
-	"can't write file",				/* 127 */
-	"'new' file exists",				/* 128 */
-	"can't append to file",				/* 129 */
-	"non-positive record number",			/* 130 */
-	"I/O started while already doing I/O",		/* 131 */
-	"Temporary file name (TMPDIR?) too long"        /* 132 */
+char *F_err[] = {
+  "error in format",		/* 100 */
+  "illegal unit number",	/* 101 */
+  "formatted io not allowed",	/* 102 */
+  "unformatted io not allowed",	/* 103 */
+  "direct io not allowed",	/* 104 */
+  "sequential io not allowed",	/* 105 */
+  "can't backspace file",	/* 106 */
+  "null file name",		/* 107 */
+  "can't stat file",		/* 108 */
+  "unit not connected",		/* 109 */
+  "off end of record",		/* 110 */
+  "truncation failed in endfile",	/* 111 */
+  "incomprehensible list input",	/* 112 */
+  "out of free space",		/* 113 */
+  "unit not connected",		/* 114 */
+  "read unexpected character",	/* 115 */
+  "bad logical input field",	/* 116 */
+  "bad variable type",		/* 117 */
+  "bad namelist name",		/* 118 */
+  "variable not in namelist",	/* 119 */
+  "no end record",		/* 120 */
+  "variable count incorrect",	/* 121 */
+  "subscript for scalar variable",	/* 122 */
+  "invalid array section",	/* 123 */
+  "substring out of bounds",	/* 124 */
+  "subscript out of bounds",	/* 125 */
+  "can't read file",		/* 126 */
+  "can't write file",		/* 127 */
+  "'new' file exists",		/* 128 */
+  "can't append to file",	/* 129 */
+  "non-positive record number",	/* 130 */
+  "I/O started while already doing I/O",	/* 131 */
+  "Temporary file name (TMPDIR?) too long"	/* 132 */
 };
 #define MAXERR (sizeof(F_err)/sizeof(char *)+100)
 
-f__canseek(FILE *f) /*SYSDEP*/
+f__canseek (FILE * f) /*SYSDEP*/
 {
 #ifdef NON_UNIX_STDIO
-	return !isatty(fileno(f));
+  return !isatty (fileno (f));
 #else
-	struct stat x;
+  struct stat x;
 
-	if (fstat(fileno(f),&x) < 0)
-		return(0);
+  if (fstat (fileno (f), &x) < 0)
+    return (0);
 #ifdef S_IFMT
-	switch(x.st_mode & S_IFMT) {
-	case S_IFDIR:
-	case S_IFREG:
-		if(x.st_nlink > 0)	/* !pipe */
-			return(1);
-		else
-			return(0);
-	case S_IFCHR:
-		if(isatty(fileno(f)))
-			return(0);
-		return(1);
+  switch (x.st_mode & S_IFMT)
+    {
+    case S_IFDIR:
+    case S_IFREG:
+      if (x.st_nlink > 0)	/* !pipe */
+	return (1);
+      else
+	return (0);
+    case S_IFCHR:
+      if (isatty (fileno (f)))
+	return (0);
+      return (1);
 #ifdef S_IFBLK
-	case S_IFBLK:
-		return(1);
+    case S_IFBLK:
+      return (1);
 #endif
-	}
+    }
 #else
 #ifdef S_ISDIR
-	/* POSIX version */
-	if (S_ISREG(x.st_mode) || S_ISDIR(x.st_mode)) {
-		if(x.st_nlink > 0)	/* !pipe */
-			return(1);
-		else
-			return(0);
-		}
-	if (S_ISCHR(x.st_mode)) {
-		if(isatty(fileno(f)))
-			return(0);
-		return(1);
-		}
-	if (S_ISBLK(x.st_mode))
-		return(1);
+  /* POSIX version */
+  if (S_ISREG (x.st_mode) || S_ISDIR (x.st_mode))
+    {
+      if (x.st_nlink > 0)	/* !pipe */
+	return (1);
+      else
+	return (0);
+    }
+  if (S_ISCHR (x.st_mode))
+    {
+      if (isatty (fileno (f)))
+	return (0);
+      return (1);
+    }
+  if (S_ISBLK (x.st_mode))
+    return (1);
 #else
-	Help! How does fstat work on this system?
+  Help ! How does fstat work on this system ?
 #endif
 #endif
-	return(0);	/* who knows what it is? */
+    return (0);			/* who knows what it is? */
 #endif
 }
 
- void
-f__fatal(int n, char *s)
+void
+f__fatal (int n, char *s)
 {
-	static int dead = 0;
+  static int dead = 0;
 
-	if(n<100 && n>=0) perror(s); /*SYSDEP*/
-	else if(n >= (int)MAXERR || n < -1)
-	{	fprintf(stderr,"%s: illegal error number %d\n",s,n);
-	}
-	else if(n == -1) fprintf(stderr,"%s: end of file\n",s);
-	else
-		fprintf(stderr,"%s: %s\n",s,F_err[n-100]);
-	if (dead) {
-		fprintf (stderr, "(libf2c f__fatal already called, aborting.)");
-		abort();
-	}
-	dead = 1;
-	if (f__init & 1) {
-		if (f__curunit) {
-			fprintf(stderr,"apparent state: unit %d ",
-				(int)(f__curunit-f__units));
-			fprintf(stderr, f__curunit->ufnm ? "named %s\n" : "(unnamed)\n",
-				f__curunit->ufnm);
-			}
-		else
-			fprintf(stderr,"apparent state: internal I/O\n");
-		if (f__fmtbuf)
-			fprintf(stderr,"last format: %.*s\n",f__fmtlen,f__fmtbuf);
-		fprintf(stderr,"lately %s %s %s %s",f__reading?"reading":"writing",
-			f__sequential?"sequential":"direct",f__formatted?"formatted":"unformatted",
-			f__external?"external":"internal");
+  if (n < 100 && n >= 0)
+    perror (s);
+  /*SYSDEP*/
+  else if (n >= (int) MAXERR || n < -1)
+    {
+      fprintf (stderr, "%s: illegal error number %d\n", s, n);
+    }
+  else if (n == -1)
+    fprintf (stderr, "%s: end of file\n", s);
+  else
+    fprintf (stderr, "%s: %s\n", s, F_err[n - 100]);
+  if (dead)
+    {
+      fprintf (stderr, "(libf2c f__fatal already called, aborting.)");
+      abort ();
+    }
+  dead = 1;
+  if (f__init & 1)
+    {
+      if (f__curunit)
+	{
+	  fprintf (stderr, "apparent state: unit %d ",
+		   (int) (f__curunit - f__units));
+	  fprintf (stderr, f__curunit->ufnm ? "named %s\n" : "(unnamed)\n",
+		   f__curunit->ufnm);
 	}
-	f__init &= ~2;	/* No longer doing I/O (no more user code to be called). */
-	sig_die(" IO", 1);
+      else
+	fprintf (stderr, "apparent state: internal I/O\n");
+      if (f__fmtbuf)
+	fprintf (stderr, "last format: %.*s\n", f__fmtlen, f__fmtbuf);
+      fprintf (stderr, "lately %s %s %s %s",
+	       f__reading ? "reading" : "writing",
+	       f__sequential ? "sequential" : "direct",
+	       f__formatted ? "formatted" : "unformatted",
+	       f__external ? "external" : "internal");
+    }
+  f__init &= ~2;		/* No longer doing I/O (no more user code to be called). */
+  sig_die (" IO", 1);
 }
+
 /*initialization routine*/
 void
-f_init(void)
-{	unit *p;
+f_init (void)
+{
+  unit *p;
+
+  if (f__init & 2)
+    f__fatal (131, "I/O recursion");
+  f__init = 1;
+  p = &f__units[0];
+  p->ufd = stderr;
+  p->useek = f__canseek (stderr);
+  p->ufmt = 1;
+  p->uwrt = 1;
+  p = &f__units[5];
+  p->ufd = stdin;
+  p->useek = f__canseek (stdin);
+  p->ufmt = 1;
+  p->uwrt = 0;
+  p = &f__units[6];
+  p->ufd = stdout;
+  p->useek = f__canseek (stdout);
+  p->ufmt = 1;
+  p->uwrt = 1;
+}
+
+f__nowreading (unit * x)
+{
+  off_t loc;
+  int ufmt, urw;
+  extern char *f__r_mode[], *f__w_mode[];
+
+  if (x->urw & 1)
+    goto done;
+  if (!x->ufnm)
+    goto cantread;
+  ufmt = x->url ? 0 : x->ufmt;
+  loc = FTELL (x->ufd);
+  urw = 3;
+  if (!freopen (x->ufnm, f__w_mode[ufmt | 2], x->ufd))
+    {
+      urw = 1;
+      if (!freopen (x->ufnm, f__r_mode[ufmt], x->ufd))
+	{
+	cantread:
+	  errno = 126;
+	  return 1;
+	}
+    }
+  FSEEK (x->ufd, loc, SEEK_SET);
+  x->urw = urw;
+done:
+  x->uwrt = 0;
+  return 0;
+}
+
+f__nowwriting (unit * x)
+{
+  off_t loc;
+  int ufmt;
+  extern char *f__w_mode[];
 
-	if (f__init & 2)
-		f__fatal (131, "I/O recursion");
-	f__init = 1;
-	p= &f__units[0];
-	p->ufd=stderr;
-	p->useek=f__canseek(stderr);
-	p->ufmt=1;
-	p->uwrt=1;
-	p = &f__units[5];
-	p->ufd=stdin;
-	p->useek=f__canseek(stdin);
-	p->ufmt=1;
-	p->uwrt=0;
-	p= &f__units[6];
-	p->ufd=stdout;
-	p->useek=f__canseek(stdout);
-	p->ufmt=1;
-	p->uwrt=1;
-}
-f__nowreading(unit *x)
-{
-	off_t loc;
-	int ufmt, urw;
-	extern char *f__r_mode[], *f__w_mode[];
-
-	if (x->urw & 1)
-		goto done;
-	if (!x->ufnm)
-		goto cantread;
-	ufmt = x->url ? 0 : x->ufmt;
-	loc = FTELL(x->ufd);
-	urw = 3;
-	if (!freopen(x->ufnm, f__w_mode[ufmt|2], x->ufd)) {
-		urw = 1;
-		if(!freopen(x->ufnm, f__r_mode[ufmt], x->ufd)) {
- cantread:
-			errno = 126;
-			return 1;
-			}
-		}
-	FSEEK(x->ufd,loc,SEEK_SET);
-	x->urw = urw;
- done:
-	x->uwrt = 0;
-	return 0;
-}
-f__nowwriting(unit *x)
-{
-	off_t loc;
-	int ufmt;
-	extern char *f__w_mode[];
-
-	if (x->urw & 2)
-		goto done;
-	if (!x->ufnm)
-		goto cantwrite;
-	ufmt = x->url ? 0 : x->ufmt;
-	if (x->uwrt == 3) { /* just did write, rewind */
-		if (!(f__cf = x->ufd =
-				freopen(x->ufnm,f__w_mode[ufmt],x->ufd)))
-			goto cantwrite;
-		x->urw = 2;
-		}
-	else {
-		loc=FTELL(x->ufd);
-		if (!(f__cf = x->ufd =
-			freopen(x->ufnm, f__w_mode[ufmt |= 2], x->ufd)))
-			{
-			x->ufd = NULL;
- cantwrite:
-			errno = 127;
-			return(1);
-			}
-		x->urw = 3;
-		FSEEK(x->ufd,loc,SEEK_SET);
-		}
- done:
-	x->uwrt = 1;
-	return 0;
-}
-
- int
-err__fl(int f, int m, char *s)
-{
-	if (!f)
-		f__fatal(m, s);
-	if (f__doend)
-		(*f__doend)();
-	f__init &= ~2;
-	return errno = m;
+  if (x->urw & 2)
+    goto done;
+  if (!x->ufnm)
+    goto cantwrite;
+  ufmt = x->url ? 0 : x->ufmt;
+  if (x->uwrt == 3)
+    {				/* just did write, rewind */
+      if (!(f__cf = x->ufd = freopen (x->ufnm, f__w_mode[ufmt], x->ufd)))
+	goto cantwrite;
+      x->urw = 2;
+    }
+  else
+    {
+      loc = FTELL (x->ufd);
+      if (!(f__cf = x->ufd = freopen (x->ufnm, f__w_mode[ufmt |= 2], x->ufd)))
+	{
+	  x->ufd = NULL;
+	cantwrite:
+	  errno = 127;
+	  return (1);
 	}
+      x->urw = 3;
+      FSEEK (x->ufd, loc, SEEK_SET);
+    }
+done:
+  x->uwrt = 1;
+  return 0;
+}
+
+int
+err__fl (int f, int m, char *s)
+{
+  if (!f)
+    f__fatal (m, s);
+  if (f__doend)
+    (*f__doend) ();
+  f__init &= ~2;
+  return errno = m;
+}
diff -rup orig/egcc-CVS20020531/libf2c/libI77/f2ch.add egcc-CVS20020531/libf2c/libI77/f2ch.add
--- orig/egcc-CVS20020531/libf2c/libI77/f2ch.add	1999-09-04 11:09:17.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/f2ch.add	2002-05-31 23:25:52.966366078 -0400
@@ -2,161 +2,162 @@
    for compiling libF77 and libI77. */
 
 #ifdef __cplusplus
-extern "C" {
-extern int abort_(void);
-extern double c_abs(complex *);
-extern void c_cos(complex *, complex *);
-extern void c_div(complex *, complex *, complex *);
-extern void c_exp(complex *, complex *);
-extern void c_log(complex *, complex *);
-extern void c_sin(complex *, complex *);
-extern void c_sqrt(complex *, complex *);
-extern double d_abs(double *);
-extern double d_acos(double *);
-extern double d_asin(double *);
-extern double d_atan(double *);
-extern double d_atn2(double *, double *);
-extern void d_cnjg(doublecomplex *, doublecomplex *);
-extern double d_cos(double *);
-extern double d_cosh(double *);
-extern double d_dim(double *, double *);
-extern double d_exp(double *);
-extern double d_imag(doublecomplex *);
-extern double d_int(double *);
-extern double d_lg10(double *);
-extern double d_log(double *);
-extern double d_mod(double *, double *);
-extern double d_nint(double *);
-extern double d_prod(float *, float *);
-extern double d_sign(double *, double *);
-extern double d_sin(double *);
-extern double d_sinh(double *);
-extern double d_sqrt(double *);
-extern double d_tan(double *);
-extern double d_tanh(double *);
-extern double derf_(double *);
-extern double derfc_(double *);
-extern integer do_fio(ftnint *, char *, ftnlen);
-extern integer do_lio(ftnint *, ftnint *, char *, ftnlen);
-extern integer do_uio(ftnint *, char *, ftnlen);
-extern integer e_rdfe(void);
-extern integer e_rdue(void);
-extern integer e_rsfe(void);
-extern integer e_rsfi(void);
-extern integer e_rsle(void);
-extern integer e_rsli(void);
-extern integer e_rsue(void);
-extern integer e_wdfe(void);
-extern integer e_wdue(void);
-extern integer e_wsfe(void);
-extern integer e_wsfi(void);
-extern integer e_wsle(void);
-extern integer e_wsli(void);
-extern integer e_wsue(void);
-extern int ef1asc_(ftnint *, ftnlen *, ftnint *, ftnlen *);
-extern integer ef1cmc_(ftnint *, ftnlen *, ftnint *, ftnlen *);
-extern double erf(double);
-extern double erf_(float *);
-extern double erfc(double);
-extern double erfc_(float *);
-extern integer f_back(alist *);
-extern integer f_clos(cllist *);
-extern integer f_end(alist *);
-extern void f_exit(void);
-extern integer f_inqu(inlist *);
-extern integer f_open(olist *);
-extern integer f_rew(alist *);
-extern int flush_(void);
-extern void getarg_(integer *, char *, ftnlen);
-extern void getenv_(char *, char *, ftnlen, ftnlen);
-extern short h_abs(short *);
-extern short h_dim(short *, short *);
-extern short h_dnnt(double *);
-extern short h_indx(char *, char *, ftnlen, ftnlen);
-extern short h_len(char *, ftnlen);
-extern short h_mod(short *, short *);
-extern short h_nint(float *);
-extern short h_sign(short *, short *);
-extern short hl_ge(char *, char *, ftnlen, ftnlen);
-extern short hl_gt(char *, char *, ftnlen, ftnlen);
-extern short hl_le(char *, char *, ftnlen, ftnlen);
-extern short hl_lt(char *, char *, ftnlen, ftnlen);
-extern integer i_abs(integer *);
-extern integer i_dim(integer *, integer *);
-extern integer i_dnnt(double *);
-extern integer i_indx(char *, char *, ftnlen, ftnlen);
-extern integer i_len(char *, ftnlen);
-extern integer i_mod(integer *, integer *);
-extern integer i_nint(float *);
-extern integer i_sign(integer *, integer *);
-extern integer iargc_(void);
-extern ftnlen l_ge(char *, char *, ftnlen, ftnlen);
-extern ftnlen l_gt(char *, char *, ftnlen, ftnlen);
-extern ftnlen l_le(char *, char *, ftnlen, ftnlen);
-extern ftnlen l_lt(char *, char *, ftnlen, ftnlen);
-extern void pow_ci(complex *, complex *, integer *);
-extern double pow_dd(double *, double *);
-extern double pow_di(double *, integer *);
-extern short pow_hh(short *, shortint *);
-extern integer pow_ii(integer *, integer *);
-extern double pow_ri(float *, integer *);
-extern void pow_zi(doublecomplex *, doublecomplex *, integer *);
-extern void pow_zz(doublecomplex *, doublecomplex *, doublecomplex *);
-extern double r_abs(float *);
-extern double r_acos(float *);
-extern double r_asin(float *);
-extern double r_atan(float *);
-extern double r_atn2(float *, float *);
-extern void r_cnjg(complex *, complex *);
-extern double r_cos(float *);
-extern double r_cosh(float *);
-extern double r_dim(float *, float *);
-extern double r_exp(float *);
-extern double r_imag(complex *);
-extern double r_int(float *);
-extern double r_lg10(float *);
-extern double r_log(float *);
-extern double r_mod(float *, float *);
-extern double r_nint(float *);
-extern double r_sign(float *, float *);
-extern double r_sin(float *);
-extern double r_sinh(float *);
-extern double r_sqrt(float *);
-extern double r_tan(float *);
-extern double r_tanh(float *);
-extern void s_cat(char *, char **, integer *, integer *, ftnlen);
-extern integer s_cmp(char *, char *, ftnlen, ftnlen);
-extern void s_copy(char *, char *, ftnlen, ftnlen);
-extern int s_paus(char *, ftnlen);
-extern integer s_rdfe(cilist *);
-extern integer s_rdue(cilist *);
-extern integer s_rnge(char *, integer, char *, integer);
-extern integer s_rsfe(cilist *);
-extern integer s_rsfi(icilist *);
-extern integer s_rsle(cilist *);
-extern integer s_rsli(icilist *);
-extern integer s_rsne(cilist *);
-extern integer s_rsni(icilist *);
-extern integer s_rsue(cilist *);
-extern int s_stop(char *, ftnlen);
-extern integer s_wdfe(cilist *);
-extern integer s_wdue(cilist *);
-extern integer s_wsfe(cilist *);
-extern integer s_wsfi(icilist *);
-extern integer s_wsle(cilist *);
-extern integer s_wsli(icilist *);
-extern integer s_wsne(cilist *);
-extern integer s_wsni(icilist *);
-extern integer s_wsue(cilist *);
-extern void sig_die(char *, int);
-extern integer signal_(integer *, void (*)(int));
-extern integer system_(char *, ftnlen);
-extern double z_abs(doublecomplex *);
-extern void z_cos(doublecomplex *, doublecomplex *);
-extern void z_div(doublecomplex *, doublecomplex *, doublecomplex *);
-extern void z_exp(doublecomplex *, doublecomplex *);
-extern void z_log(doublecomplex *, doublecomplex *);
-extern void z_sin(doublecomplex *, doublecomplex *);
-extern void z_sqrt(doublecomplex *, doublecomplex *);
-	}
+extern "C"
+{
+  extern int abort_ (void);
+  extern double c_abs (complex *);
+  extern void c_cos (complex *, complex *);
+  extern void c_div (complex *, complex *, complex *);
+  extern void c_exp (complex *, complex *);
+  extern void c_log (complex *, complex *);
+  extern void c_sin (complex *, complex *);
+  extern void c_sqrt (complex *, complex *);
+  extern double d_abs (double *);
+  extern double d_acos (double *);
+  extern double d_asin (double *);
+  extern double d_atan (double *);
+  extern double d_atn2 (double *, double *);
+  extern void d_cnjg (doublecomplex *, doublecomplex *);
+  extern double d_cos (double *);
+  extern double d_cosh (double *);
+  extern double d_dim (double *, double *);
+  extern double d_exp (double *);
+  extern double d_imag (doublecomplex *);
+  extern double d_int (double *);
+  extern double d_lg10 (double *);
+  extern double d_log (double *);
+  extern double d_mod (double *, double *);
+  extern double d_nint (double *);
+  extern double d_prod (float *, float *);
+  extern double d_sign (double *, double *);
+  extern double d_sin (double *);
+  extern double d_sinh (double *);
+  extern double d_sqrt (double *);
+  extern double d_tan (double *);
+  extern double d_tanh (double *);
+  extern double derf_ (double *);
+  extern double derfc_ (double *);
+  extern integer do_fio (ftnint *, char *, ftnlen);
+  extern integer do_lio (ftnint *, ftnint *, char *, ftnlen);
+  extern integer do_uio (ftnint *, char *, ftnlen);
+  extern integer e_rdfe (void);
+  extern integer e_rdue (void);
+  extern integer e_rsfe (void);
+  extern integer e_rsfi (void);
+  extern integer e_rsle (void);
+  extern integer e_rsli (void);
+  extern integer e_rsue (void);
+  extern integer e_wdfe (void);
+  extern integer e_wdue (void);
+  extern integer e_wsfe (void);
+  extern integer e_wsfi (void);
+  extern integer e_wsle (void);
+  extern integer e_wsli (void);
+  extern integer e_wsue (void);
+  extern int ef1asc_ (ftnint *, ftnlen *, ftnint *, ftnlen *);
+  extern integer ef1cmc_ (ftnint *, ftnlen *, ftnint *, ftnlen *);
+  extern double erf (double);
+  extern double erf_ (float *);
+  extern double erfc (double);
+  extern double erfc_ (float *);
+  extern integer f_back (alist *);
+  extern integer f_clos (cllist *);
+  extern integer f_end (alist *);
+  extern void f_exit (void);
+  extern integer f_inqu (inlist *);
+  extern integer f_open (olist *);
+  extern integer f_rew (alist *);
+  extern int flush_ (void);
+  extern void getarg_ (integer *, char *, ftnlen);
+  extern void getenv_ (char *, char *, ftnlen, ftnlen);
+  extern short h_abs (short *);
+  extern short h_dim (short *, short *);
+  extern short h_dnnt (double *);
+  extern short h_indx (char *, char *, ftnlen, ftnlen);
+  extern short h_len (char *, ftnlen);
+  extern short h_mod (short *, short *);
+  extern short h_nint (float *);
+  extern short h_sign (short *, short *);
+  extern short hl_ge (char *, char *, ftnlen, ftnlen);
+  extern short hl_gt (char *, char *, ftnlen, ftnlen);
+  extern short hl_le (char *, char *, ftnlen, ftnlen);
+  extern short hl_lt (char *, char *, ftnlen, ftnlen);
+  extern integer i_abs (integer *);
+  extern integer i_dim (integer *, integer *);
+  extern integer i_dnnt (double *);
+  extern integer i_indx (char *, char *, ftnlen, ftnlen);
+  extern integer i_len (char *, ftnlen);
+  extern integer i_mod (integer *, integer *);
+  extern integer i_nint (float *);
+  extern integer i_sign (integer *, integer *);
+  extern integer iargc_ (void);
+  extern ftnlen l_ge (char *, char *, ftnlen, ftnlen);
+  extern ftnlen l_gt (char *, char *, ftnlen, ftnlen);
+  extern ftnlen l_le (char *, char *, ftnlen, ftnlen);
+  extern ftnlen l_lt (char *, char *, ftnlen, ftnlen);
+  extern void pow_ci (complex *, complex *, integer *);
+  extern double pow_dd (double *, double *);
+  extern double pow_di (double *, integer *);
+  extern short pow_hh (short *, shortint *);
+  extern integer pow_ii (integer *, integer *);
+  extern double pow_ri (float *, integer *);
+  extern void pow_zi (doublecomplex *, doublecomplex *, integer *);
+  extern void pow_zz (doublecomplex *, doublecomplex *, doublecomplex *);
+  extern double r_abs (float *);
+  extern double r_acos (float *);
+  extern double r_asin (float *);
+  extern double r_atan (float *);
+  extern double r_atn2 (float *, float *);
+  extern void r_cnjg (complex *, complex *);
+  extern double r_cos (float *);
+  extern double r_cosh (float *);
+  extern double r_dim (float *, float *);
+  extern double r_exp (float *);
+  extern double r_imag (complex *);
+  extern double r_int (float *);
+  extern double r_lg10 (float *);
+  extern double r_log (float *);
+  extern double r_mod (float *, float *);
+  extern double r_nint (float *);
+  extern double r_sign (float *, float *);
+  extern double r_sin (float *);
+  extern double r_sinh (float *);
+  extern double r_sqrt (float *);
+  extern double r_tan (float *);
+  extern double r_tanh (float *);
+  extern void s_cat (char *, char **, integer *, integer *, ftnlen);
+  extern integer s_cmp (char *, char *, ftnlen, ftnlen);
+  extern void s_copy (char *, char *, ftnlen, ftnlen);
+  extern int s_paus (char *, ftnlen);
+  extern integer s_rdfe (cilist *);
+  extern integer s_rdue (cilist *);
+  extern integer s_rnge (char *, integer, char *, integer);
+  extern integer s_rsfe (cilist *);
+  extern integer s_rsfi (icilist *);
+  extern integer s_rsle (cilist *);
+  extern integer s_rsli (icilist *);
+  extern integer s_rsne (cilist *);
+  extern integer s_rsni (icilist *);
+  extern integer s_rsue (cilist *);
+  extern int s_stop (char *, ftnlen);
+  extern integer s_wdfe (cilist *);
+  extern integer s_wdue (cilist *);
+  extern integer s_wsfe (cilist *);
+  extern integer s_wsfi (icilist *);
+  extern integer s_wsle (cilist *);
+  extern integer s_wsli (icilist *);
+  extern integer s_wsne (cilist *);
+  extern integer s_wsni (icilist *);
+  extern integer s_wsue (cilist *);
+  extern void sig_die (char *, int);
+  extern integer signal_ (integer *, void (*)(int));
+  extern integer system_ (char *, ftnlen);
+  extern double z_abs (doublecomplex *);
+  extern void z_cos (doublecomplex *, doublecomplex *);
+  extern void z_div (doublecomplex *, doublecomplex *, doublecomplex *);
+  extern void z_exp (doublecomplex *, doublecomplex *);
+  extern void z_log (doublecomplex *, doublecomplex *);
+  extern void z_sin (doublecomplex *, doublecomplex *);
+  extern void z_sqrt (doublecomplex *, doublecomplex *);
+}
 #endif
diff -rup orig/egcc-CVS20020531/libf2c/libI77/fio.h egcc-CVS20020531/libf2c/libI77/fio.h
--- orig/egcc-CVS20020531/libf2c/libI77/fio.h	2002-05-31 21:56:19.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/fio.h	2002-05-31 23:15:41.206671271 -0400
@@ -39,46 +39,48 @@ typedef long uiolen;
 
 /*units*/
 typedef struct
-{	FILE *ufd;	/*0=unconnected*/
-	char *ufnm;
+{
+  FILE *ufd;			/*0=unconnected */
+  char *ufnm;
 #if !(defined (MSDOS) && !defined (GO32))
-	long uinode;
-	int udev;
+  long uinode;
+  int udev;
 #endif
-	int url;	/*0=sequential*/
-	flag useek;	/*true=can backspace, use dir, ...*/
-	flag ufmt;
-	flag urw;	/* (1 for can read) | (2 for can write) */
-	flag ublnk;
-	flag uend;
-	flag uwrt;	/*last io was write*/
-	flag uscrtch;
-} unit;
+  int url;			/*0=sequential */
+  flag useek;			/*true=can backspace, use dir, ... */
+  flag ufmt;
+  flag urw;			/* (1 for can read) | (2 for can write) */
+  flag ublnk;
+  flag uend;
+  flag uwrt;			/*last io was write */
+  flag uscrtch;
+}
+unit;
 
 extern int f__init;
-extern cilist *f__elist;	/*active external io list*/
-extern flag f__reading,f__external,f__sequential,f__formatted;
-extern int (*f__getn)(void);	/* for formatted input */
-extern void (*f__putn)(int);	/* for formatted output */
-extern void x_putc(int);
-extern long f__inode(char*,int*);
-extern void sig_die(char*,int);
-extern void f__fatal(int,char*);
-extern int t_runc(alist*);
-extern int f__nowreading(unit*), f__nowwriting(unit*);
-extern int fk_open(int,int,ftnint);
-extern int en_fio(void);
-extern void f_init(void);
-extern int (*f__donewrec)(void), t_putc(int), x_wSL(void);
-extern void b_char(char*,char*,ftnlen), g_char(char*,ftnlen,char*);
-extern int c_sfe(cilist*), z_rnew(void);
-extern int isatty(int);
-extern int err__fl(int,int,char*);
-extern int xrd_SL(void);
-extern int f__putbuf(int);
-extern int (*f__doend)(void);
-extern FILE *f__cf;	/*current file*/
-extern unit *f__curunit;	/*current unit*/
+extern cilist *f__elist;	/*active external io list */
+extern flag f__reading, f__external, f__sequential, f__formatted;
+extern int (*f__getn) (void);	/* for formatted input */
+extern void (*f__putn) (int);	/* for formatted output */
+extern void x_putc (int);
+extern long f__inode (char *, int *);
+extern void sig_die (char *, int);
+extern void f__fatal (int, char *);
+extern int t_runc (alist *);
+extern int f__nowreading (unit *), f__nowwriting (unit *);
+extern int fk_open (int, int, ftnint);
+extern int en_fio (void);
+extern void f_init (void);
+extern int (*f__donewrec) (void), t_putc (int), x_wSL (void);
+extern void b_char (char *, char *, ftnlen), g_char (char *, ftnlen, char *);
+extern int c_sfe (cilist *), z_rnew (void);
+extern int isatty (int);
+extern int err__fl (int, int, char *);
+extern int xrd_SL (void);
+extern int f__putbuf (int);
+extern int (*f__doend) (void);
+extern FILE *f__cf;		/*current file */
+extern unit *f__curunit;	/*current unit */
 extern unit f__units[];
 #define err(f,m,s) do {if(f) {f__init &= ~2; errno= m;} else f__fatal(m,s); return(m);} while(0)
 #define errfl(f,m,s) do {return err__fl((int)f,m,s);} while(0)
@@ -86,9 +88,9 @@ extern unit f__units[];
 /*Table sizes*/
 #define MXUNIT 100
 
-extern int f__recpos;	/*position in current record*/
-extern int f__cursor;	/* offset to move to */
-extern int f__hiwater;	/* so TL doesn't confuse us */
+extern int f__recpos;		/*position in current record */
+extern int f__cursor;		/* offset to move to */
+extern int f__hiwater;		/* so TL doesn't confuse us */
 
 #define WRITE	1
 #define READ	2
diff -rup orig/egcc-CVS20020531/libf2c/libI77/fmt.c egcc-CVS20020531/libf2c/libI77/fmt.c
--- orig/egcc-CVS20020531/libf2c/libI77/fmt.c	2002-05-31 21:56:19.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/fmt.c	2002-05-31 23:15:41.216671943 -0400
@@ -17,483 +17,584 @@
 #endif
 #define GLITCH '\2'
 	/* special quote character for stu */
-extern int f__cursor,f__scale;
-extern flag f__cblank,f__cplus;	/*blanks in I and compulsory plus*/
+extern int f__cursor, f__scale;
+extern flag f__cblank, f__cplus;	/*blanks in I and compulsory plus */
 static struct syl f__syl[SYLMX];
-int f__parenlvl,f__pc,f__revloc;
+int f__parenlvl, f__pc, f__revloc;
 
- static
-char *ap_end(char *s)
-{	char quote;
-	quote= *s++;
-	for(;*s;s++)
-	{	if(*s!=quote) continue;
-		if(*++s!=quote) return(s);
-	}
-	if(f__elist->cierr) {
-		errno = 100;
-		return(NULL);
-	}
-	f__fatal(100, "bad string");
-	/*NOTREACHED*/ return 0;
-}
- static
-op_gen(int a, int b, int c, int d)
-{	struct syl *p= &f__syl[f__pc];
-	if(f__pc>=SYLMX)
-	{	fprintf(stderr,"format too complicated:\n");
-		sig_die(f__fmtbuf, 1);
-	}
-	p->op=a;
-	p->p1=b;
-	p->p2.i[0]=c;
-	p->p2.i[1]=d;
-	return(f__pc++);
-}
-static char *f_list(char*);
-static char *gt_num(char *s, int *n, int n1)
-{	int m=0,f__cnt=0;
-	char c;
-	for(c= *s;;c = *s)
-	{	if(c==' ')
-		{	s++;
-			continue;
-		}
-		if(c>'9' || c<'0') break;
-		m=10*m+c-'0';
-		f__cnt++;
-		s++;
-	}
-	if(f__cnt==0) {
-		if (!n1)
-			s = 0;
-		*n=n1;
-		}
-	else *n=m;
-	return(s);
-}
-
- static
-char *f_s(char *s, int curloc)
-{
-	skip(s);
-	if(*s++!='(')
-	{
-		return(NULL);
-	}
-	if(f__parenlvl++ ==1) f__revloc=curloc;
-	if(op_gen(RET1,curloc,0,0)<0 ||
-		(s=f_list(s))==NULL)
-	{
-		return(NULL);
-	}
-	return(s);
-}
-
- static
-ne_d(char *s, char **p)
-{	int n,x,sign=0;
-	struct syl *sp;
-	switch(*s)
+static char *
+ap_end (char *s)
+{
+  char quote;
+  quote = *s++;
+  for (; *s; s++)
+    {
+      if (*s != quote)
+	continue;
+      if (*++s != quote)
+	return (s);
+    }
+  if (f__elist->cierr)
+    {
+      errno = 100;
+      return (NULL);
+    }
+  f__fatal (100, "bad string");
+   /*NOTREACHED*/ return 0;
+}
+
+static
+op_gen (int a, int b, int c, int d)
+{
+  struct syl *p = &f__syl[f__pc];
+  if (f__pc >= SYLMX)
+    {
+      fprintf (stderr, "format too complicated:\n");
+      sig_die (f__fmtbuf, 1);
+    }
+  p->op = a;
+  p->p1 = b;
+  p->p2.i[0] = c;
+  p->p2.i[1] = d;
+  return (f__pc++);
+}
+static char *f_list (char *);
+static char *
+gt_num (char *s, int *n, int n1)
+{
+  int m = 0, f__cnt = 0;
+  char c;
+  for (c = *s;; c = *s)
+    {
+      if (c == ' ')
+	{
+	  s++;
+	  continue;
+	}
+      if (c > '9' || c < '0')
+	break;
+      m = 10 * m + c - '0';
+      f__cnt++;
+      s++;
+    }
+  if (f__cnt == 0)
+    {
+      if (!n1)
+	s = 0;
+      *n = n1;
+    }
+  else
+    *n = m;
+  return (s);
+}
+
+static char *
+f_s (char *s, int curloc)
+{
+  skip (s);
+  if (*s++ != '(')
+    {
+      return (NULL);
+    }
+  if (f__parenlvl++ == 1)
+    f__revloc = curloc;
+  if (op_gen (RET1, curloc, 0, 0) < 0 || (s = f_list (s)) == NULL)
+    {
+      return (NULL);
+    }
+  return (s);
+}
+
+static
+ne_d (char *s, char **p)
+{
+  int n, x, sign = 0;
+  struct syl *sp;
+  switch (*s)
+    {
+    default:
+      return (0);
+    case ':':
+      (void) op_gen (COLON, 0, 0, 0);
+      break;
+    case '$':
+      (void) op_gen (NONL, 0, 0, 0);
+      break;
+    case 'B':
+    case 'b':
+      if (*++s == 'z' || *s == 'Z')
+	(void) op_gen (BZ, 0, 0, 0);
+      else
+	(void) op_gen (BN, 0, 0, 0);
+      break;
+    case 'S':
+    case 's':
+      if (*(s + 1) == 's' || *(s + 1) == 'S')
+	{
+	  x = SS;
+	  s++;
+	}
+      else if (*(s + 1) == 'p' || *(s + 1) == 'P')
+	{
+	  x = SP;
+	  s++;
+	}
+      else
+	x = S;
+      (void) op_gen (x, 0, 0, 0);
+      break;
+    case '/':
+      (void) op_gen (SLASH, 0, 0, 0);
+      break;
+    case '-':
+      sign = 1;
+    case '+':
+      s++;			/*OUTRAGEOUS CODING TRICK */
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
+      if (!(s = gt_num (s, &n, 0)))
+	{
+	bad:*p = 0;
+	  return 1;
+	}
+      switch (*s)
 	{
 	default:
-		return(0);
-	case ':': (void) op_gen(COLON,0,0,0); break;
-	case '$':
-		(void) op_gen(NONL, 0, 0, 0); break;
-	case 'B':
-	case 'b':
-		if(*++s=='z' || *s == 'Z') (void) op_gen(BZ,0,0,0);
-		else (void) op_gen(BN,0,0,0);
-		break;
-	case 'S':
-	case 's':
-		if(*(s+1)=='s' || *(s+1) == 'S')
-		{	x=SS;
-			s++;
-		}
-		else if(*(s+1)=='p' || *(s+1) == 'P')
-		{	x=SP;
-			s++;
-		}
-		else x=S;
-		(void) op_gen(x,0,0,0);
-		break;
-	case '/': (void) op_gen(SLASH,0,0,0); break;
-	case '-': sign=1;
-	case '+':	s++;	/*OUTRAGEOUS CODING TRICK*/
-	case '0': case '1': case '2': case '3': case '4':
-	case '5': case '6': case '7': case '8': case '9':
-		if (!(s=gt_num(s,&n,0))) {
- bad:			*p = 0;
-			return 1;
-			}
-		switch(*s)
-		{
-		default:
-			return(0);
-		case 'P':
-		case 'p': if(sign) n= -n; (void) op_gen(P,n,0,0); break;
-		case 'X':
-		case 'x': (void) op_gen(X,n,0,0); break;
-		case 'H':
-		case 'h':
-			sp = &f__syl[op_gen(H,n,0,0)];
-			sp->p2.s = s + 1;
-			s+=n;
-			break;
-		}
-		break;
-	case GLITCH:
-	case '"':
-	case '\'':
-		sp = &f__syl[op_gen(APOS,0,0,0)];
-		sp->p2.s = s;
-		if((*p = ap_end(s)) == NULL)
-			return(0);
-		return(1);
-	case 'T':
-	case 't':
-		if(*(s+1)=='l' || *(s+1) == 'L')
-		{	x=TL;
-			s++;
-		}
-		else if(*(s+1)=='r'|| *(s+1) == 'R')
-		{	x=TR;
-			s++;
-		}
-		else x=T;
-		if (!(s=gt_num(s+1,&n,0)))
-			goto bad;
-		s--;
-		(void) op_gen(x,n,0,0);
-		break;
-	case 'X':
-	case 'x': (void) op_gen(X,1,0,0); break;
+	  return (0);
 	case 'P':
-	case 'p': (void) op_gen(P,1,0,0); break;
+	case 'p':
+	  if (sign)
+	    n = -n;
+	  (void) op_gen (P, n, 0, 0);
+	  break;
+	case 'X':
+	case 'x':
+	  (void) op_gen (X, n, 0, 0);
+	  break;
+	case 'H':
+	case 'h':
+	  sp = &f__syl[op_gen (H, n, 0, 0)];
+	  sp->p2.s = s + 1;
+	  s += n;
+	  break;
+	}
+      break;
+    case GLITCH:
+    case '"':
+    case '\'':
+      sp = &f__syl[op_gen (APOS, 0, 0, 0)];
+      sp->p2.s = s;
+      if ((*p = ap_end (s)) == NULL)
+	return (0);
+      return (1);
+    case 'T':
+    case 't':
+      if (*(s + 1) == 'l' || *(s + 1) == 'L')
+	{
+	  x = TL;
+	  s++;
+	}
+      else if (*(s + 1) == 'r' || *(s + 1) == 'R')
+	{
+	  x = TR;
+	  s++;
 	}
+      else
+	x = T;
+      if (!(s = gt_num (s + 1, &n, 0)))
+	goto bad;
+      s--;
+      (void) op_gen (x, n, 0, 0);
+      break;
+    case 'X':
+    case 'x':
+      (void) op_gen (X, 1, 0, 0);
+      break;
+    case 'P':
+    case 'p':
+      (void) op_gen (P, 1, 0, 0);
+      break;
+    }
+  s++;
+  *p = s;
+  return (1);
+}
+
+static
+e_d (char *s, char **p)
+{
+  int i, im, n, w, d, e, found = 0, x = 0;
+  char *sv = s;
+  s = gt_num (s, &n, 1);
+  (void) op_gen (STACK, n, 0, 0);
+  switch (*s++)
+    {
+    default:
+      break;
+    case 'E':
+    case 'e':
+      x = 1;
+    case 'G':
+    case 'g':
+      found = 1;
+      if (!(s = gt_num (s, &w, 0)))
+	{
+	bad:
+	  *p = 0;
+	  return 1;
+	}
+      if (w == 0)
+	break;
+      if (*s == '.')
+	{
+	  if (!(s = gt_num (s + 1, &d, 0)))
+	    goto bad;
+	}
+      else
+	d = 0;
+      if (*s != 'E' && *s != 'e')
+	(void) op_gen (x == 1 ? E : G, w, d, 0);	/* default is Ew.dE2 */
+      else
+	{
+	  if (!(s = gt_num (s + 1, &e, 0)))
+	    goto bad;
+	  (void) op_gen (x == 1 ? EE : GE, w, d, e);
+	}
+      break;
+    case 'O':
+    case 'o':
+      i = O;
+      im = OM;
+      goto finish_I;
+    case 'Z':
+    case 'z':
+      i = Z;
+      im = ZM;
+      goto finish_I;
+    case 'L':
+    case 'l':
+      found = 1;
+      if (!(s = gt_num (s, &w, 0)))
+	goto bad;
+      if (w == 0)
+	break;
+      (void) op_gen (L, w, 0, 0);
+      break;
+    case 'A':
+    case 'a':
+      found = 1;
+      skip (s);
+      if (*s >= '0' && *s <= '9')
+	{
+	  s = gt_num (s, &w, 1);
+	  if (w == 0)
+	    break;
+	  (void) op_gen (AW, w, 0, 0);
+	  break;
+	}
+      (void) op_gen (A, 0, 0, 0);
+      break;
+    case 'F':
+    case 'f':
+      if (!(s = gt_num (s, &w, 0)))
+	goto bad;
+      found = 1;
+      if (w == 0)
+	break;
+      if (*s == '.')
+	{
+	  if (!(s = gt_num (s + 1, &d, 0)))
+	    goto bad;
+	}
+      else
+	d = 0;
+      (void) op_gen (F, w, d, 0);
+      break;
+    case 'D':
+    case 'd':
+      found = 1;
+      if (!(s = gt_num (s, &w, 0)))
+	goto bad;
+      if (w == 0)
+	break;
+      if (*s == '.')
+	{
+	  if (!(s = gt_num (s + 1, &d, 0)))
+	    goto bad;
+	}
+      else
+	d = 0;
+      (void) op_gen (D, w, d, 0);
+      break;
+    case 'I':
+    case 'i':
+      i = I;
+      im = IM;
+    finish_I:
+      if (!(s = gt_num (s, &w, 0)))
+	goto bad;
+      found = 1;
+      if (w == 0)
+	break;
+      if (*s != '.')
+	{
+	  (void) op_gen (i, w, 0, 0);
+	  break;
+	}
+      if (!(s = gt_num (s + 1, &d, 0)))
+	goto bad;
+      (void) op_gen (im, w, d, 0);
+      break;
+    }
+  if (found == 0)
+    {
+      f__pc--;			/*unSTACK */
+      *p = sv;
+      return (0);
+    }
+  *p = s;
+  return (1);
+}
+static char *
+i_tem (char *s)
+{
+  char *t;
+  int n, curloc;
+  if (*s == ')')
+    return (s);
+  if (ne_d (s, &t))
+    return (t);
+  if (e_d (s, &t))
+    return (t);
+  s = gt_num (s, &n, 1);
+  if ((curloc = op_gen (STACK, n, 0, 0)) < 0)
+    return (NULL);
+  return (f_s (s, curloc));
+}
+
+static char *
+f_list (char *s)
+{
+  for (; *s != 0;)
+    {
+      skip (s);
+      if ((s = i_tem (s)) == NULL)
+	return (NULL);
+      skip (s);
+      if (*s == ',')
 	s++;
-	*p=s;
-	return(1);
+      else if (*s == ')')
+	{
+	  if (--f__parenlvl == 0)
+	    {
+	      (void) op_gen (REVERT, f__revloc, 0, 0);
+	      return (++s);
+	    }
+	  (void) op_gen (GOTO, 0, 0, 0);
+	  return (++s);
+	}
+    }
+  return (NULL);
 }
 
- static
-e_d(char *s, char **p)
-{	int i,im,n,w,d,e,found=0,x=0;
-	char *sv=s;
-	s=gt_num(s,&n,1);
-	(void) op_gen(STACK,n,0,0);
-	switch(*s++)
-	{
-	default: break;
-	case 'E':
-	case 'e':	x=1;
-	case 'G':
-	case 'g':
-		found=1;
-		if (!(s=gt_num(s,&w,0))) {
- bad:
-			*p = 0;
-			return 1;
-			}
-		if(w==0) break;
-		if(*s=='.') {
-			if (!(s=gt_num(s+1,&d,0)))
-				goto bad;
-			}
-		else d=0;
-		if(*s!='E' && *s != 'e')
-			(void) op_gen(x==1?E:G,w,d,0);	/* default is Ew.dE2 */
-		else {
-			if (!(s=gt_num(s+1,&e,0)))
-				goto bad;
-			(void) op_gen(x==1?EE:GE,w,d,e);
-			}
-		break;
-	case 'O':
-	case 'o':
-		i = O;
-		im = OM;
-		goto finish_I;
-	case 'Z':
-	case 'z':
-		i = Z;
-		im = ZM;
-		goto finish_I;
-	case 'L':
-	case 'l':
-		found=1;
-		if (!(s=gt_num(s,&w,0)))
-			goto bad;
-		if(w==0) break;
-		(void) op_gen(L,w,0,0);
-		break;
-	case 'A':
-	case 'a':
-		found=1;
-		skip(s);
-		if(*s>='0' && *s<='9')
-		{	s=gt_num(s,&w,1);
-			if(w==0) break;
-			(void) op_gen(AW,w,0,0);
-			break;
-		}
-		(void) op_gen(A,0,0,0);
-		break;
-	case 'F':
-	case 'f':
-		if (!(s=gt_num(s,&w,0)))
-			goto bad;
-		found=1;
-		if(w==0) break;
-		if(*s=='.') {
-			if (!(s=gt_num(s+1,&d,0)))
-				goto bad;
-			}
-		else d=0;
-		(void) op_gen(F,w,d,0);
-		break;
-	case 'D':
-	case 'd':
-		found=1;
-		if (!(s=gt_num(s,&w,0)))
-			goto bad;
-		if(w==0) break;
-		if(*s=='.') {
-			if (!(s=gt_num(s+1,&d,0)))
-				goto bad;
-			}
-		else d=0;
-		(void) op_gen(D,w,d,0);
-		break;
-	case 'I':
-	case 'i':
-		i = I;
-		im = IM;
- finish_I:
-		if (!(s=gt_num(s,&w,0)))
-			goto bad;
-		found=1;
-		if(w==0) break;
-		if(*s!='.')
-		{	(void) op_gen(i,w,0,0);
-			break;
-		}
-		if (!(s=gt_num(s+1,&d,0)))
-			goto bad;
-		(void) op_gen(im,w,d,0);
-		break;
-	}
-	if(found==0)
-	{	f__pc--; /*unSTACK*/
-		*p=sv;
-		return(0);
-	}
-	*p=s;
-	return(1);
-}
- static
-char *i_tem(char *s)
-{	char *t;
-	int n,curloc;
-	if(*s==')') return(s);
-	if(ne_d(s,&t)) return(t);
-	if(e_d(s,&t)) return(t);
-	s=gt_num(s,&n,1);
-	if((curloc=op_gen(STACK,n,0,0))<0) return(NULL);
-	return(f_s(s,curloc));
-}
-
- static
-char *f_list(char *s)
-{
-	for(;*s!=0;)
-	{	skip(s);
-		if((s=i_tem(s))==NULL) return(NULL);
-		skip(s);
-		if(*s==',') s++;
-		else if(*s==')')
-		{	if(--f__parenlvl==0)
-			{
-				(void) op_gen(REVERT,f__revloc,0,0);
-				return(++s);
-			}
-			(void) op_gen(GOTO,0,0,0);
-			return(++s);
-		}
-	}
-	return(NULL);
-}
-
-pars_f(char *s)
-{
-	char *e;
-
-	f__parenlvl=f__revloc=f__pc=0;
-	if((e=f_s(s,0)) == NULL)
-	{
-		/* Try and delimit the format string.  Parens within
-		   hollerith and quoted strings have to match for this
-		   to work, but it's probably adequate for most needs.
-		   Note that this is needed because a valid CHARACTER
-		   variable passed for FMT= can contain '(I)garbage',
-		   where `garbage' is billions and billions of junk
-		   characters, and it's up to the run-time library to
-		   know where the format string ends by counting parens.
-		   Meanwhile, still treat NUL byte as "hard stop", since
-		   f2c still appends that at end of FORMAT-statement
-		   strings.  */
-
-		int level=0;
-
-		for (f__fmtlen=0;
-			((*s!=')') || (--level > 0))
-				&& (*s!='\0')
-				&& (f__fmtlen<80);
-			++s, ++f__fmtlen)
-		{
-			if (*s=='(')
-				++level;
-		}
-		if (*s==')')
-			++f__fmtlen;
-		return(-1);
+pars_f (char *s)
+{
+  char *e;
+
+  f__parenlvl = f__revloc = f__pc = 0;
+  if ((e = f_s (s, 0)) == NULL)
+    {
+      /* Try and delimit the format string.  Parens within
+         hollerith and quoted strings have to match for this
+         to work, but it's probably adequate for most needs.
+         Note that this is needed because a valid CHARACTER
+         variable passed for FMT= can contain '(I)garbage',
+         where `garbage' is billions and billions of junk
+         characters, and it's up to the run-time library to
+         know where the format string ends by counting parens.
+         Meanwhile, still treat NUL byte as "hard stop", since
+         f2c still appends that at end of FORMAT-statement
+         strings.  */
+
+      int level = 0;
+
+      for (f__fmtlen = 0;
+	   ((*s != ')') || (--level > 0))
+	   && (*s != '\0') && (f__fmtlen < 80); ++s, ++f__fmtlen)
+	{
+	  if (*s == '(')
+	    ++level;
 	}
-	f__fmtlen = e - s;
-	return(0);
+      if (*s == ')')
+	++f__fmtlen;
+      return (-1);
+    }
+  f__fmtlen = e - s;
+  return (0);
 }
+
 #define STKSZ 10
-int f__cnt[STKSZ],f__ret[STKSZ],f__cp,f__rp;
+int f__cnt[STKSZ], f__ret[STKSZ], f__cp, f__rp;
 flag f__workdone, f__nonl;
 
- static
-type_f(int n)
+static
+type_f (int n)
 {
-	switch(n)
-	{
-	default:
-		return(n);
-	case RET1:
-		return(RET1);
-	case REVERT: return(REVERT);
-	case GOTO: return(GOTO);
-	case STACK: return(STACK);
-	case X:
-	case SLASH:
-	case APOS: case H:
-	case T: case TL: case TR:
-		return(NED);
-	case F:
-	case I:
-	case IM:
-	case A: case AW:
-	case O: case OM:
-	case L:
-	case E: case EE: case D:
-	case G: case GE:
-	case Z: case ZM:
-		return(ED);
-	}
-}
-integer do_fio(ftnint *number, char *ptr, ftnlen len)
-{	struct syl *p;
-	int n,i;
-	for(i=0;i<*number;i++,ptr+=len)
-	{
-loop:	switch(type_f((p= &f__syl[f__pc])->op))
+  switch (n)
+    {
+    default:
+      return (n);
+    case RET1:
+      return (RET1);
+    case REVERT:
+      return (REVERT);
+    case GOTO:
+      return (GOTO);
+    case STACK:
+      return (STACK);
+    case X:
+    case SLASH:
+    case APOS:
+    case H:
+    case T:
+    case TL:
+    case TR:
+      return (NED);
+    case F:
+    case I:
+    case IM:
+    case A:
+    case AW:
+    case O:
+    case OM:
+    case L:
+    case E:
+    case EE:
+    case D:
+    case G:
+    case GE:
+    case Z:
+    case ZM:
+      return (ED);
+    }
+}
+integer
+do_fio (ftnint * number, char *ptr, ftnlen len)
+{
+  struct syl *p;
+  int n, i;
+  for (i = 0; i < *number; i++, ptr += len)
+    {
+    loop:switch (type_f ((p = &f__syl[f__pc])->op))
 	{
 	default:
-		fprintf(stderr,"unknown code in do_fio: %d\n%.*s\n",
-			p->op,f__fmtlen,f__fmtbuf);
-		err(f__elist->cierr,100,"do_fio");
+	  fprintf (stderr, "unknown code in do_fio: %d\n%.*s\n",
+		   p->op, f__fmtlen, f__fmtbuf);
+	  err (f__elist->cierr, 100, "do_fio");
 	case NED:
-		if((*f__doned)(p))
-		{	f__pc++;
-			goto loop;
-		}
-		f__pc++;
-		continue;
+	  if ((*f__doned) (p))
+	    {
+	      f__pc++;
+	      goto loop;
+	    }
+	  f__pc++;
+	  continue;
 	case ED:
-		if(f__cnt[f__cp]<=0)
-		{	f__cp--;
-			f__pc++;
-			goto loop;
-		}
-		if(ptr==NULL)
-			return((*f__doend)());
-		f__cnt[f__cp]--;
-		f__workdone=1;
-		if((n=(*f__doed)(p,ptr,len))>0)
-			errfl(f__elist->cierr,errno,"fmt");
-		if(n<0)
-			err(f__elist->ciend,(EOF),"fmt");
-		continue;
+	  if (f__cnt[f__cp] <= 0)
+	    {
+	      f__cp--;
+	      f__pc++;
+	      goto loop;
+	    }
+	  if (ptr == NULL)
+	    return ((*f__doend) ());
+	  f__cnt[f__cp]--;
+	  f__workdone = 1;
+	  if ((n = (*f__doed) (p, ptr, len)) > 0)
+	    errfl (f__elist->cierr, errno, "fmt");
+	  if (n < 0)
+	    err (f__elist->ciend, (EOF), "fmt");
+	  continue;
 	case STACK:
-		f__cnt[++f__cp]=p->p1;
-		f__pc++;
-		goto loop;
+	  f__cnt[++f__cp] = p->p1;
+	  f__pc++;
+	  goto loop;
 	case RET1:
-		f__ret[++f__rp]=p->p1;
-		f__pc++;
-		goto loop;
+	  f__ret[++f__rp] = p->p1;
+	  f__pc++;
+	  goto loop;
 	case GOTO:
-		if(--f__cnt[f__cp]<=0)
-		{	f__cp--;
-			f__rp--;
-			f__pc++;
-			goto loop;
-		}
-		f__pc=1+f__ret[f__rp--];
-		goto loop;
+	  if (--f__cnt[f__cp] <= 0)
+	    {
+	      f__cp--;
+	      f__rp--;
+	      f__pc++;
+	      goto loop;
+	    }
+	  f__pc = 1 + f__ret[f__rp--];
+	  goto loop;
 	case REVERT:
-		f__rp=f__cp=0;
-		f__pc = p->p1;
-		if(ptr==NULL)
-			return((*f__doend)());
-		if(!f__workdone) return(0);
-		if((n=(*f__dorevert)()) != 0) return(n);
-		goto loop;
+	  f__rp = f__cp = 0;
+	  f__pc = p->p1;
+	  if (ptr == NULL)
+	    return ((*f__doend) ());
+	  if (!f__workdone)
+	    return (0);
+	  if ((n = (*f__dorevert) ()) != 0)
+	    return (n);
+	  goto loop;
 	case COLON:
-		if(ptr==NULL)
-			return((*f__doend)());
-		f__pc++;
-		goto loop;
+	  if (ptr == NULL)
+	    return ((*f__doend) ());
+	  f__pc++;
+	  goto loop;
 	case NONL:
-		f__nonl = 1;
-		f__pc++;
-		goto loop;
+	  f__nonl = 1;
+	  f__pc++;
+	  goto loop;
 	case S:
 	case SS:
-		f__cplus=0;
-		f__pc++;
-		goto loop;
+	  f__cplus = 0;
+	  f__pc++;
+	  goto loop;
 	case SP:
-		f__cplus = 1;
-		f__pc++;
-		goto loop;
-	case P:	f__scale=p->p1;
-		f__pc++;
-		goto loop;
+	  f__cplus = 1;
+	  f__pc++;
+	  goto loop;
+	case P:
+	  f__scale = p->p1;
+	  f__pc++;
+	  goto loop;
 	case BN:
-		f__cblank=0;
-		f__pc++;
-		goto loop;
+	  f__cblank = 0;
+	  f__pc++;
+	  goto loop;
 	case BZ:
-		f__cblank=1;
-		f__pc++;
-		goto loop;
-	}
+	  f__cblank = 1;
+	  f__pc++;
+	  goto loop;
 	}
-	return(0);
+    }
+  return (0);
 }
-en_fio(void)
-{	ftnint one=1;
-	return(do_fio(&one,(char *)NULL,(ftnint)0));
+
+en_fio (void)
+{
+  ftnint one = 1;
+  return (do_fio (&one, (char *) NULL, (ftnint) 0));
 }
+
 void
-fmt_bg(void)
+fmt_bg (void)
 {
-	f__workdone=f__cp=f__rp=f__pc=f__cursor=0;
-	f__cnt[0]=f__ret[0]=0;
+  f__workdone = f__cp = f__rp = f__pc = f__cursor = 0;
+  f__cnt[0] = f__ret[0] = 0;
 }
diff -rup orig/egcc-CVS20020531/libf2c/libI77/fmt.h egcc-CVS20020531/libf2c/libI77/fmt.h
--- orig/egcc-CVS20020531/libf2c/libI77/fmt.h	2002-05-31 21:54:26.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/fmt.h	2002-05-31 23:15:41.226670978 -0400
@@ -1,8 +1,14 @@
 struct syl
-{	int op;
-	int p1;
-	union { int i[2]; char *s;} p2;
-	};
+{
+  int op;
+  int p1;
+  union
+  {
+    int i[2];
+    char *s;
+  }
+  p2;
+};
 #define RET1 1
 #define REVERT 2
 #define GOTO 3
@@ -39,30 +45,34 @@ struct syl
 #define OM 34
 #define Z 35
 #define ZM 36
-extern int f__pc,f__parenlvl,f__revloc;
+extern int f__pc, f__parenlvl, f__revloc;
 typedef union
-{	real pf;
-	doublereal pd;
-} ufloat;
+{
+  real pf;
+  doublereal pd;
+}
+ufloat;
 typedef union
-{	short is;
-	signed
-		char ic;
-	integer il;
+{
+  short is;
+  signed char ic;
+  integer il;
 #ifdef Allow_TYQUAD
-	longint ili;
+  longint ili;
 #endif
-} Uint;
-extern int (*f__doed)(struct syl*, char*, ftnlen),(*f__doned)(struct syl*);
-extern int (*f__dorevert)(void);
-extern void fmt_bg(void);
-extern int pars_f(char*);
-extern int rd_ed(struct syl*, char*, ftnlen),rd_ned(struct syl*);
-extern int w_ed(struct syl*, char*, ftnlen),w_ned(struct syl*);
-extern int wrt_E(ufloat*, int, int, int, ftnlen);
-extern int wrt_F(ufloat*, int, int, ftnlen);
-extern int wrt_L(Uint*, int, ftnlen);
-extern flag f__cblank,f__cplus,f__workdone, f__nonl;
+}
+Uint;
+extern int (*f__doed) (struct syl *, char *, ftnlen),
+  (*f__doned) (struct syl *);
+extern int (*f__dorevert) (void);
+extern void fmt_bg (void);
+extern int pars_f (char *);
+extern int rd_ed (struct syl *, char *, ftnlen), rd_ned (struct syl *);
+extern int w_ed (struct syl *, char *, ftnlen), w_ned (struct syl *);
+extern int wrt_E (ufloat *, int, int, int, ftnlen);
+extern int wrt_F (ufloat *, int, int, ftnlen);
+extern int wrt_L (Uint *, int, ftnlen);
+extern flag f__cblank, f__cplus, f__workdone, f__nonl;
 extern char *f__fmtbuf;
 extern int f__fmtlen;
 extern int f__scale;
@@ -79,4 +89,4 @@ extern int f__cursor;
 #define TYQUAD 14
 #endif
 
-extern char *f__icvt(longint, int*, int*, int);
+extern char *f__icvt (longint, int *, int *, int);
diff -rup orig/egcc-CVS20020531/libf2c/libI77/fmtlib.c egcc-CVS20020531/libf2c/libI77/fmtlib.c
--- orig/egcc-CVS20020531/libf2c/libI77/fmtlib.c	2002-05-31 21:47:44.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/fmtlib.c	2002-05-31 23:15:41.226670978 -0400
@@ -10,32 +10,37 @@
 #define ulongint unsigned long
 #endif
 
-char *f__icvt(longint value, int *ndigit, int *sign, int base)
+char *
+f__icvt (longint value, int *ndigit, int *sign, int base)
 {
-	static char buf[MAXINTLENGTH+1];
-	register int i;
-	ulongint uvalue;
+  static char buf[MAXINTLENGTH + 1];
+  register int i;
+  ulongint uvalue;
 
-	if(value > 0) {
-		uvalue = value;
-		*sign = 0;
-		}
-	else if (value < 0) {
-		uvalue = -value;
-		*sign = 1;
-		}
-	else {
-		*sign = 0;
-		*ndigit = 1;
-		buf[MAXINTLENGTH-1] = '0';
-		return &buf[MAXINTLENGTH-1];
-		}
-	i = MAXINTLENGTH;
-	do {
-		buf[--i] = (uvalue%base) + '0';
-		uvalue /= base;
-		}
-		while(uvalue > 0);
-	*ndigit = MAXINTLENGTH - i;
-	return &buf[i];
-	}
+  if (value > 0)
+    {
+      uvalue = value;
+      *sign = 0;
+    }
+  else if (value < 0)
+    {
+      uvalue = -value;
+      *sign = 1;
+    }
+  else
+    {
+      *sign = 0;
+      *ndigit = 1;
+      buf[MAXINTLENGTH - 1] = '0';
+      return &buf[MAXINTLENGTH - 1];
+    }
+  i = MAXINTLENGTH;
+  do
+    {
+      buf[--i] = (uvalue % base) + '0';
+      uvalue /= base;
+    }
+  while (uvalue > 0);
+  *ndigit = MAXINTLENGTH - i;
+  return &buf[i];
+}
diff -rup orig/egcc-CVS20020531/libf2c/libI77/fp.h egcc-CVS20020531/libf2c/libI77/fp.h
--- orig/egcc-CVS20020531/libf2c/libI77/fp.h	1999-09-04 11:09:18.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/fp.h	2002-05-31 23:15:41.226670978 -0400
@@ -4,7 +4,7 @@
 /* FMAX = max number of nonzero digits passed to atof() */
 /* EXPMAX = 10^EXPMAXDIGS - 1 = largest allowed exponent absolute value */
 
-#ifdef V10 /* Research Tenth-Edition Unix */
+#ifdef V10			/* Research Tenth-Edition Unix */
 #include "local.h"
 #endif
 
diff -rup orig/egcc-CVS20020531/libf2c/libI77/ftell_.c egcc-CVS20020531/libf2c/libI77/ftell_.c
--- orig/egcc-CVS20020531/libf2c/libI77/ftell_.c	2002-05-31 21:47:44.000000000 -0400
+++ egcc-CVS20020531/libf2c/libI77/ftell_.c	2002-05-31 23:15:41.226670978 -0400
@@ -2,34 +2,34 @@
 #include "f2c.h"
 #include "fio.h"
 
- static FILE *
-unit_chk(integer Unit, char *who)
+static FILE *
+unit_chk (integer Unit, char *who)
 {
-	if (Unit >= MXUNIT || Unit < 0)
-		f__fatal(101, who);
-	return f__units[Unit].ufd;
-	}
+  if (Unit >= MXUNIT || Unit < 0)
+    f__fatal (101, who);
+  return f__units[Unit].ufd;
+}
 
- integer
-G77_ftell_0 (integer *Unit)
+integer
+G77_ftell_0 (integer * Unit)
 {
-	FILE *f;
-	return (f = unit_chk(*Unit, "ftell")) ? (integer) FTELL(f) : -1L;
-	}
+  FILE *f;
+  return (f = unit_chk (*Unit, "ftell")) ? (integer) FTELL (f) : -1L;
+}
 
- integer
-G77_fseek_0 (integer *Unit, integer *offset, integer *xwhence)
+integer
+G77_fseek_0 (integer * Unit, integer * offset, integer * xwhence)
 {
-	FILE *f;
-	int w = (int)*xwhence;
+  FILE *f;
+  int w = (int) *xwhence;
 #ifdef SEEK_SET
-	static int wohin[3] = { SEEK_SET, SEEK_CUR, SEEK_END };
+  static int wohin[3] = { SEEK_SET, SEEK_CUR, SEEK_END };
 #endif
-	if (w < 0 || w > 2)
-		w = 0;
+  if (w < 0 || w > 2)
+    w = 0;
 #ifdef SEEK_SET
-	w = wohin[w];
+  w = wohin[w];
 #endif
-	return	!(f = unit_chk(*Unit, "fseek"))
-		|| FSEEK(f, (off_t) *offset, w) ? 1 : 0;
-	}
+  return !(f = unit_chk (*Unit, "fseek"))
+    || FSEEK (f, (off_t) * offset, w) ? 1 : 0;
+}



More information about the Gcc-patches mailing list