aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/awk.c2
-rw-r--r--editors/patch.c8
-rw-r--r--editors/vi.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/editors/awk.c b/editors/awk.c
index e74053e75..e91c37678 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2716,7 +2716,7 @@ keep_going:
2716 free(s); 2716 free(s);
2717 } 2717 }
2718 if (opt & 0x8) // -W 2718 if (opt & 0x8) // -W
2719 bb_error_msg("Warning: unrecognized option '-W %s' ignored", opt_W); 2719 bb_error_msg("warning: unrecognized option '-W %s' ignored", opt_W);
2720 2720
2721 if (!from_file) { 2721 if (!from_file) {
2722 if (argc == optind) 2722 if (argc == optind)
diff --git a/editors/patch.c b/editors/patch.c
index 545e70b50..4ddcd004d 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -37,7 +37,7 @@ static unsigned int copy_lines(FILE *src_stream, FILE *dest_stream, const unsign
37 break; 37 break;
38 } 38 }
39 if (fputs(line, dest_stream) == EOF) { 39 if (fputs(line, dest_stream) == EOF) {
40 bb_perror_msg_and_die("Error writing to new file"); 40 bb_perror_msg_and_die("error writing to new file");
41 } 41 }
42 free(line); 42 free(line);
43 43
@@ -125,7 +125,7 @@ int patch_main(int argc, char **argv)
125 patch_line = xmalloc_fgets(patch_file); 125 patch_line = xmalloc_fgets(patch_file);
126 if (strncmp(patch_line, "+++ ", 4) != 0) { 126 if (strncmp(patch_line, "+++ ", 4) != 0) {
127 ret = 2; 127 ret = 2;
128 bb_error_msg("Invalid patch"); 128 bb_error_msg("invalid patch");
129 continue; 129 continue;
130 } 130 }
131 new_filename = extract_filename(patch_line, patch_level); 131 new_filename = extract_filename(patch_line, patch_level);
@@ -189,7 +189,7 @@ int patch_main(int argc, char **argv)
189 /* src_beg_line will be 0 if its a new file */ 189 /* src_beg_line will be 0 if its a new file */
190 count = src_beg_line - src_cur_line; 190 count = src_beg_line - src_cur_line;
191 if (copy_lines(src_stream, dst_stream, count) != count) { 191 if (copy_lines(src_stream, dst_stream, count) != count) {
192 bb_error_msg_and_die("Bad src file"); 192 bb_error_msg_and_die("bad src file");
193 } 193 }
194 src_cur_line += count; 194 src_cur_line += count;
195 dest_cur_line += count; 195 dest_cur_line += count;
@@ -209,7 +209,7 @@ int patch_main(int argc, char **argv)
209 src_cur_line++; 209 src_cur_line++;
210 } 210 }
211 if (strcmp(src_line, patch_line + 1) != 0) { 211 if (strcmp(src_line, patch_line + 1) != 0) {
212 bb_error_msg("Hunk #%d FAILED at %d.", hunk_count, hunk_offset_start); 212 bb_error_msg("hunk #%d FAILED at %d", hunk_count, hunk_offset_start);
213 hunk_error++; 213 hunk_error++;
214 free(patch_line); 214 free(patch_line);
215 break; 215 break;
diff --git a/editors/vi.c b/editors/vi.c
index a25e96657..82985ced0 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1802,7 +1802,7 @@ static Byte *yank_delete(Byte * start, Byte * stop, int dist, int yf)
1802 stop = p; 1802 stop = p;
1803 } 1803 }
1804 if (dist <= 0) { 1804 if (dist <= 0) {
1805 // we can not cross NL boundaries 1805 // we cannot cross NL boundaries
1806 p = start; 1806 p = start;
1807 if (*p == '\n') 1807 if (*p == '\n')
1808 return (p); 1808 return (p);