ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/pty-session: add loggin callback to code, follow return codes 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2019-10-03 13:23:41 +02:00
parent 04f0c95f93
commit 4f7f723b31
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pty-session.h
View File

@ -48,7 +48,7 @@ struct ul_pty_callbacks {
* 2nd - signal info * 2nd - signal info
* 3rd - NULL or signal specific data (e.g. struct winsize on SIGWINCH * 3rd - NULL or signal specific data (e.g. struct winsize on SIGWINCH
*/ */
int (*log_signal)(void *, struct signalfd_siginfo, void *); int (*log_signal)(void *, struct signalfd_siginfo *, void *);
}; };
struct ul_pty { struct ul_pty {

18
lib/pty-session.c
View File

@ -270,6 +270,7 @@ static int handle_io(struct ul_pty *pty, int fd, int *eof)
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
ssize_t bytes; ssize_t bytes;
int rc = 0;
DBG(IO, ul_debugobj(pty, " handle I/O on fd=%d", fd)); DBG(IO, ul_debugobj(pty, " handle I/O on fd=%d", fd));
*eof = 0; *eof = 0;
@ -304,13 +305,18 @@ static int handle_io(struct ul_pty *pty, int fd, int *eof)
write_output(buf, bytes); write_output(buf, bytes);
} }
return 0; if (pty->callbacks.log_stream_activity)
rc = pty->callbacks.log_stream_activity(
pty->callback_data, fd, buf, bytes);
return rc;
} }
static int handle_signal(struct ul_pty *pty, int fd) static int handle_signal(struct ul_pty *pty, int fd)
{ {
struct signalfd_siginfo info; struct signalfd_siginfo info;
ssize_t bytes; ssize_t bytes;
int rc = 0;
DBG(SIG, ul_debugobj(pty, " handle signal on fd=%d", fd)); DBG(SIG, ul_debugobj(pty, " handle signal on fd=%d", fd));
@ -343,6 +349,10 @@ static int handle_signal(struct ul_pty *pty, int fd)
if (pty->isterm) { if (pty->isterm) {
ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&pty->win); ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&pty->win);
ioctl(pty->slave, TIOCSWINSZ, (char *)&pty->win); ioctl(pty->slave, TIOCSWINSZ, (char *)&pty->win);
if (pty->callbacks.log_signal)
rc = pty->callbacks.log_signal(pty->callback_data,
&info, (void *) &pty->win);
} }
break; break;
case SIGTERM: case SIGTERM:
@ -355,12 +365,16 @@ static int handle_signal(struct ul_pty *pty, int fd)
/* Child termination is going to generate SIGCHILD (see above) */ /* Child termination is going to generate SIGCHILD (see above) */
if (pty->child > 0) if (pty->child > 0)
kill(pty->child, SIGTERM); kill(pty->child, SIGTERM);
if (pty->callbacks.log_signal)
rc = pty->callbacks.log_signal(pty->callback_data,
&info, (void *) &pty->win);
break; break;
default: default:
abort(); abort();
} }
return 0; return rc;
} }
/* loop in parent */ /* loop in parent */