diff options
| author | Denys Vlasenko | 2011-08-28 13:00:29 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2011-08-28 13:00:29 +0200 |
| commit | cc272b06eefb87030bb85b686abdbc22b5ed1c34 (patch) | |
| tree | 06024199184cfab43807a1fdcc2a240b9cf5ac99 /shell | |
| parent | d84b175cb6948eb17f847313bf912174e2f934e1 (diff) | |
| download | busybox-cc272b06eefb87030bb85b686abdbc22b5ed1c34.zip busybox-cc272b06eefb87030bb85b686abdbc22b5ed1c34.tar.gz | |
Apply post-1.19.0 patches, bump version to 1.19.11_19_1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/cttyhack.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/shell/cttyhack.c b/shell/cttyhack.c index 4261289..37ea137 100644 --- a/shell/cttyhack.c +++ b/shell/cttyhack.c @@ -122,10 +122,12 @@ int cttyhack_main(int argc UNUSED_PARAM, char **argv) do { #ifdef __linux__ int s = open_read_close("/sys/class/tty/console/active", - console + 5, sizeof(console) - 5 - 1); + console + 5, sizeof(console) - 5); if (s > 0) { - /* found active console via sysfs (Linux 2.6.38+) */ - console[5 + s] = '\0'; + /* found active console via sysfs (Linux 2.6.38+) + * sysfs string looks like "ttyS0\n" so zap the newline: + */ + console[4 + s] = '\0'; break; } |