oops -- top keyboard handling broke, 3.1.8 coming soon

This commit is contained in:
albert 2003-03-20 19:12:12 +00:00
parent aa6fd01f1d
commit f5d42ca11d
5 changed files with 20 additions and 12 deletions

View File

@ -18,9 +18,9 @@
VERSION := 3
SUBVERSION := 1
MINORVERSION := 7
TARVERSION := 3.1.7
LIBVERSION := 3.1.7
MINORVERSION := 8
TARVERSION := 3.1.8
LIBVERSION := 3.1.8
############ vars

4
NEWS
View File

@ -1,3 +1,7 @@
procps-3.1.7 --> procps-3.1.8
top: fix keyboard handling (help screen, etc.)
procps-3.1.6 --> procps-3.1.7
Makefile: made SKIP feature easier to use

View File

@ -1,15 +1,15 @@
Begin4
Title: procps
Version: 3.1.7
Entered-date: 2003-3-18
Version: 3.1.8
Entered-date: 2003-03-19
Description: Linux system utilities
Keywords: procps /proc libproc sysctl pmap
ps uptime tload free w top vmstat watch skill snice kill pgrep pkill
Keywords: procps /proc libproc sysctl pmap ps uptime tload
free w top vmstat watch skill snice kill pgrep pkill
Author: Albert Cahalan, Michael K. Johnson, Jim Warner, etc.
Maintained-by: various <procps-feedback@lists.sf.net>
Primary-site: http://procps.sf.net/
239kB procps-3.1.7.tar.gz
239kB procps-3.1.8.tar.gz
Alternate-site: http://www.debian.org/Packages/unstable/base/procps.html
239kB procps-3.1.7.tar.gz
239kB procps-3.1.8.tar.gz
Copying-policy: mixed
End

View File

@ -3,7 +3,7 @@ Summary: System and process monitoring utilities
Name: procps
%define major_version 3
%define minor_version 1
%define revision 7
%define revision 8
%define version %{major_version}.%{minor_version}.%{revision}
Version: %{version}
Release: 1

8
top.c
View File

@ -3262,8 +3262,12 @@ int main (int dont_care_argc, char **argv)
fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK|file_flags);
// check 1st, in case tv zeroed (by sig handler) before it got set
if (chin(0, &c, 1) <= 0) select(1, &fs, NULL, NULL, &tv);
if (chin(0, &c, 1) > 0) do_key((unsigned)c);
fcntl(STDIN_FILENO, F_SETFL, file_flags);
if (chin(0, &c, 1) > 0) {
fcntl(STDIN_FILENO, F_SETFL, file_flags);
do_key((unsigned)c);
} else {
fcntl(STDIN_FILENO, F_SETFL, file_flags);
}
}
}