===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/hexdump/conv.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/hexdump/conv.c	2013/02/09 02:46:03	1.9
--- src/usr.bin/hexdump/conv.c	2014/04/19 09:28:20	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: conv.c,v 1.9 2013/02/09 02:46:03 krw Exp $	*/
  /*	$NetBSD: conv.c,v 1.7 2001/12/07 15:14:29 bjh21 Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: conv.c,v 1.10 2014/04/19 09:28:20 sobrado Exp $	*/
  /*	$NetBSD: conv.c,v 1.7 2001/12/07 15:14:29 bjh21 Exp $	*/
  
  /*
***************
*** 49,55 ****
  		goto strpr;
  	/* case '\a': */
  	case '\007':
! 		if (deprecated)		/* od didn't know about \a */
  			break;
  		str = "\\a";
  		goto strpr;
--- 49,55 ----
  		goto strpr;
  	/* case '\a': */
  	case '\007':
! 		if (odmode)		/* od didn't know about \a */
  			break;
  		str = "\\a";
  		goto strpr;
***************
*** 69,75 ****
  		str = "\\t";
  		goto strpr;
  	case '\v':
! 		if (deprecated)
  			break;
  		str = "\\v";
  		goto strpr;
--- 69,75 ----
  		str = "\\t";
  		goto strpr;
  	case '\v':
! 		if (odmode)
  			break;
  		str = "\\v";
  		goto strpr;
***************
*** 100,113 ****
  						/* od used nl, not lf */
  	if (*p <= 0x1f) {
  		*pr->cchar = 's';
! 		if (deprecated && *p == 0x0a)
  			(void)printf(pr->fmt, "nl");
  		else
  			(void)printf(pr->fmt, list[*p]);
  	} else if (*p == 0x7f) {
  		*pr->cchar = 's';
  		(void)printf(pr->fmt, "del");
! 	} else if (deprecated && *p == 0x20) {	/* od replaced space with sp */
  		*pr->cchar = 's';
  		(void)printf(pr->fmt, " sp");
  	} else if (isprint(*p)) {
--- 100,113 ----
  						/* od used nl, not lf */
  	if (*p <= 0x1f) {
  		*pr->cchar = 's';
! 		if (odmode && *p == 0x0a)
  			(void)printf(pr->fmt, "nl");
  		else
  			(void)printf(pr->fmt, list[*p]);
  	} else if (*p == 0x7f) {
  		*pr->cchar = 's';
  		(void)printf(pr->fmt, "del");
! 	} else if (odmode && *p == 0x20) {	/* od replaced space with sp */
  		*pr->cchar = 's';
  		(void)printf(pr->fmt, " sp");
  	} else if (isprint(*p)) {