Compare commits
35 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ce6164d20 | |||
| cc95ed0ad2 | |||
| 3231247534 | |||
| c4c25d7dda | |||
| b2747cf886 | |||
| c5ca50b654 | |||
| 96329fc290 | |||
| 568f5ca733 | |||
| 6bfdd85cfb | |||
| 7f4d2f3a51 | |||
| 3cae838cf0 | |||
| 16825bd70e | |||
| 5520722723 | |||
| a68edc5e57 | |||
| 2c3441dda5 | |||
| 45e73de4b9 | |||
| 778242986f | |||
| 137418ad1e | |||
| 9057376656 | |||
| cbbb0cd225 | |||
| 2fb5ad2599 | |||
| 4988368662 | |||
| f0697e83f3 | |||
| 0f879c8b61 | |||
| 5ca23ce107 | |||
| b3f6d61edf | |||
| 7a424bc10d | |||
| 8956f3f851 | |||
| ac76071e0e | |||
| 6337ac09eb | |||
| fd4313745f | |||
| a7d760d719 | |||
| 9ca94921c8 | |||
| cf678db1fd | |||
| 6556a2ec50 |
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
m4_define([pkg_version], [0.11])
|
m4_define([pkg_version], [0.10])
|
||||||
#m4_define([pkg_revision], [005])
|
#m4_define([pkg_revision], [005])
|
||||||
m4_define([pkg_version], m4_ifdef([pkg_revision], [pkg_version.pkg_revision], [pkg_version]))
|
m4_define([pkg_version], m4_ifdef([pkg_revision], [pkg_version.pkg_revision], [pkg_version]))
|
||||||
|
|
||||||
|
|||||||
@@ -99,12 +99,9 @@ _PRF2_ static void _log(int prio, const char *fmt, ...)
|
|||||||
#define DBG2(...) \
|
#define DBG2(...) \
|
||||||
if (ttynvt_param.debug > 1) _log(LOG_DEBUG, __VA_ARGS__)
|
if (ttynvt_param.debug > 1) _log(LOG_DEBUG, __VA_ARGS__)
|
||||||
|
|
||||||
static volatile char _is_interrupted = 0;
|
|
||||||
|
|
||||||
static void sig_handler(int sig)
|
static void sig_handler(int sig)
|
||||||
{
|
{
|
||||||
DBG("Interruped, signal = %d\n", sig);
|
|
||||||
_is_interrupted = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void set_signal_handler(void)
|
static void set_signal_handler(void)
|
||||||
@@ -492,9 +489,7 @@ ttynvt_read(fuse_req_t req, size_t size, off_t off,
|
|||||||
size = TMP_BUF_SIZE;
|
size = TMP_BUF_SIZE;
|
||||||
|
|
||||||
fuse_req_interrupt_func(req, ttynvt_interrupted, (void *)pthread_self());
|
fuse_req_interrupt_func(req, ttynvt_interrupted, (void *)pthread_self());
|
||||||
res =
|
res = read(tty->fds[FD_SLAVE].fd, tty->tmp_buf, size);
|
||||||
_is_interrupted ? -2 : read(tty->fds[FD_SLAVE].fd, tty->tmp_buf, size);
|
|
||||||
_is_interrupted = 0;
|
|
||||||
fuse_req_interrupt_func(req, NULL, NULL);
|
fuse_req_interrupt_func(req, NULL, NULL);
|
||||||
if (res < 0)
|
if (res < 0)
|
||||||
{
|
{
|
||||||
@@ -908,12 +903,8 @@ ttynvt_poll(fuse_req_t req, struct fuse_file_info *info,
|
|||||||
|
|
||||||
static const struct cuse_lowlevel_ops ttynvt_op = {
|
static const struct cuse_lowlevel_ops ttynvt_op = {
|
||||||
.init = ttynvt_init,
|
.init = ttynvt_init,
|
||||||
.open = ttynvt_open,
|
.open = ttynvt_open,.read = ttynvt_read,.write = ttynvt_write,.ioctl =
|
||||||
.read = ttynvt_read,
|
ttynvt_ioctl,.poll = ttynvt_poll,.release = ttynvt_release,
|
||||||
.write = ttynvt_write,
|
|
||||||
.ioctl = ttynvt_ioctl,
|
|
||||||
.poll = ttynvt_poll,
|
|
||||||
.release = ttynvt_release,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define TTYNET_OPT(t, p, v) { t, offsetof(struct ttynvt_param, p), v }
|
#define TTYNET_OPT(t, p, v) { t, offsetof(struct ttynvt_param, p), v }
|
||||||
|
|||||||
Reference in New Issue
Block a user