d3c042fc6
Denis Vlasenko
2007-12-30
Subject
libbb: introduce fputc_printable (from ed) netstat: print control chars as ^C etc vi: style fixlet
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
editors/ed.c +2 -14editors/vi.c +1 -1include/libbb.h +5 -0libbb/Kbuild +1 -0networking/netstat.c +10 -7
editors/ed.c+2 -14
| @@ -847,20 +847,8 @@ static int printLines(int num1, int num2, int expandFlag) | |
| count--; | |
| while (count-- > 0) { | |
| - | ch = *cp++; |
| - | if (ch & 0x80) { |
| - | fputs("M-", stdout); |
| - | ch &= 0x7f; |
| - | } |
| - | if (ch < ' ') { |
| - | bb_putchar('^'); |
| - | ch += '@'; |
| - | } |
| - | if (ch == 0x7f) { |
| - | bb_putchar('^'); |
| - | ch = '?'; |
| - | } |
| - | bb_putchar(ch); |
| + | ch = (unsigned char) *cp++; |
| + | fputc_printable(ch | PRINTABLE_META, stdout); |
| } | |
| fputs("$\n", stdout); | |
editors/vi.c+1 -1
| @@ -899,7 +899,7 @@ static void colon(char *buf) | |
| if (c_is_no_print) { | |
| c = '.'; | |
| standout_start(); | |
| - | } |
| + | } |
| if (c == '\n') { | |
| write1("$\r"); | |
| } else if (c < ' ' || c == 127) { | |
include/libbb.h+5 -0
| @@ -426,6 +426,11 @@ char *safe_strncpy(char *dst, const char *src, size_t size); | |
| * But potentially slow, don't use in one-billion-times loops */ | |
| int bb_putchar(int ch); | |
| char *xasprintf(const char *format, ...) __attribute__ ((format (printf, 1, 2))); | |
| + | /* Prints unprintable chars ch as ^C or M-c to file |
| + | * (M-c is used only if ch is ORed with PRINTABLE_META), |
| + | * else it is printed as-is (except for ch = 0x9b) */ |
| + | enum { PRINTABLE_META = 0x100 }; |
| + | void fputc_printable(int ch, FILE *file); |
| // gcc-4.1.1 still isn't good enough at optimizing it | |
| // (+200 bytes compared to macro) | |
| //static ALWAYS_INLINE | |
libbb/Kbuild+1 -0
| @@ -65,6 +65,7 @@ lib-y += perror_msg_and_die.o | |
| lib-y += perror_nomsg.o | |
| lib-y += perror_nomsg_and_die.o | |
| lib-y += pidfile.o | |
| + | lib-y += printable.o |
| lib-y += process_escape_sequence.o | |
| lib-y += procps.o | |
| lib-y += read.o | |
networking/netstat.c+10 -7
| @@ -349,13 +349,9 @@ static int unix_do_one(int nr, char *line) | |
| const char *ss_proto, *ss_state, *ss_type; | |
| char ss_flags[32]; | |
| - | /* TODO: currently we stop at first NUL byte. Is it a problem? */ |
| - | |
| if (nr == 0) | |
| return 0; /* skip header */ | |
| - | *strchrnul(line, '\n') = '\0'; |
| - | |
| /* 2.6.15 may report lines like "... @/tmp/fam-user-^@^@^@^@^@^@^@..." | |
| * Other users report long lines filled by NUL bytes. | |
| * (those ^@ are NUL bytes too). We see them as empty lines. */ | |
| @@ -443,9 +439,16 @@ static int unix_do_one(int nr, char *line) | |
| strcat(ss_flags, "N "); | |
| strcat(ss_flags, "]"); | |
| - | printf("%-5s %-6ld %-11s %-10s %-13s %6lu %s\n", |
| - | ss_proto, refcnt, ss_flags, ss_type, ss_state, inode, |
| - | line + path_ofs); |
| + | printf("%-5s %-6ld %-11s %-10s %-13s %6lu ", |
| + | ss_proto, refcnt, ss_flags, ss_type, ss_state, inode |
| + | ); |
| + | |
| + | /* TODO: currently we stop at first NUL byte. Is it a problem? */ |
| + | line += path_ofs; |
| + | *strchrnul(line, '\n') = '\0'; |
| + | while (*line) |
| + | fputc_printable(*line++, stdout); |
| + | bb_putchar('\n'); |
| return 0; | |
| } | |