aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/script.c4
-rw-r--r--util-linux/volume_id/linux_swap.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/util-linux/script.c b/util-linux/script.c
index 37213eec8..d9a62fbfe 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -119,7 +119,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
119 * for example, try "script -c true" */ 119 * for example, try "script -c true" */
120 break; 120 break;
121 } 121 }
122 if (pfd[0].revents & POLLIN) { 122 if (pfd[0].revents) {
123 errno = 0; 123 errno = 0;
124 count = safe_read(pty, buf, sizeof(buf)); 124 count = safe_read(pty, buf, sizeof(buf));
125 if (count <= 0 && errno != EAGAIN) { 125 if (count <= 0 && errno != EAGAIN) {
@@ -143,7 +143,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
143 } 143 }
144 } 144 }
145 } 145 }
146 if (pfd[1].revents & POLLIN) { 146 if (pfd[1].revents) {
147 count = safe_read(STDIN_FILENO, buf, sizeof(buf)); 147 count = safe_read(STDIN_FILENO, buf, sizeof(buf));
148 if (count <= 0) { 148 if (count <= 0) {
149 /* err/eof from stdin: don't read stdin anymore */ 149 /* 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 1b5488f9e..574354611 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*/)
52 goto found; 52 goto found;
53 } 53 }
54 54
55 if (memcmp(buf, "SWAPSPACE2", 10) == 0) { 55 if (memcmp(buf, "SWAPSPACE2", 10) == 0
56 || memcmp(buf, "S1SUSPEND", 9) == 0
57 || memcmp(buf, "S2SUSPEND", 9) == 0
58 || memcmp(buf, "ULSUSPEND", 9) == 0
59 ) {
56 sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2)); 60 sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
57 if (sw == NULL) 61 if (sw == NULL)
58 return -1; 62 return -1;