chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
virt: when detecting containers and /run/systemd/container cannot be read, check...
[elogind.git]
/
src
/
shared
/
ptyfwd.c
diff --git
a/src/shared/ptyfwd.c
b/src/shared/ptyfwd.c
index 7c6e182e5b1c88ff84f006b0fa252c414cc5e736..085d374ed873494105473adfffc6225455eccb46 100644
(file)
--- a/
src/shared/ptyfwd.c
+++ b/
src/shared/ptyfwd.c
@@
-116,7
+116,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
+150,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 {
@@
-179,7
+179,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
(
"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,7
+198,7
@@
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);
}
return sd_event_exit(f->event, EXIT_FAILURE);
}
@@
-280,7
+280,7
@@
static int on_sigwinch_event(sd_event_source *e, const struct signalfd_siginfo *
/* The window size changed, let's forward that. */
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) >= 0)
/* The window size changed, let's forward that. */
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) >= 0)
- ioctl(f->master, TIOCSWINSZ, &ws);
+
(void)
ioctl(f->master, TIOCSWINSZ, &ws);
return 0;
}
return 0;
}
@@
-317,7
+317,7
@@
int pty_forward_new(sd_event *event, int master, PTYForward **ret) {
f->master = master;
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) >= 0)
f->master = master;
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) >= 0)
- ioctl(master, TIOCSWINSZ, &ws);
+
(void)
ioctl(master, TIOCSWINSZ, &ws);
if (tcgetattr(STDIN_FILENO, &f->saved_stdin_attr) >= 0) {
struct termios raw_stdin_attr;
if (tcgetattr(STDIN_FILENO, &f->saved_stdin_attr) >= 0) {
struct termios raw_stdin_attr;