diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 12:12:03 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 12:12:03 +0000 |
| commit | b0f54743e36af163ae2530c381c485bb29df13dc (patch) | |
| tree | cda4cfeaae6e47fe4f14c1b566092be4da9affc4 /miscutils/rx.c | |
| parent | 40514a0309939f2446f0d4ed9600cad5de396e7f (diff) | |
| parent | ba88826c66411affc1da3614742b454654f7298a (diff) | |
| download | busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.tar.gz busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.tar.bz2 busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.zip | |
Merge branch 'busybox' into merge
Conflicts:
Makefile.flags
Diffstat (limited to 'miscutils/rx.c')
| -rw-r--r-- | miscutils/rx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/miscutils/rx.c b/miscutils/rx.c index c48a61fd0..af597320c 100644 --- a/miscutils/rx.c +++ b/miscutils/rx.c | |||
| @@ -207,6 +207,7 @@ static int receive(/*int read_fd, */int file_fd) | |||
| 207 | continue; | 207 | continue; |
| 208 | error: | 208 | error: |
| 209 | timeout: | 209 | timeout: |
| 210 | blockLength = 0; | ||
| 210 | errors++; | 211 | errors++; |
| 211 | if (errors == MAXERRORS) { | 212 | if (errors == MAXERRORS) { |
| 212 | /* Abort */ | 213 | /* Abort */ |