sync vapier-m

[patches.git] / ldrviewer-retry.patch

? ldrs
? ldrviewer
Index: headers.h
===================================================================
RCS file: /cvsroot/gcc3/ldrviewer/headers.h,v
retrieving revision 1.2
diff -u -p -r1.2 headers.h
--- headers.h	22 Sep 2006 01:44:59 -0000	1.2
+++ headers.h	17 Oct 2006 20:54:10 -0000
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <errno.h>
 #include <assert.h>
 #include <stdint.h>
 #include <sys/types.h>
Index: helpers.c
===================================================================
RCS file: /cvsroot/gcc3/ldrviewer/helpers.c,v
retrieving revision 1.2
diff -u -p -r1.2 helpers.c
--- helpers.c	22 Sep 2006 01:44:59 -0000	1.2
+++ helpers.c	17 Oct 2006 20:54:10 -0000
@@ -40,3 +40,24 @@ int parse_bool(const char *boo)
 		return 0;
 	err("Invalid boolean: '%s'", boo);
 }
+
+ssize_t read_retry(int fd, void *buf, size_t count)
+{
+	ssize_t ret = 0, temp_ret;
+	while (count > 0) {
+		temp_ret = read(fd, buf, count);
+		if (temp_ret > 0) {
+			ret += temp_ret;
+			buf += temp_ret;
+			count -= temp_ret;
+		} else if (temp_ret == 0) {
+			break;
+		} else {
+			if (errno == EINTR)
+				continue;
+			ret = -1;
+			break;
+		}
+	}
+	return ret;
+}
Index: helpers.h
===================================================================
RCS file: /cvsroot/gcc3/ldrviewer/helpers.h,v
retrieving revision 1.2
diff -u -p -r1.2 helpers.h
--- helpers.h	22 Sep 2006 01:44:59 -0000	1.2
+++ helpers.h	17 Oct 2006 20:54:10 -0000
@@ -41,5 +41,6 @@ extern const char *argv0;
 void *xmalloc(size_t);
 void *xrealloc(void *, size_t);
 int parse_bool(const char *);
+ssize_t read_retry(int, void *, size_t);
 
 #endif
Index: ldr.c
===================================================================
RCS file: /cvsroot/gcc3/ldrviewer/ldr.c,v
retrieving revision 1.2
diff -u -p -r1.2 ldr.c
--- ldr.c	22 Sep 2006 01:44:59 -0000	1.2
+++ ldr.c	17 Oct 2006 20:54:10 -0000
@@ -379,7 +379,7 @@ canned_failure:
 	printf("OK!\n");
 
 	printf("Trying to read autobaud ... ");
-	ret = read(fd, autobaud, 4);
+	ret = read_retry(fd, autobaud, 4);
 	if (ret != 4)
 		goto canned_failure;
 	printf("OK!\n");