aboutsummaryrefslogtreecommitdiff
path: root/editors/patch.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-20 13:28:22 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-20 13:28:22 +0000
commite1a0d486e4804eae098571f1a6788394c2ee51ae (patch)
treec6f3435738900c8d53832eb919b1b2c3d524f2e5 /editors/patch.c
parentdd2982882bb192ea757f32514bc2ea0bc96f5ba0 (diff)
downloadbusybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.gz
busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.bz2
busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.zip
message string changes, mostly for consistency, also -32 bytes in .rodata
Diffstat (limited to 'editors/patch.c')
-rw-r--r--editors/patch.c8
1 files changed, 4 insertions, 4 deletions
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;