summaryrefslogtreecommitdiffstats
path: root/text-utils/conv.c
diff options
context:
space:
mode:
authorSami Kerola2010-12-12 23:43:57 +0100
committerKarel Zak2010-12-30 23:11:43 +0100
commit604eb2602c9ade859713fc071526da04bef1878f (patch)
tree589452c79929c96cb3f4ced82799fbf155985615 /text-utils/conv.c
parentlibblkid: fix endian conversion bug in NILFS (diff)
downloadkernel-qcow2-util-linux-604eb2602c9ade859713fc071526da04bef1878f.tar.gz
kernel-qcow2-util-linux-604eb2602c9ade859713fc071526da04bef1878f.tar.xz
kernel-qcow2-util-linux-604eb2602c9ade859713fc071526da04bef1878f.zip
hexdump: remove od functionality in favor to GNU coreutils od
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'text-utils/conv.c')
-rw-r--r--text-utils/conv.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/text-utils/conv.c b/text-utils/conv.c
index 8e0efa16d..95b8cd296 100644
--- a/text-utils/conv.c
+++ b/text-utils/conv.c
@@ -48,8 +48,6 @@ conv_c(PR *pr, u_char *p)
goto strpr;
/* case '\a': */
case '\007':
- if (deprecated) /* od didn't know about \a */
- break;
str = "\\a";
goto strpr;
case '\b':
@@ -68,8 +66,6 @@ conv_c(PR *pr, u_char *p)
str = "\\t";
goto strpr;
case '\v':
- if (deprecated)
- break;
str = "\\v";
goto strpr;
default:
@@ -99,16 +95,10 @@ conv_u(PR *pr, u_char *p)
/* 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]);
+ (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)) {
*pr->cchar = 'c';
(void)printf(pr->fmt, *p);