(safe_read, safe_write): Handle EINTR.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@6015 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cccp.c b/gcc/cccp.c
index 3581dc0..434e053 100644 (file)
--- a/gcc/cccp.c
+++ b/gcc/cccp.c
@@ -993,7 +993,13 @@ safe_read (desc, ptr, len)
   while (left > 0) {
     int nchars = read (desc, ptr, left);
     if (nchars < 0)
-      return nchars;
+      {
+#ifdef EINTR
+       if (errno == EINTR)
+         continue;
+#endif
+       return nchars;
+      }
     if (nchars == 0)
       break;
     ptr += nchars;
@@ -1014,7 +1020,13 @@ safe_write (desc, ptr, len)
   while (len > 0) {
     int written = write (desc, ptr, len);
     if (written < 0)
-      pfatal_with_name (out_fname);
+      {
+#ifdef EINTR
+       if (errno == EINTR)
+         continue;
+#endif
+       pfatal_with_name (out_fname);
+      }
     ptr += written;
     len -= written;
   }

diff --git a/gcc/protoize.c b/gcc/protoize.c
index fee6a15..ef793d3 100644 (file)
--- a/gcc/protoize.c
+++ b/gcc/protoize.c
@@ -745,7 +745,13 @@ safe_read (desc, ptr, len)
   while (left > 0) {
     int nchars = read (desc, ptr, left);
     if (nchars < 0)
-      return nchars;
+      {
+#ifdef EINTR
+       if (errno == EINTR)
+         continue;
+#endif
+       return nchars;
+      }
     if (nchars == 0)
       break;
     ptr += nchars;
@@ -767,8 +773,14 @@ safe_write (desc, ptr, len, out_fname)
   while (len > 0) {
     int written = write (desc, ptr, len);
     if (written < 0)
-      fprintf (stderr, "%s: error writing file `%s': %s\n",
-              pname, shortpath (NULL, out_fname), sys_errlist[errno]);
+      {
+#ifdef EINTR
+       if (errno == EINTR)
+         continue;
+#endif
+       fprintf (stderr, "%s: error writing file `%s': %s\n",
+                pname, shortpath (NULL, out_fname), sys_errlist[errno]);
+      }
     ptr += written;
     len -= written;
   }