Make binwire a little bit more error-resistant

diff --git a/binwire.c b/binwire.c
index 3f19ca285b9b3df248953a9792599548c3718f1c..101b5c10bf172d7d90d399f3d59fba7ee8872306 100644 (file)
--- a/binwire.c
+++ b/binwire.c
@@ -87,14 +87,22 @@ void main(int argc, char **argv)
   while ((sz = read(rfd, buf+3, 255)) > 0)
   {
     int rv;
   while ((sz = read(rfd, buf+3, 255)) > 0)
   {
     int rv;

+    char abuf[5];

     buf[0] = 0x1B;
     buf[1] = 'D';
     buf[2] = sz+1;
     buf[0] = 0x1B;
     buf[1] = 'D';
     buf[2] = sz+1;

+    abuf[0] = 0x1B;
+    abuf[1] = 'A';
+    abuf[2] = (tc >> 16) & 0xFF;
+    abuf[3] = (tc >> 8) & 0xFF;
+    abuf[4] = tc & 0xFF;

     tc += sz;
     retry:
     tc += sz;
     retry:

+    dowrite(abuf, 5);
+    rv = expect("A", 1);

     dowrite(buf, sz + 3);
     fprintf(stderr, "Data sent (%d)\n", tc);
     dowrite(buf, sz + 3);
     fprintf(stderr, "Data sent (%d)\n", tc);

-    rv = expect("D", 1);
+    rv |= expect("D", 1);

     expect_no_chars();
     if (rv)
     {
     expect_no_chars();
     if (rv)
     {