diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-09-13 22:48:30 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-09-13 22:48:30 +0200 |
commit | 8187e0143874e1bf0412263e716cf8c782a5aa16 (patch) | |
tree | 289b592b43a7226bbd355728798930c9ead45893 /miscutils | |
parent | 136946c3ea6a14d391b5045b5eb71fa8ec207077 (diff) | |
download | busybox-w32-8187e0143874e1bf0412263e716cf8c782a5aa16.tar.gz busybox-w32-8187e0143874e1bf0412263e716cf8c782a5aa16.tar.bz2 busybox-w32-8187e0143874e1bf0412263e716cf8c782a5aa16.zip |
*: use ESC define instead of "\033"; use ESC[m instead of ESC[0m
text data bss dec hex filename
922535 481 6832 929848 e3038 busybox_old
922534 481 6832 929847 e3037 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/fbsplash.c | 6 | ||||
-rw-r--r-- | miscutils/less.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c index 9ac91e01e..5b2e5ac56 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c | |||
@@ -65,6 +65,8 @@ | |||
65 | /* If you want logging messages on /tmp/fbsplash.log... */ | 65 | /* If you want logging messages on /tmp/fbsplash.log... */ |
66 | #define DEBUG 0 | 66 | #define DEBUG 0 |
67 | 67 | ||
68 | #define ESC "\033" | ||
69 | |||
68 | struct globals { | 70 | struct globals { |
69 | #if DEBUG | 71 | #if DEBUG |
70 | bool bdebug_messages; // enable/disable logging | 72 | bool bdebug_messages; // enable/disable logging |
@@ -514,7 +516,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) | |||
514 | 516 | ||
515 | if (fifo_filename && bCursorOff) { | 517 | if (fifo_filename && bCursorOff) { |
516 | // hide cursor (BEFORE any fb ops) | 518 | // hide cursor (BEFORE any fb ops) |
517 | full_write(STDOUT_FILENO, "\033[?25l", 6); | 519 | full_write(STDOUT_FILENO, ESC"[?25l", 6); |
518 | } | 520 | } |
519 | 521 | ||
520 | fb_drawimage(); | 522 | fb_drawimage(); |
@@ -559,7 +561,7 @@ int fbsplash_main(int argc UNUSED_PARAM, char **argv) | |||
559 | } | 561 | } |
560 | 562 | ||
561 | if (bCursorOff) // restore cursor | 563 | if (bCursorOff) // restore cursor |
562 | full_write(STDOUT_FILENO, "\033[?25h", 6); | 564 | full_write(STDOUT_FILENO, ESC"[?25h", 6); |
563 | 565 | ||
564 | return EXIT_SUCCESS; | 566 | return EXIT_SUCCESS; |
565 | } | 567 | } |
diff --git a/miscutils/less.c b/miscutils/less.c index f37c80ad8..241f7f8ba 100644 --- a/miscutils/less.c +++ b/miscutils/less.c | |||
@@ -137,7 +137,7 @@ | |||
137 | #define ESC "\033" | 137 | #define ESC "\033" |
138 | /* The escape codes for highlighted and normal text */ | 138 | /* The escape codes for highlighted and normal text */ |
139 | #define HIGHLIGHT ESC"[7m" | 139 | #define HIGHLIGHT ESC"[7m" |
140 | #define NORMAL ESC"[0m" | 140 | #define NORMAL ESC"[m" |
141 | /* The escape code to home and clear to the end of screen */ | 141 | /* The escape code to home and clear to the end of screen */ |
142 | #define CLEAR ESC"[H"ESC"[J" | 142 | #define CLEAR ESC"[H"ESC"[J" |
143 | /* The escape code to clear to the end of line */ | 143 | /* The escape code to clear to the end of line */ |
@@ -1042,7 +1042,7 @@ static void reinitialize(void) | |||
1042 | open_file_and_read_lines(); | 1042 | open_file_and_read_lines(); |
1043 | #if ENABLE_FEATURE_LESS_ASK_TERMINAL | 1043 | #if ENABLE_FEATURE_LESS_ASK_TERMINAL |
1044 | if (G.winsize_err) | 1044 | if (G.winsize_err) |
1045 | printf("\033[999;999H" "\033[6n"); | 1045 | printf(ESC"[999;999H" ESC"[6n"); |
1046 | #endif | 1046 | #endif |
1047 | buffer_fill_and_print(); | 1047 | buffer_fill_and_print(); |
1048 | } | 1048 | } |