2 files changed, 19 insertions, 14 deletions

diff --git a/editors/sed.c b/editors/sed.c
index 7af8f867a..7d6e7e79f 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -61,6 +61,10 @@
 #include "libbb.h"
 #include "xregex.h"
 
+enum {
+        OPT_in_place = 1 << 0,
+};
+
 /* Each sed command turns into one of these structures. */
 typedef struct sed_cmd_s {
         /* Ordered by alignment requirements: currently 36 bytes on x86 */
@@ -938,8 +942,11 @@ static void process_files(void)
 
                 if (matched) {
                         /* once matched, "n,xxx" range is dead, disabling it */
-                        if (sed_cmd->beg_line > 0)
+                        if (sed_cmd->beg_line > 0
+                         && !(option_mask32 & OPT_in_place) /* but not for -i */
+                        ) {
                                 sed_cmd->beg_line = -2;
+                        }
                         sed_cmd->in_match = !(
                                 /* has the ending line come, or is this a single address command? */
                                 (sed_cmd->end_line ?
@@ -1270,9 +1277,6 @@ static void add_cmd_block(char *cmdstr)
 int sed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int sed_main(int argc UNUSED_PARAM, char **argv)
 {
-        enum {
-                OPT_in_place = 1 << 0,
-        };
         unsigned opt;
         llist_t *opt_e, *opt_f;
         int status = EXIT_SUCCESS;
@@ -1292,6 +1296,7 @@ int sed_main(int argc UNUSED_PARAM, char **argv)
         opt_e = opt_f = NULL;
         opt_complementary = "e::f::" /* can occur multiple times */
                             "nn"; /* count -n */
+        /* -i must be first, to match OPT_in_place definition */
         opt = getopt32(argv, "irne:f:", &opt_e, &opt_f,
                             &G.be_quiet); /* counter for -n */
         //argc -= optind;
diff --git a/editors/vi.c b/editors/vi.c
index 0f412c362..73e095cf8 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -504,20 +504,17 @@ static int init_text_buffer(char *fn)
 }
 
 #if ENABLE_FEATURE_VI_WIN_RESIZE
-static void query_screen_dimensions(void)
+static int query_screen_dimensions(void)
 {
-# if ENABLE_FEATURE_VI_ASK_TERMINAL
-        if (!G.get_rowcol_error)
-                G.get_rowcol_error =
-# endif
-                        get_terminal_width_height(STDIN_FILENO, &columns, &rows);
+        int err = get_terminal_width_height(STDIN_FILENO, &columns, &rows);
         if (rows > MAX_SCR_ROWS)
                 rows = MAX_SCR_ROWS;
         if (columns > MAX_SCR_COLS)
                 columns = MAX_SCR_COLS;
+        return err;
 }
 #else
-# define query_screen_dimensions() ((void)0)
+# define query_screen_dimensions() (0)
 #endif
 
 static void edit_file(char *fn)
@@ -536,7 +533,7 @@ static void edit_file(char *fn)
         rows = 24;
         columns = 80;
         size = 0;
-        query_screen_dimensions();
+        IF_FEATURE_VI_ASK_TERMINAL(G.get_rowcol_error =) query_screen_dimensions();
 #if ENABLE_FEATURE_VI_ASK_TERMINAL
         if (G.get_rowcol_error /* TODO? && no input on stdin */) {
                 uint64_t k;
@@ -546,9 +543,12 @@ static void edit_file(char *fn)
                 if ((int32_t)k == KEYCODE_CURSOR_POS) {
                         uint32_t rc = (k >> 32);
                         columns = (rc & 0x7fff);
+                        if (columns > MAX_SCR_COLS)
+                                columns = MAX_SCR_COLS;
                         rows = ((rc >> 16) & 0x7fff);
+                        if (rows > MAX_SCR_ROWS)
+                                rows = MAX_SCR_ROWS;
                 }
-                query_screen_dimensions();
         }
 #endif
         new_screen(rows, columns);      // get memory for virtual screen
@@ -2797,7 +2797,7 @@ static void refresh(int full_screen)
         int li, changed;
         char *tp, *sp;          // pointer into text[] and screen[]
 
-        if (ENABLE_FEATURE_VI_WIN_RESIZE) {
+        if (ENABLE_FEATURE_VI_WIN_RESIZE IF_FEATURE_VI_ASK_TERMINAL(&& !G.get_rowcol_error) ) {
                 unsigned c = columns, r = rows;
                 query_screen_dimensions();
                 full_screen |= (c - columns) | (r - rows);