# 
# patch "ChangeLog"
#  from [ff6b1988efea3604c887f542466f7c122c23f729]
#    to [5e7a948405d2d0889771ab84ac69999a5e1b9eb0]
# 
# patch "automate.cc"
#  from [affdba906ca8aa970749756f7eba5a3ae4e9efb8]
#    to [6634aeb4bc67911ff0ea7e08a6fdd12b5876f9e0]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-05-24  Timothy Brownawell  <address@hidden>
 
+	* automate.cc: Fix buffering for "automate stdio"
+
+2005-05-24  Timothy Brownawell  <address@hidden>
+
 	* automate.cc: Put back lost "automate certs".
 
 2005-05-24  Matt Johnston  <address@hidden>
--- automate.cc
+++ automate.cc
@@ -10,6 +10,7 @@
 #include <vector>
 #include <algorithm>
 #include <sstream>
+#include <unistd.h>
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
@@ -1002,6 +1003,7 @@
       s<<size<<':'<<text.substr(pos, size);
       pos+=size;
     }
+  s.flush();
 }
 
 static void
@@ -1013,7 +1015,9 @@
   if (args.size() != 0)
     throw usage(help_name);
   int cmdnum = 0;
-  while(!std::cin.eof())
+  char c;
+  ssize_t n=1;
+  while(n)//while(!EOF)
     {
       std::string x;
       utf8 cmd;
@@ -1021,9 +1025,9 @@
       bool first=true;
       int toklen=0;
       bool firstchar=true;
-      for(char c=std::cin.get();c != 'l' && !std::cin.eof();c=std::cin.get())
+      for(n=read(0, &c, 1); c != 'l' && n; n=read(0, &c, 1))
         ;
-      for(char c=std::cin.get();c != 'e' && !std::cin.eof(); c=std::cin.get())
+      for(n=read(0, &c, 1); c!='e' && n; n=read(0, &c, 1))
         {
           if(c<='9' && c>='0')
             {
@@ -1031,8 +1035,10 @@
             }
           else if(c == ':')
             {
-              char *tok=new char[toklen+1];
-              std::cin.get(tok, toklen+1);
+              char *tok=new char[toklen];
+              int count=0;
+              while(count<toklen)
+                count+=read(0, tok, toklen-count);
               if(first)
                 cmd=utf8(std::string(tok, toklen));
               else
@@ -1066,25 +1072,21 @@
             {
               err=0;
               automate_command(cmd, args, help_name, app, s);
-              print_some_output(cmdnum, err, true, sb.str(),
-                                output, outpos, -1);
             }
           catch(usage & u)
             {
               err=1;
               commands::explain_usage(help_name, s);
-              print_some_output(cmdnum, err, true, sb.str(),
-                                output, outpos, -1);
             }
           catch(informative_failure & f)
             {
               err=2;
-              //Do this instead of using f.what directly so the output
+              //Do this instead of printing f.what directly so the output
               //will be split into properly-sized blocks automatically.
               s<<f.what;
-              print_some_output(cmdnum, err, true, sb.str(),
-                                output, outpos, -1);
             }
+            print_some_output(cmdnum, err, true, sb.str(),
+                              output, outpos, -1);
         }
       cmdnum++;
     }