rpms/procps/devel procps-3.2.7-top-exitcode.patch, NONE, 1.1 procps-3.2.7-top-single.patch, NONE, 1.1 procps-3.2.7-longcmd.patch, 1.1, 1.2 procps.spec, 1.55, 1.56 procps-3.2.7-zombie.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/procps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4397

Modified Files:
	procps-3.2.7-longcmd.patch procps.spec 
Added Files:
	procps-3.2.7-top-exitcode.patch procps-3.2.7-top-single.patch 
Removed Files:
	procps-3.2.7-zombie.patch 
Log Message:
fix some top issues

procps-3.2.7-top-exitcode.patch:
 top.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-top-exitcode.patch ---
--- procps-3.2.7/top.c.exitcode	2006-09-19 12:45:47.000000000 +0200
+++ procps-3.2.7/top.c	2006-09-19 12:45:56.000000000 +0200
@@ -412,7 +412,7 @@
 static void end_pgm (int dont_care_sig)
 {
    (void)dont_care_sig;
-   bye_bye(stdout, 1, NULL);
+   bye_bye(stdout, 0, NULL);
 }
 
 

procps-3.2.7-top-single.patch:
 top.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-top-single.patch ---
--- procps-3.2.7/top.c.single	2006-09-19 12:26:32.000000000 +0200
+++ procps-3.2.7/top.c	2006-09-19 12:27:12.000000000 +0200
@@ -2529,7 +2529,7 @@
 
    switch (c) {
       case '1':
-         if (Cpu_tot+7 > Screen_rows && !CHKw(Curwin, View_CPUSUM)) {
+         if (Cpu_tot+7 > Screen_rows && CHKw(Curwin, View_CPUSUM)) {
             show_msg(err_num_cpus);
             break;
          }

procps-3.2.7-longcmd.patch:
 readproc.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

Index: procps-3.2.7-longcmd.patch
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps-3.2.7-longcmd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procps-3.2.7-longcmd.patch	10 Jul 2006 15:07:43 -0000	1.1
+++ procps-3.2.7-longcmd.patch	27 Sep 2006 15:37:35 -0000	1.2
@@ -1,6 +1,6 @@
---- procps-3.2.7/proc/readproc.c.longcmd	2006-07-10 16:54:10.000000000 +0200
-+++ procps-3.2.7/proc/readproc.c	2006-07-10 16:54:39.000000000 +0200
-@@ -432,7 +432,7 @@
+--- procps-3.2.7/proc/readproc.c.kzak	2006-06-16 10:18:13.000000000 +0200
++++ procps-3.2.7/proc/readproc.c	2006-09-27 11:25:13.000000000 +0200
+@@ -432,14 +432,17 @@
      if(fd==-1) return NULL;
  
      /* read whole file into a memory buffer, allocating as we go */
@@ -8,4 +8,15 @@
 +    while ((n = read(fd, buf, sizeof buf - 1)) >= 0) {
  	if (n < (int)(sizeof buf - 1))
  	    end_of_file = 1;
- 	if (n == 0 && rbuf == 0)
+-	if (n == 0 && rbuf == 0)
++	if (n == 0 && rbuf == 0) {
++	    close(fd);
+ 	    return NULL;	/* process died between our open and read */
++	}
+ 	if (n < 0) {
+ 	    if (rbuf)
+ 		free(rbuf);
++	    close(fd);
+ 	    return NULL;	/* read error */
+ 	}
+ 	if (end_of_file && buf[n-1])		/* last read char not null */


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- procps.spec	5 Sep 2006 07:31:57 -0000	1.55
+++ procps.spec	27 Sep 2006 15:37:35 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 6
+Release: 8
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -36,10 +36,12 @@
 Patch16: procps-3.2.7-vmstat-cpusteal.patch
 # 134516 - ps ignores /proc/#/cmdline if contents 2047 bytes
 Patch17: procps-3.2.7-longcmd.patch
-# 139827 - ps(1) outputs a multi-threads process as a defunct process.
-Patch18: procps-3.2.7-zombie.patch
 # 189349 - 32bit vmstat on 64bit kernel
-Patch19: procps-3.2.7-vmstat-pgpg.patch
+Patch18: procps-3.2.7-vmstat-pgpg.patch
+# 206551 - top fails to convert to cpu single mode when hit '1'
+Patch19: procps-3.2.7-top-single.patch
+# 199174 - top returns with exit code 1 even if no error occurs
+Patch20: procps-3.2.7-top-exitcode.patch
 
 BuildRequires: ncurses-devel
 
@@ -84,6 +86,7 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 cp %SOURCE1 .
 
@@ -121,6 +124,14 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Sep 27 2006 Karel Zak <kzak at redhat.com> 3.2.7-8
+- remove zombie patch (needs more investigation)
+- fix #208100 - top command with '-c' option become not to display list of tasks
+- fix #199174 - top returns with exit code 1 even if no error occurs
+
+* Tue Sep 19 2006 Karel Zak <kzak at redhat.com> 3.2.7-7
+- fix #206551 - top fails to convert to cpu single mode when hit '1'
+
 * Tue Sep  5 2006 Karel Zak <kzak at redhat.com> 3.2.7-6
 - fix minor bug in procps-3.2.6-top-env-cpuloop.patch
 


--- procps-3.2.7-zombie.patch DELETED ---