79c618c411
Fixes the following TODO: stty's visible() function and catv's guts are identical. Merge them into an appropriate libbb function. Also makes catv behave exactly like coreutils' cat -v e.g. it'll print 'M-^I' instead of 'M- '. function old new delta visible - 70 +70 do_display 431 379 -52 catv_main 306 250 -56 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/2 up/down: 70/-108) Total: -38 bytes Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
59 lines
1000 B
C
59 lines
1000 B
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Utility routines.
|
|
*
|
|
* Copyright (C) 2007 Denys Vlasenko
|
|
*
|
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
void FAST_FUNC fputc_printable(int ch, FILE *file)
|
|
{
|
|
if ((ch & (0x80 + PRINTABLE_META)) == (0x80 + PRINTABLE_META)) {
|
|
fputs("M-", file);
|
|
ch &= 0x7f;
|
|
}
|
|
ch = (unsigned char) ch;
|
|
if (ch == 0x9b) {
|
|
/* VT100's CSI, aka Meta-ESC, is not printable on vt-100 */
|
|
ch = '{';
|
|
goto print_caret;
|
|
}
|
|
if (ch < ' ') {
|
|
ch += '@';
|
|
goto print_caret;
|
|
}
|
|
if (ch == 0x7f) {
|
|
ch = '?';
|
|
print_caret:
|
|
fputc('^', file);
|
|
}
|
|
fputc(ch, file);
|
|
}
|
|
|
|
void FAST_FUNC visible(unsigned ch, char *buf, int flags)
|
|
{
|
|
if (ch == '\t' && !(flags & VISIBLE_SHOW_TABS)) {
|
|
goto raw;
|
|
}
|
|
if (ch == '\n') {
|
|
if (flags & VISIBLE_ENDLINE)
|
|
*buf++ = '$';
|
|
} else {
|
|
if (ch >= 128) {
|
|
ch -= 128;
|
|
*buf++ = 'M';
|
|
*buf++ = '-';
|
|
}
|
|
if (ch < 32 || ch == 127) {
|
|
*buf++ = '^';
|
|
ch ^= 0x40;
|
|
}
|
|
}
|
|
raw:
|
|
*buf++ = ch;
|
|
*buf = '\0';
|
|
}
|