# # # patch "cmd_automate.cc" # from [376d30238bb141c93d14201e55fd697e39a8ca8e] # to [1f90ee26385b4db17ef2e12524c8ed8a410d59e4] # ============================================================ --- cmd_automate.cc 376d30238bb141c93d14201e55fd697e39a8ca8e +++ cmd_automate.cc 1f90ee26385b4db17ef2e12524c8ed8a410d59e4 @@ -160,13 +160,12 @@ class automate_reader L(FL("Got string '%s'") % out); return true; } - static ssize_t read(void *buf, size_t nbytes, bool eof_ok = false) + std::streamsize read(char *buf, size_t nbytes, bool eof_ok = false) { - ssize_t rv; + std::streamsize rv; - rv = ::read(0, buf, nbytes); + rv = in.rdbuf()->sgetn(buf, nbytes); - E(rv >= 0, F("read from client failed with error code: %d") % rv); E(eof_ok || rv > 0, F("Bad input to automate stdio: unexpected EOF")); return rv; }