chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4f3656e
)
nspawn: get rid of BUFFER_SIZE, use LINE_MAX instead
author
Lennart Poettering
<lennart@poettering.net>
Tue, 3 Jan 2012 19:41:20 +0000
(20:41 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 3 Jan 2012 20:08:57 +0000
(21:08 +0100)
src/nspawn.c
patch
|
blob
|
history
diff --git
a/src/nspawn.c
b/src/nspawn.c
index 653d7db730a80361b08a2b002415c0cb2e6fcaa6..3ea603f2352443e1bcceb05a783e74ac10a891f7 100644
(file)
--- a/
src/nspawn.c
+++ b/
src/nspawn.c
@@
-394,11
+394,9
@@
static int is_os_tree(const char *path) {
return r < 0 ? 0 : 1;
}
return r < 0 ? 0 : 1;
}
-#define BUFFER_SIZE 1024
-
static int process_pty(int master, sigset_t *mask) {
static int process_pty(int master, sigset_t *mask) {
- char in_buffer[
BUFFER_SIZE], out_buffer[BUFFER_SIZE
];
+ char in_buffer[
LINE_MAX], out_buffer[LINE_MAX
];
size_t in_buffer_full = 0, out_buffer_full = 0;
struct epoll_event stdin_ev, stdout_ev, master_ev, signal_ev;
bool stdin_readable = false, stdout_writable = false, master_readable = false, master_writable = false;
size_t in_buffer_full = 0, out_buffer_full = 0;
struct epoll_event stdin_ev, stdout_ev, master_ev, signal_ev;
bool stdin_readable = false, stdout_writable = false, master_readable = false, master_writable = false;
@@
-519,9
+517,9
@@
static int process_pty(int master, sigset_t *mask) {
(master_readable && out_buffer_full <= 0) ||
(stdout_writable && out_buffer_full > 0)) {
(master_readable && out_buffer_full <= 0) ||
(stdout_writable && out_buffer_full > 0)) {
- if (stdin_readable && in_buffer_full <
BUFFER_SIZE
) {
+ if (stdin_readable && in_buffer_full <
LINE_MAX
) {
- if ((k = read(STDIN_FILENO, in_buffer + in_buffer_full,
BUFFER_SIZE
- in_buffer_full)) < 0) {
+ if ((k = read(STDIN_FILENO, in_buffer + in_buffer_full,
LINE_MAX
- in_buffer_full)) < 0) {
if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
stdin_readable = false;
if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
stdin_readable = false;
@@
-553,9
+551,9
@@
static int process_pty(int master, sigset_t *mask) {
}
}
}
}
- if (master_readable && out_buffer_full <
BUFFER_SIZE
) {
+ if (master_readable && out_buffer_full <
LINE_MAX
) {
- if ((k = read(master, out_buffer + out_buffer_full,
BUFFER_SIZE
- out_buffer_full)) < 0) {
+ if ((k = read(master, out_buffer + out_buffer_full,
LINE_MAX
- out_buffer_full)) < 0) {
if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
master_readable = false;
if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
master_readable = false;