# 
# patch "ChangeLog"
#  from [8828e452a0ac7dcf37a61eef52a908415cb90615]
#    to [c90f0215265ef87f468fd2ebede50e9e62d49446]
# 
# patch "automate.cc"
#  from [b303e2282502365cfd91af081afa85b6df03de8b]
#    to [458470f54aa46833623b303db43198e485ce4f43]
# 
========================================================================
--- ChangeLog	8828e452a0ac7dcf37a61eef52a908415cb90615
+++ ChangeLog	c90f0215265ef87f468fd2ebede50e9e62d49446
@@ -1,5 +1,10 @@
 2005-11-27  Grahame Bowland  <address@hidden>
 
+	* automate.cc (automate_stdio_read): remove check for EINTR
+	that was breaking win32 build.
+
+2005-11-27  Grahame Bowland  <address@hidden>
+
 	* automate.cc (automate_certs,automate_keys): use non-exclusive 
 	transaction guard
 	* commands.cc (ls_certs,ls_keys,cat): use non-exclusive 
========================================================================
--- automate.cc	b303e2282502365cfd91af081afa85b6df03de8b
+++ automate.cc	458470f54aa46833623b303db43198e485ce4f43
@@ -11,7 +11,6 @@
 #include <algorithm>
 #include <sstream>
 #include <unistd.h>
-#include <sys/errno.h>
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
@@ -1181,14 +1180,9 @@
 {
   ssize_t rv;
   
-  /* EINTR occurs if the process receives a signal while in read(); this is 
-     recoverable by simply reading again. 
-  */
-  do {
-    rv = read(d, buf, nbytes);
-  } while (rv == -EINTR);
+  rv = read(d, buf, nbytes);
   
-  E(rv >= 0, F("read from client failed: %s") % strerror(rv));
+  E(rv >= 0, F("read from client failed with error code: %d") % rv);
   return rv;
 }