diff options
author | Ron Yorston <rmy@pobox.com> | 2018-07-25 10:41:42 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-07-25 10:41:42 +0100 |
commit | 59873514f17cefd6ba3997dad5779f75433fd4e6 (patch) | |
tree | 1c9d0a3450ed95f0b820285b9f9fc217c902e652 /miscutils | |
parent | 779fd5745ac11bf752f5f4b977a274a39c192f90 (diff) | |
parent | 81de30de05beebabfa72f2a01ec4f33e9a1923e3 (diff) | |
download | busybox-w32-59873514f17cefd6ba3997dad5779f75433fd4e6.tar.gz busybox-w32-59873514f17cefd6ba3997dad5779f75433fd4e6.tar.bz2 busybox-w32-59873514f17cefd6ba3997dad5779f75433fd4e6.zip |
Merge branch 'busybox'
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/Config.src | 2 | ||||
-rw-r--r-- | miscutils/hexedit.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/miscutils/Config.src b/miscutils/Config.src index 7325fb8fa..d10b00b28 100644 --- a/miscutils/Config.src +++ b/miscutils/Config.src | |||
@@ -1,6 +1,6 @@ | |||
1 | # | 1 | # |
2 | # For a description of the syntax of this configuration file, | 2 | # For a description of the syntax of this configuration file, |
3 | # see scripts/kbuild/config-language.txt. | 3 | # see docs/Kconfig-language.txt. |
4 | # | 4 | # |
5 | 5 | ||
6 | menu "Miscellaneous Utilities" | 6 | menu "Miscellaneous Utilities" |
diff --git a/miscutils/hexedit.c b/miscutils/hexedit.c index 95c930d12..298eb8149 100644 --- a/miscutils/hexedit.c +++ b/miscutils/hexedit.c | |||
@@ -153,7 +153,8 @@ static void redraw(unsigned cursor) | |||
153 | i++; | 153 | i++; |
154 | } | 154 | } |
155 | 155 | ||
156 | printf(ESC"[%u;%uH", 1 + cursor / 16, 1 + pos + (cursor & 0xf) * 3); | 156 | G.row = cursor / 16; |
157 | printf(ESC"[%u;%uH", 1 + G.row, 1 + pos + (cursor & 0xf) * 3); | ||
157 | } | 158 | } |
158 | 159 | ||
159 | static void redraw_cur_line(void) | 160 | static void redraw_cur_line(void) |
@@ -367,6 +368,8 @@ int hexedit_main(int argc UNUSED_PARAM, char **argv) | |||
367 | if (G.current_byte > G.eof_byte) { | 368 | if (G.current_byte > G.eof_byte) { |
368 | /* _after_ eof - don't allow this */ | 369 | /* _after_ eof - don't allow this */ |
369 | G.current_byte -= 16; | 370 | G.current_byte -= 16; |
371 | if (G.current_byte < G.baseaddr) | ||
372 | move_mapping_lower(); | ||
370 | break; | 373 | break; |
371 | } | 374 | } |
372 | } | 375 | } |