# 
# patch "ChangeLog"
#  from [7165b58d6714df0d8f33919e4cb91021799d6fd6]
#    to [67e210b8e21f9966a7dedcc160bae471902ee1a1]
# 
# patch "botan/pipe_rw.cpp"
#  from [59f85107337e39b3418882d48fd2b387405d3d95]
#    to [1b9c6fd0645251c17ef56a8f18c62f41fd307a8e]
# 
# patch "netsync.cc"
#  from [3e9e0969825ebed87b7fb33df182269e2a35f608]
#    to [278b2e0fcf0d7a2a6abba191794e652fb488fc6b]
# 
===============================================
--- ChangeLog	7165b58d6714df0d8f33919e4cb91021799d6fd6
+++ ChangeLog	67e210b8e21f9966a7dedcc160bae471902ee1a1
@@ -1,5 +1,10 @@
 2005-07-18  Matt Johnston  <address@hidden>
 
+	* netsync.cc: merge fixup
+	* botan/pipe_rw.cpp (read_all_as_string): make it smarter and faster
+
+2005-07-18  Matt Johnston  <address@hidden>
+
 	* botan/sha160.{cpp,h}: new faster sha160 implementation from Jack Lloyd
 	and Kaushik Veeraraghavan.
 
===============================================
--- botan/pipe_rw.cpp	59f85107337e39b3418882d48fd2b387405d3d95
+++ botan/pipe_rw.cpp	1b9c6fd0645251c17ef56a8f18c62f41fd307a8e
@@ -122,9 +122,12 @@
    msg = ((msg != DEFAULT_MESSAGE) ? msg : default_msg());
    SecureVector<byte> buffer(DEFAULT_BUFFERSIZE);
    std::string str;
-   while(remaining(msg))
+   str.reserve(remaining(msg));
+   while (true)
       {
       u32bit got = read(buffer, buffer.size(), msg);
+	  if (got == 0)
+		  break;
       str.append((const char*)buffer.begin(), got);
       }
    return str;
===============================================
--- netsync.cc	3e9e0969825ebed87b7fb33df182269e2a35f608
+++ netsync.cc	278b2e0fcf0d7a2a6abba191794e652fb488fc6b
@@ -2003,6 +2003,8 @@
       W(F("bad client signature\n"));         
     }  
   return false;
+}
+
 bool 
 session::process_confirm_cmd(string const & signature)
 {