diff options
| author | Denys Vlasenko | 2010-03-28 20:01:31 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2010-03-28 20:01:31 +0200 |
| commit | 58cdca3984beb4e1019ef5ccf1dd7361f032a9a6 (patch) | |
| tree | 922928fdb79cbdb6a02ffbeab7948c03ad501656 /util-linux | |
| parent | e52b735231bda70d811e4f9ef0e21fb2c7af96a2 (diff) | |
| download | busybox-1_16_1.zip busybox-1_16_1.tar.gz | |
apply post-1.16.0 fixes, bump version to 1.16.11_16_1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/script.c | 4 | ||||
| -rw-r--r-- | util-linux/volume_id/linux_swap.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/util-linux/script.c b/util-linux/script.c index 37213ee..d9a62fb 100644 --- a/util-linux/script.c +++ b/util-linux/script.c @@ -119,7 +119,7 @@ int script_main(int argc UNUSED_PARAM, char **argv) * for example, try "script -c true" */ break; } - if (pfd[0].revents & POLLIN) { + if (pfd[0].revents) { errno = 0; count = safe_read(pty, buf, sizeof(buf)); if (count <= 0 && errno != EAGAIN) { @@ -143,7 +143,7 @@ int script_main(int argc UNUSED_PARAM, char **argv) } } } - if (pfd[1].revents & POLLIN) { + if (pfd[1].revents) { count = safe_read(STDIN_FILENO, buf, sizeof(buf)); if (count <= 0) { /* err/eof from stdin: don't read stdin anymore */ diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c index 1b5488f..5743546 100644 --- a/util-linux/volume_id/linux_swap.c +++ b/util-linux/volume_id/linux_swap.c @@ -52,7 +52,11 @@ int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/) goto found; } - if (memcmp(buf, "SWAPSPACE2", 10) == 0) { + if (memcmp(buf, "SWAPSPACE2", 10) == 0 + || memcmp(buf, "S1SUSPEND", 9) == 0 + || memcmp(buf, "S2SUSPEND", 9) == 0 + || memcmp(buf, "ULSUSPEND", 9) == 0 + ) { sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2)); if (sw == NULL) return -1; |