summaryrefslogtreecommitdiff
path: root/coreutils/tr.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-11-24 04:37:59 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-11-24 04:37:59 +0000
commit80297d5f0cbe8a3de497804dcbb1a89e6f9c1562 (patch)
treef34fce2257aff722f25347bfce7e1375d7df5db6 /coreutils/tr.c
parent3db254c8866de390c327d759ba615693e45aff6f (diff)
downloadbusybox-w32-1_8_2.tar.gz
busybox-w32-1_8_2.tar.bz2
busybox-w32-1_8_2.zip
Apply all post-1.8.1 patches1_8_2
Diffstat (limited to '')
-rw-r--r--coreutils/tr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 9521bbcd5..e60e08b25 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -173,7 +173,8 @@ int tr_main(int argc, char **argv)
173 int idx = 1; 173 int idx = 1;
174 int i; 174 int i;
175 smalluint flags = 0; 175 smalluint flags = 0;
176 size_t read_chars = 0, in_index = 0, out_index = 0, c, coded, last = -1; 176 ssize_t read_chars = 0;
177 size_t in_index = 0, out_index = 0, c, coded, last = -1;
177 RESERVE_CONFIG_UBUFFER(output, BUFSIZ); 178 RESERVE_CONFIG_UBUFFER(output, BUFSIZ);
178 RESERVE_CONFIG_BUFFER(vector, ASCII+1); 179 RESERVE_CONFIG_BUFFER(vector, ASCII+1);
179 RESERVE_CONFIG_BUFFER(invec, ASCII+1); 180 RESERVE_CONFIG_BUFFER(invec, ASCII+1);
@@ -223,8 +224,9 @@ int tr_main(int argc, char **argv)
223 } 224 }
224 read_chars = read(STDIN_FILENO, tr_buf, BUFSIZ); 225 read_chars = read(STDIN_FILENO, tr_buf, BUFSIZ);
225 if (read_chars <= 0) { 226 if (read_chars <= 0) {
226 if (write(STDOUT_FILENO, (char *)output, out_index) != out_index) 227 xwrite(STDOUT_FILENO, (char *)output, out_index);
227 bb_perror_msg(bb_msg_write_error); 228 if (read_chars < 0)
229 bb_perror_msg_and_die(bb_msg_read_error);
228 exit(EXIT_SUCCESS); 230 exit(EXIT_SUCCESS);
229 } 231 }
230 in_index = 0; 232 in_index = 0;