aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-06-26 22:40:02 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-06-26 22:40:02 +0000
commit9092f754bd4afc5f0928ee3041abb950f749b9e1 (patch)
tree4d7450bf0e6f961b661869c1865b8c24859f817c
parent5fb79535eee16cada7748ceb38130b81e24c21b8 (diff)
downloadbusybox-w32-9092f754bd4afc5f0928ee3041abb950f749b9e1.tar.gz
busybox-w32-9092f754bd4afc5f0928ee3041abb950f749b9e1.tar.bz2
busybox-w32-9092f754bd4afc5f0928ee3041abb950f749b9e1.zip
print_flags: fix trivial thinko
vi: fix reversed checks for underflow
-rw-r--r--editors/vi.c4
-rw-r--r--libbb/print_flags.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/editors/vi.c b/editors/vi.c
index 1b335d9a1..7603c9764 100644
--- 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'
1659 cmdcnt = 0; 1659 cmdcnt = 0;
1660 end_cmd_q(); // stop adding to q 1660 end_cmd_q(); // stop adding to q
1661 last_status_cksum = 0; // force status update 1661 last_status_cksum = 0; // force status update
1662 if ((p[-1] != '\n') && (dot > text)) { 1662 if ((p > text) && (p[-1] != '\n')) {
1663 p--; 1663 p--;
1664 } 1664 }
1665 } else if (c == erase_char || c == 8 || c == 127) { // Is this a BS 1665 } else if (c == erase_char || c == 8 || c == 127) { // Is this a BS
1666 // 123456789 1666 // 123456789
1667 if ((p[-1] != '\n') && (dot>text)) { 1667 if ((p > text) && (p[-1] != '\n')) {
1668 p--; 1668 p--;
1669 p = text_hole_delete(p, p); // shrink buffer 1 char 1669 p = text_hole_delete(p, p); // shrink buffer 1 char
1670 } 1670 }
diff --git a/libbb/print_flags.c b/libbb/print_flags.c
index 413f51653..a1dcc01ec 100644
--- 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
19 labels); 19 labels);
20 need_separator = separator; 20 need_separator = separator;
21 flags &= ~ *masks; 21 flags &= ~ *masks;
22 masks++;
23 } 22 }
23 masks++;
24 labels += strlen(labels) + 1; 24 labels += strlen(labels) + 1;
25 } 25 }
26 return flags; 26 return flags;