Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
cd0a2b2f
Unverified
Commit
cd0a2b2f
authored
Feb 28, 2018
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
terminal: lxc_make_controlling_terminal()
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
71ac3f07
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
attach.c
src/lxc/attach.c
+1
-1
terminal.c
src/lxc/terminal.c
+2
-2
terminal.h
src/lxc/terminal.h
+1
-1
No files found.
src/lxc/attach.c
View file @
cd0a2b2f
...
...
@@ -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
;
}
...
...
src/lxc/terminal.c
View file @
cd0a2b2f
...
...
@@ -1131,7 +1131,7 @@ close_fds:
return
ret
;
}
int
lxc_make_controlling_
pty
(
int
fd
)
int
lxc_make_controlling_
terminal
(
int
fd
)
{
int
ret
;
...
...
@@ -1148,7 +1148,7 @@ int lxc_login_pty(int fd)
{
int
ret
;
ret
=
lxc_make_controlling_
pty
(
fd
);
ret
=
lxc_make_controlling_
terminal
(
fd
);
if
(
ret
<
0
)
return
-
1
;
...
...
src/lxc/terminal.h
View file @
cd0a2b2f
...
...
@@ -281,7 +281,7 @@ extern int lxc_terminal_create_log_file(struct lxc_terminal *console);
extern
int
lxc_terminal_io_cb
(
int
fd
,
uint32_t
events
,
void
*
data
,
struct
lxc_epoll_descr
*
descr
);
extern
int
lxc_make_controlling_
pty
(
int
fd
);
extern
int
lxc_make_controlling_
terminal
(
int
fd
);
extern
int
lxc_login_pty
(
int
fd
);
extern
void
lxc_terminal_conf_free
(
struct
lxc_terminal
*
console
);
extern
void
lxc_terminal_info_init
(
struct
lxc_terminal_info
*
pty
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment