===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sed/process.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/sed/process.c	1996/06/26 05:39:08	1.2
--- src/usr.bin/sed/process.c	1997/09/11 11:21:07	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: process.c,v 1.2 1996/06/26 05:39:08 deraadt Exp $	*/
  
  /*-
   * Copyright (c) 1992 Diomidis Spinellis.
--- 1,4 ----
! /*	$OpenBSD: process.c,v 1.3 1997/09/11 11:21:07 deraadt Exp $	*/
  
  /*-
   * Copyright (c) 1992 Diomidis Spinellis.
***************
*** 39,45 ****
  
  #ifndef lint
  /* from: static char sccsid[] = "@(#)process.c	8.1 (Berkeley) 6/6/93"; */
! static char *rcsid = "$OpenBSD: process.c,v 1.2 1996/06/26 05:39:08 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 39,45 ----
  
  #ifndef lint
  /* from: static char sccsid[] = "@(#)process.c	8.1 (Berkeley) 6/6/93"; */
! static char *rcsid = "$OpenBSD: process.c,v 1.3 1997/09/11 11:21:07 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 445,451 ****
  			 */
  			if ((f = fopen(appends[i].s, "r")) == NULL)
  				break;
! 			while (count = fread(buf, sizeof(char), sizeof(buf), f))
  				(void)fwrite(buf, sizeof(char), count, stdout);
  			(void)fclose(f);
  			break;
--- 445,451 ----
  			 */
  			if ((f = fopen(appends[i].s, "r")) == NULL)
  				break;
! 			while ((count = fread(buf, sizeof(char), sizeof(buf), f)))
  				(void)fwrite(buf, sizeof(char), count, stdout);
  			(void)fclose(f);
  			break;
***************
*** 465,471 ****
  	static int termwidth = -1;
  
  	if (termwidth == -1)
! 		if (p = getenv("COLUMNS"))
  			termwidth = atoi(p);
  		else if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) == 0 &&
  		    win.ws_col > 0)
--- 465,471 ----
  	static int termwidth = -1;
  
  	if (termwidth == -1)
! 		if ((p = getenv("COLUMNS")))
  			termwidth = atoi(p);
  		else if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) == 0 &&
  		    win.ws_col > 0)
***************
*** 484,490 ****
  		} else {
  			escapes = "\\\a\b\f\n\r\t\v";
  			(void)putchar('\\');
! 			if (p = strchr(escapes, *s)) {
  				(void)putchar("\\abfnrtv"[p - escapes]);
  				count += 2;
  			} else {
--- 484,490 ----
  		} else {
  			escapes = "\\\a\b\f\n\r\t\v";
  			(void)putchar('\\');
! 			if ((p = strchr(escapes, *s))) {
  				(void)putchar("\\abfnrtv"[p - escapes]);
  				count += 2;
  			} else {