Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
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
zhul
criu
Commits
12ebda31
Commit
12ebda31
authored
Oct 30, 2012
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tty: Factor out tty ioctls ENOTTY checking
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
5cfec271
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
25 deletions
+23
-25
parasite.c
parasite.c
+23
-25
No files found.
parasite.c
View file @
12ebda31
...
...
@@ -452,6 +452,19 @@ out_send_fd:
return
ret
;
}
static
inline
int
tty_ioctl
(
int
fd
,
int
cmd
,
int
*
arg
)
{
int
ret
;
ret
=
sys_ioctl
(
fd
,
cmd
,
(
unsigned
long
)
arg
);
if
(
ret
<
0
)
{
if
(
ret
!=
-
ENOTTY
)
return
-
1
;
*
arg
=
0
;
}
return
0
;
}
static
int
parasite_dump_tty
(
struct
parasite_tty_args
*
args
)
{
int
ret
;
...
...
@@ -468,40 +481,25 @@ static int parasite_dump_tty(struct parasite_tty_args *args)
# define TIOCGEXCL _IOR('T', 0x40, int)
#endif
ret
=
sys_ioctl
(
args
->
fd
,
TIOCGSID
,
(
unsigned
long
)
&
args
->
sid
);
if
(
ret
<
0
)
{
if
(
ret
!=
-
ENOTTY
)
ret
=
tty_ioctl
(
args
->
fd
,
TIOCGSID
,
&
args
->
sid
);
if
(
ret
<
0
)
goto
err
;
args
->
sid
=
0
;
}
ret
=
sys_ioctl
(
args
->
fd
,
TIOCGPGRP
,
(
unsigned
long
)
&
args
->
pgrp
);
if
(
ret
<
0
)
{
if
(
ret
!=
-
ENOTTY
)
ret
=
tty_ioctl
(
args
->
fd
,
TIOCGPGRP
,
&
args
->
pgrp
);
if
(
ret
<
0
)
goto
err
;
args
->
pgrp
=
0
;
}
ret
=
sys_ioctl
(
args
->
fd
,
TIOCGPKT
,
(
unsigned
long
)
&
args
->
st_pckt
);
if
(
ret
<
0
)
{
if
(
ret
!=
-
ENOTTY
)
ret
=
tty_ioctl
(
args
->
fd
,
TIOCGPKT
,
&
args
->
st_pckt
);
if
(
ret
<
0
)
goto
err
;
args
->
st_pckt
=
0
;
}
ret
=
sys_ioctl
(
args
->
fd
,
TIOCGPTLCK
,
(
unsigned
long
)
&
args
->
st_lock
);
if
(
ret
<
0
)
{
if
(
ret
!=
-
ENOTTY
)
ret
=
tty_ioctl
(
args
->
fd
,
TIOCGPTLCK
,
&
args
->
st_lock
);
if
(
ret
<
0
)
goto
err
;
args
->
st_lock
=
0
;
}
ret
=
sys_ioctl
(
args
->
fd
,
TIOCGEXCL
,
(
unsigned
long
)
&
args
->
st_excl
);
if
(
ret
<
0
)
{
if
(
ret
!=
-
ENOTTY
)
ret
=
tty_ioctl
(
args
->
fd
,
TIOCGEXCL
,
&
args
->
st_excl
);
if
(
ret
<
0
)
goto
err
;
args
->
st_excl
=
0
;
}
args
->
hangup
=
false
;
return
0
;
...
...
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