===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/write/write.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/write/write.c	1996/06/26 05:44:00	1.4
--- src/usr.bin/write/write.c	1996/08/26 10:22:11	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: write.c,v 1.4 1996/06/26 05:44:00 deraadt Exp $	*/
  /*	$NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: write.c,v 1.5 1996/08/26 10:22:11 deraadt Exp $	*/
  /*	$NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $	*/
  
  /*
***************
*** 47,53 ****
  #if 0
  static char sccsid[] = "@(#)write.c	8.2 (Berkeley) 4/27/95";
  #endif
! static char *rcsid = "$OpenBSD: write.c,v 1.4 1996/06/26 05:44:00 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 47,53 ----
  #if 0
  static char sccsid[] = "@(#)write.c	8.2 (Berkeley) 4/27/95";
  #endif
! static char *rcsid = "$OpenBSD: write.c,v 1.5 1996/08/26 10:22:11 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 63,68 ****
--- 63,69 ----
  #include <unistd.h>
  #include <utmp.h>
  #include <err.h>
+ #include <vis.h>
  
  void done(); 
  void do_write __P((char *, char *, uid_t));
***************
*** 297,303 ****
  wr_fputs(s)
  	register char *s;
  {
! 	register char c;
  
  #define	PUTC(c)	if (putchar(c) == EOF) goto err;
  
--- 298,305 ----
  wr_fputs(s)
  	register char *s;
  {
! 	register u_char c;
! 	char visout[4], *s2;
  
  #define	PUTC(c)	if (putchar(c) == EOF) goto err;
  
***************
*** 305,321 ****
  		c = toascii(*s);
  		if (c == '\n') {
  			PUTC('\r');
! 		} else if (!isprint(c) && !isspace(c) && c != '\007') {
! 			if (c & 0x80) {
! 				PUTC('M');
! 				PUTC('-');
! 				c &= ~0x80;
! 			} else {
! 				PUTC('^');
! 				c &= ~0x40;
! 			}
  		}
! 		PUTC(c);
  	}
  	return;
  
--- 307,318 ----
  		c = toascii(*s);
  		if (c == '\n') {
  			PUTC('\r');
! 			PUTC('\n');
! 			continue;
  		}
! 		vis(visout, c, VIS_SAFE, s[1]);
! 		for (s2 = visout; *s2; s2++)
! 			PUTC(*s2);
  	}
  	return;