diff options
Diffstat (limited to 'butl')
| -rw-r--r-- | butl/fdstream | 4 | ||||
| -rw-r--r-- | butl/pager | 2 | ||||
| -rw-r--r-- | butl/process.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/butl/fdstream b/butl/fdstream index cd08b13..8f49990 100644 --- a/butl/fdstream +++ b/butl/fdstream @@ -621,12 +621,12 @@ namespace butl // // Note that on Windows both ends of the created pipe are not inheritable. // In particular, the process class that uses fdpipe underneath makes the - // appropriate end of pipe (the one being passed to the child) inheritable. + // appropriate end (the one being passed to the child) inheritable. // // Note that on POSIX the FD_CLOEXEC flag is set for both ends, so they get // automatically closed by the child process to prevent undesired behaviors // (such as child deadlock on read from a pipe due to the write-end leakage - // into the child process). Opening pipe and setting the flag is not an + // into the child process). Opening a pipe and setting the flag is not an // atomic operation generally, but it is in regards to child process spawning // (to prevent file descriptor leakage into child processes spawned from // other threads). Also note that you don't need to reset the flag for a pipe @@ -83,6 +83,6 @@ namespace butl int_type prev_ = '\n'; // Previous character. std::streambuf* buf_ = nullptr; }; -}; +} #endif // BUTL_PAGER diff --git a/butl/process.cxx b/butl/process.cxx index 05c06f1..1efa103 100644 --- a/butl/process.cxx +++ b/butl/process.cxx @@ -325,7 +325,7 @@ namespace butl // // Duplicate the user-supplied (fd > -1) or the created pipe descriptor // to the standard stream descriptor (read end for STDIN_FILENO, write - // end otherwise). Close the the pipe afterwards. + // end otherwise). Close the pipe afterwards. // auto duplicate = [&fail] (int sd, int fd, fdpipe& pd) { |