diff options
Diffstat (limited to 'src/xxd')
-rw-r--r-- | src/xxd/xxd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index c558426ad..41f8a2465 100644 --- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -231,7 +231,7 @@ char *pname; fprintf(stderr, " or\n %s -r [-s [-]offset] [-c cols] [-ps] [infile [outfile]]\n", pname); fprintf(stderr, "Options:\n"); fprintf(stderr, " -a toggle autoskip: A single '*' replaces nul-lines. Default off.\n"); - fprintf(stderr, " -b binary digit dump (incompatible with -p,-i,-r). Default hex.\n"); + fprintf(stderr, " -b binary digit dump (incompatible with -ps,-i,-r). Default hex.\n"); fprintf(stderr, " -c cols format <cols> octets per line. Default 16 (-i: 12, -ps: 30).\n"); fprintf(stderr, " -E show characters in EBCDIC. Default ASCII.\n"); fprintf(stderr, " -g number of octets per group in normal output. Default 2.\n"); @@ -276,11 +276,11 @@ long base_off; if (c == '\r') /* Doze style input file? */ continue; -#if 0 /* this doesn't work when there is normal text after the hex codes in - the last line that looks like hex */ - if (c == ' ' || c == '\n' || c == '\t') /* allow multiple spaces */ + /* Allow multiple spaces. This doesn't work when there is normal text + * after the hex codes in the last line that looks like hex, thus only + * use it for PostScript format. */ + if (hextype == HEX_POSTSCRIPT && (c == ' ' || c == '\n' || c == '\t')) continue; -#endif n3 = n2; n2 = n1; |