diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /procps | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/nmeter.c | 2 | ||||
| -rw-r--r-- | procps/top.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/procps/nmeter.c b/procps/nmeter.c index 2310e9844..088d366bf 100644 --- a/procps/nmeter.c +++ b/procps/nmeter.c | |||
| @@ -70,7 +70,7 @@ typedef struct proc_file { | |||
| 70 | smallint last_gen; | 70 | smallint last_gen; |
| 71 | } proc_file; | 71 | } proc_file; |
| 72 | 72 | ||
| 73 | static const char *const proc_name[] = { | 73 | static const char *const proc_name[] ALIGN_PTR = { |
| 74 | "stat", // Must match the order of proc_file's! | 74 | "stat", // Must match the order of proc_file's! |
| 75 | "loadavg", | 75 | "loadavg", |
| 76 | "net/dev", | 76 | "net/dev", |
diff --git a/procps/top.c b/procps/top.c index 4cd545c69..804d6f258 100644 --- a/procps/top.c +++ b/procps/top.c | |||
| @@ -913,7 +913,7 @@ static unsigned handle_input(unsigned scan_mask, duration_t interval) | |||
| 913 | while (1) { | 913 | while (1) { |
| 914 | int32_t c; | 914 | int32_t c; |
| 915 | 915 | ||
| 916 | c = read_key(STDIN_FILENO, G.kbd_input, interval * 1000); | 916 | c = safe_read_key(STDIN_FILENO, G.kbd_input, interval * 1000); |
| 917 | if (c == -1 && errno != EAGAIN) { | 917 | if (c == -1 && errno != EAGAIN) { |
| 918 | /* error/EOF */ | 918 | /* error/EOF */ |
| 919 | option_mask32 |= OPT_EOF; | 919 | option_mask32 |= OPT_EOF; |