watch: Pass through bell

Based upon merge request 104, closes #174

References:
 procps-ng/procps!104
 procps-ng/procps#174
This commit is contained in:
Craig Small 2023-01-17 16:59:00 +11:00
parent aa461df0a7
commit 5f4074a250
2 changed files with 7 additions and 0 deletions

1
NEWS
View File

@ -8,6 +8,7 @@ procps-ng-NEXT
* top: E/P-core toggle ('5' key) added to help * top: E/P-core toggle ('5' key) added to help
* vmstat: Referesh memory statistics Debian #1027963 * vmstat: Referesh memory statistics Debian #1027963
* w: Add --pids option merge #159 * w: Add --pids option merge #159
* watch: Pass through beep issue #104
procps-ng-4.0.2 procps-ng-4.0.2
--------------- ---------------

View File

@ -647,6 +647,7 @@ static int run_command(char *restrict command, char **restrict command_argv)
} while (c != WEOF && !iswprint(c) } while (c != WEOF && !iswprint(c)
&& c < 128 && c < 128
&& wcwidth(c) == 0 && wcwidth(c) == 0
&& c != L'\a'
&& c != L'\n' && c != L'\n'
&& c != L'\t' && c != L'\t'
&& (c != L'\033' && (c != L'\033'
@ -655,6 +656,7 @@ static int run_command(char *restrict command, char **restrict command_argv)
do do
c = getc(p); c = getc(p);
while (c != EOF && !isprint(c) while (c != EOF && !isprint(c)
&& c != '\a'
&& c != '\n' && c != '\n'
&& c != '\t' && c != '\t'
&& (c != L'\033' && (c != L'\033'
@ -673,6 +675,10 @@ static int run_command(char *restrict command, char **restrict command_argv)
eolseen = 1; eolseen = 1;
else if (c == L'\t') else if (c == L'\t')
tabpending = 1; tabpending = 1;
else if (c == L'\a') {
beep();
continue;
}
#ifdef WITH_WATCH8BIT #ifdef WITH_WATCH8BIT
if (x == width - 1 && wcwidth(c) == 2) { if (x == width - 1 && wcwidth(c) == 2) {
y++; y++;