===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/awk/tran.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/awk/tran.c	2003/04/06 06:12:01	1.10
--- src/usr.bin/awk/tran.c	2004/12/30 01:52:48	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: tran.c,v 1.10 2003/04/06 06:12:01 pvalchev Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
--- 1,4 ----
! /*	$OpenBSD: tran.c,v 1.11 2004/12/30 01:52:48 millert Exp $	*/
  /****************************************************************
  Copyright (C) Lucent Technologies 1997
  All Rights Reserved
***************
*** 52,57 ****
--- 52,58 ----
  Awkfloat *RSTART;	/* start of re matched with ~; origin 1 (!) */
  Awkfloat *RLENGTH;	/* length of same */
  
+ Cell	*fsloc;		/* FS */
  Cell	*nrloc;		/* NR */
  Cell	*nfloc;		/* NF */
  Cell	*fnrloc;	/* FNR */
***************
*** 74,80 ****
  	nullloc = setsymtab("$zero&null", "", 0.0, NUM|STR|CON|DONTFREE, symtab);
  	nullnode = celltonode(nullloc, CCON);
  
! 	FS = &setsymtab("FS", " ", 0.0, STR|DONTFREE, symtab)->sval;
  	RS = &setsymtab("RS", "\n", 0.0, STR|DONTFREE, symtab)->sval;
  	OFS = &setsymtab("OFS", " ", 0.0, STR|DONTFREE, symtab)->sval;
  	ORS = &setsymtab("ORS", "\n", 0.0, STR|DONTFREE, symtab)->sval;
--- 75,82 ----
  	nullloc = setsymtab("$zero&null", "", 0.0, NUM|STR|CON|DONTFREE, symtab);
  	nullnode = celltonode(nullloc, CCON);
  
! 	fsloc = setsymtab("FS", " ", 0.0, STR|DONTFREE, symtab);
! 	FS = &fsloc->sval;
  	RS = &setsymtab("RS", "\n", 0.0, STR|DONTFREE, symtab)->sval;
  	OFS = &setsymtab("OFS", " ", 0.0, STR|DONTFREE, symtab)->sval;
  	ORS = &setsymtab("ORS", "\n", 0.0, STR|DONTFREE, symtab)->sval;
***************
*** 316,322 ****
  	char *t;
  	int fldno;
  
! 	   dprintf( ("starting setsval %p: %s = \"%s\", t=%o\n", vp, NN(vp->nval), s, vp->tval) );
  	if ((vp->tval & (NUM | STR)) == 0)
  		funnyvar(vp, "assign to");
  	if (isfld(vp)) {
--- 318,325 ----
  	char *t;
  	int fldno;
  
! 	   dprintf( ("starting setsval %p: %s = \"%s\", t=%o, r,f=%d,%d\n", 
! 		vp, NN(vp->nval), s, vp->tval, donerec, donefld) );
  	if ((vp->tval & (NUM | STR)) == 0)
  		funnyvar(vp, "assign to");
  	if (isfld(vp)) {
***************
*** 335,341 ****
  	if (freeable(vp))
  		xfree(vp->sval);
  	vp->tval &= ~DONTFREE;
! 	   dprintf( ("setsval %p: %s = \"%s (%p)\", t=%o\n", vp, NN(vp->nval), t,t, vp->tval) );
  	return(vp->sval = t);
  }
  
--- 338,345 ----
  	if (freeable(vp))
  		xfree(vp->sval);
  	vp->tval &= ~DONTFREE;
! 	   dprintf( ("setsval %p: %s = \"%s (%p) \", t=%o r,f=%d,%d\n", 
! 		vp, NN(vp->nval), t,t, vp->tval, donerec, donefld) );
  	return(vp->sval = t);
  }
  
***************
*** 356,363 ****
  	return(vp->fval);
  }
  
!  static char *get_str_val(Cell *vp, char **fmt)        /* get string val of a Cell */
! 
  {
  	char s[100];	/* BUG: unchecked */
  	double dtemp;
--- 360,366 ----
  	return(vp->fval);
  }
  
! static char *get_str_val(Cell *vp, char **fmt)        /* get string val of a Cell */
  {
  	char s[100];	/* BUG: unchecked */
  	double dtemp;