| Alphare |
| hg-reviewers |
We no longer have to deal with the restriction of the Future type.
Before, these file objects couldn't be references and that's the only
reason why we had to make stderr an Option<T>.
This fixes future type deduction issue of stderr = None, where rustc would
complain that T of Option<T> couldn't be deduced.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| /// Sends client-side fds over the command server channel. | /// Sends client-side fds over the command server channel. | ||||
| /// | /// | ||||
| /// This works as follows: | /// This works as follows: | ||||
| /// 1. Client sends "attachio" request. | /// 1. Client sends "attachio" request. | ||||
| /// 2. Server sends back 1-byte input request. | /// 2. Server sends back 1-byte input request. | ||||
| /// 3. Client sends fds with 1-byte dummy payload in response. | /// 3. Client sends fds with 1-byte dummy payload in response. | ||||
| /// 4. Server returns the number of the fds received. | /// 4. Server returns the number of the fds received. | ||||
| /// | /// | ||||
| /// If the stderr is omitted, it will be redirected to the stdout. This | /// The client-side fds may be dropped once duplicated to the server. | ||||
| /// allows us to attach the pager stdin to both stdout and stderr, and | |||||
| /// dispose of the client-side handle once attached. | |||||
| pub async fn attach_io( | pub async fn attach_io( | ||||
| proto: &mut Protocol<impl Connection + AsRawFd>, | proto: &mut Protocol<impl Connection + AsRawFd>, | ||||
| stdin: impl AsRawFd, | stdin: &impl AsRawFd, | ||||
| stdout: impl AsRawFd, | stdout: &impl AsRawFd, | ||||
| stderr: Option<impl AsRawFd>, | stderr: &impl AsRawFd, | ||||
| ) -> io::Result<()> { | ) -> io::Result<()> { | ||||
| // TODO: unindent | // TODO: unindent | ||||
| { | { | ||||
| proto.send_command("attachio").await?; | proto.send_command("attachio").await?; | ||||
| loop { | loop { | ||||
| match proto.fetch_response().await? { | match proto.fetch_response().await? { | ||||
| ChannelMessage::Data(b'r', data) => { | ChannelMessage::Data(b'r', data) => { | ||||
| let fd_cnt = message::parse_result_code(data)?; | let fd_cnt = message::parse_result_code(data)?; | ||||
| } | } | ||||
| ChannelMessage::InputRequest(1) => { | ChannelMessage::InputRequest(1) => { | ||||
| // this may fail with EWOULDBLOCK in theory, but the | // this may fail with EWOULDBLOCK in theory, but the | ||||
| // payload is quite small, and the send buffer should | // payload is quite small, and the send buffer should | ||||
| // be empty so the operation will complete immediately | // be empty so the operation will complete immediately | ||||
| let sock_fd = proto.as_raw_fd(); | let sock_fd = proto.as_raw_fd(); | ||||
| let ifd = stdin.as_raw_fd(); | let ifd = stdin.as_raw_fd(); | ||||
| let ofd = stdout.as_raw_fd(); | let ofd = stdout.as_raw_fd(); | ||||
| let efd = stderr.as_ref().map_or(ofd, |f| f.as_raw_fd()); | let efd = stderr.as_raw_fd(); | ||||
| procutil::send_raw_fds(sock_fd, &[ifd, ofd, efd])?; | procutil::send_raw_fds(sock_fd, &[ifd, ofd, efd])?; | ||||
| } | } | ||||
| ChannelMessage::InputRequest(..) | ChannelMessage::InputRequest(..) | ||||
| | ChannelMessage::LineRequest(..) | | ChannelMessage::LineRequest(..) | ||||
| | ChannelMessage::SystemRequest(..) => { | | ChannelMessage::SystemRequest(..) => { | ||||
| return Err(io::Error::new( | return Err(io::Error::new( | ||||
| io::ErrorKind::InvalidData, | io::ErrorKind::InvalidData, | ||||
| "unsupported request while attaching io", | "unsupported request while attaching io", | ||||
| )); | )); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||