Merge pull request #2196 from brauner/2018-02-28/more_terminal_fixes

src/lxc/attach.c

@@ -846,7 +846,7 @@ static int attach_child_main(struct attach_clone_payload *payload)
 	}
 
 	if (options->stdin_fd > 0 && isatty(options->stdin_fd)) {
-		ret = lxc_make_controlling_pty(options->stdin_fd);
+		ret = lxc_make_controlling_terminal(options->stdin_fd);
 		if (ret < 0)
 			goto on_error;
 	}
@@ -958,7 +958,7 @@ static int attach_child_main(struct attach_clone_payload *payload)
 	}
 
 	if (options->attach_flags & LXC_ATTACH_ALLOCATE_PTY) {
-		ret = lxc_login_pty(payload->pty_fd);
+		ret = lxc_terminal_prepare_login(payload->pty_fd);
 		if (ret < 0) {
 			SYSERROR("Failed to prepare pty file descriptor %d", payload->pty_fd);
 			goto on_error;

src/lxc/mainloop.h

@@ -27,6 +27,7 @@
 #include <stdint.h>
 #include "list.h"
 
+#define LXC_MAINLOOP_ERROR -1
 #define LXC_MAINLOOP_CONTINUE 0
 #define LXC_MAINLOOP_CLOSE 1