print_flags: fix trivial thinko

vi: fix reversed checks for underflow

diff --git a/editors/vi.c b/editors/vi.c
index 1b335d9a1fa537f573486de243eedeb0a68048a5..7603c9764522d91f1147b617932f883f0082821e 100644 (file)
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1659,12 +1659,12 @@ static char *char_insert(char *p, char c) // insert the char c at 'p'
                cmdcnt = 0;
                end_cmd_q();    // stop adding to q
                last_status_cksum = 0;  // force status update
-               if ((p[-1] != '\n') && (dot > text)) {
+               if ((p > text) && (p[-1] != '\n')) {
                        p--;
                }
        } else if (c == erase_char || c == 8 || c == 127) { // Is this a BS
                //     123456789
-               if ((p[-1] != '\n') && (dot>text)) {
+               if ((p > text) && (p[-1] != '\n')) {
                        p--;
                        p = text_hole_delete(p, p);     // shrink buffer 1 char
                }

diff --git a/libbb/print_flags.c b/libbb/print_flags.c
index 413f51653db79c0f70af802dd30f8e5bf24ebe94..a1dcc01eccf5d02c9f6193bef483902f3af898b6 100644 (file)
--- a/libbb/print_flags.c
+++ b/libbb/print_flags.c
@@ -19,8 +19,8 @@ int print_flags_separated(const int *masks, const char *labels, int flags, const
                                labels);
                        need_separator = separator;
                        flags &= ~ *masks;
-                       masks++;
                }
+               masks++;
                labels += strlen(labels) + 1;
        }
        return flags;