chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machined: add "machinectl remove" for removing images
[elogind.git]
/
src
/
shared
/
ptyfwd.c
diff --git
a/src/shared/ptyfwd.c
b/src/shared/ptyfwd.c
index 3f8853902a4277e7f5489b3c7f9cd54fd8d74d59..11356e2def5900deb9afe8b287084870f5a1b809 100644
(file)
--- a/
src/shared/ptyfwd.c
+++ b/
src/shared/ptyfwd.c
@@
-53,6
+53,11
@@
struct PTYForward {
bool master_writable:1;
bool master_hangup:1;
bool master_writable:1;
bool master_hangup:1;
+ bool repeat:1;
+
+ bool last_char_set:1;
+ char last_char;
+
char in_buffer[LINE_MAX], out_buffer[LINE_MAX];
size_t in_buffer_full, out_buffer_full;
char in_buffer[LINE_MAX], out_buffer[LINE_MAX];
size_t in_buffer_full, out_buffer_full;
@@
-116,7
+121,7
@@
static int shovel(PTYForward *f) {
f->stdin_event_source = sd_event_source_unref(f->stdin_event_source);
} else {
f->stdin_event_source = sd_event_source_unref(f->stdin_event_source);
} else {
- log_error
(
"read(): %m");
+ log_error
_errno(errno,
"read(): %m");
return sd_event_exit(f->event, EXIT_FAILURE);
}
} else if (k == 0) {
return sd_event_exit(f->event, EXIT_FAILURE);
}
} else if (k == 0) {
@@
-150,7
+155,7
@@
static int shovel(PTYForward *f) {
f->master_event_source = sd_event_source_unref(f->master_event_source);
} else {
f->master_event_source = sd_event_source_unref(f->master_event_source);
} else {
- log_error
(
"write(): %m");
+ log_error
_errno(errno,
"write(): %m");
return sd_event_exit(f->event, EXIT_FAILURE);
}
} else {
return sd_event_exit(f->event, EXIT_FAILURE);
}
} else {
@@
-169,17
+174,18
@@
static int shovel(PTYForward *f) {
* might be cause by vhangup() or
* temporary closing of everything on
* the other side, we treat it like
* might be cause by vhangup() or
* temporary closing of everything on
* the other side, we treat it like
- * EAGAIN here and try again. */
+ * EAGAIN here and try again, unless
+ * repeat is off. */
- if (errno == EAGAIN ||
errno == EIO
)
+ if (errno == EAGAIN ||
(errno == EIO && f->repeat)
)
f->master_readable = false;
f->master_readable = false;
- else if (errno == EPIPE || errno == ECONNRESET) {
+ else if (errno == EPIPE || errno == ECONNRESET
|| errno == EIO
) {
f->master_readable = f->master_writable = false;
f->master_hangup = true;
f->master_event_source = sd_event_source_unref(f->master_event_source);
} else {
f->master_readable = f->master_writable = false;
f->master_hangup = true;
f->master_event_source = sd_event_source_unref(f->master_event_source);
} else {
- log_error
(
"read(): %m");
+ log_error
_errno(errno,
"read(): %m");
return sd_event_exit(f->event, EXIT_FAILURE);
}
} else
return sd_event_exit(f->event, EXIT_FAILURE);
}
} else
@@
-198,11
+204,17
@@
static int shovel(PTYForward *f) {
f->stdout_hangup = true;
f->stdout_event_source = sd_event_source_unref(f->stdout_event_source);
} else {
f->stdout_hangup = true;
f->stdout_event_source = sd_event_source_unref(f->stdout_event_source);
} else {
- log_error
(
"write(): %m");
+ log_error
_errno(errno,
"write(): %m");
return sd_event_exit(f->event, EXIT_FAILURE);
}
} else {
return sd_event_exit(f->event, EXIT_FAILURE);
}
} else {
+
+ if (k > 0) {
+ f->last_char = f->out_buffer[k-1];
+ f->last_char_set = true;
+ }
+
assert(f->out_buffer_full >= (size_t) k);
memmove(f->out_buffer, f->out_buffer + k, f->out_buffer_full - k);
f->out_buffer_full -= k;
assert(f->out_buffer_full >= (size_t) k);
memmove(f->out_buffer, f->out_buffer + k, f->out_buffer_full - k);
f->out_buffer_full -= k;
@@
-285,7
+297,7
@@
static int on_sigwinch_event(sd_event_source *e, const struct signalfd_siginfo *
return 0;
}
return 0;
}
-int pty_forward_new(sd_event *event, int master, PTYForward **ret) {
+int pty_forward_new(sd_event *event, int master,
bool repeat,
PTYForward **ret) {
_cleanup_(pty_forward_freep) PTYForward *f = NULL;
struct winsize ws;
int r;
_cleanup_(pty_forward_freep) PTYForward *f = NULL;
struct winsize ws;
int r;
@@
-294,6
+306,8
@@
int pty_forward_new(sd_event *event, int master, PTYForward **ret) {
if (!f)
return -ENOMEM;
if (!f)
return -ENOMEM;
+ f->repeat = repeat;
+
if (event)
f->event = sd_event_ref(event);
else {
if (event)
f->event = sd_event_ref(event);
else {
@@
-388,3
+402,14
@@
PTYForward *pty_forward_free(PTYForward *f) {
return NULL;
}
return NULL;
}
+
+int pty_forward_last_char(PTYForward *f, char *ch) {
+ assert(f);
+ assert(ch);
+
+ if (!f->last_char_set)
+ return -ENXIO;
+
+ *ch = f->last_char;
+ return 0;
+}