rpms/procps/FC-4 procps-3.2.5-top-rc.patch, 1.1, 1.2 procps.spec, 1.38, 1.39

[fedora-cvs-commits at redhat.com]

Author: kzak

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

Modified Files:
	procps-3.2.5-top-rc.patch procps.spec 
Log Message:



procps-3.2.5-top-rc.patch:
 top.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

Index: procps-3.2.5-top-rc.patch
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-4/procps-3.2.5-top-rc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procps-3.2.5-top-rc.patch	8 Jul 2005 08:56:34 -0000	1.1
+++ procps-3.2.5-top-rc.patch	8 Jul 2005 10:05:48 -0000	1.2
@@ -1,25 +1,14 @@
---- procps-3.2.5/top.c.rc	2005-06-28 17:53:14.000000000 +0200
-+++ procps-3.2.5/top.c	2005-06-28 17:58:36.000000000 +0200
-@@ -2365,7 +2365,7 @@
+--- procps-3.2.5/top.c.rc	2005-06-28 22:36:24.000000000 +0200
++++ procps-3.2.5/top.c	2005-06-28 22:40:27.000000000 +0200
+@@ -2393,7 +2393,10 @@
+    int i;
+ 
     for (i = 0; i < GROUPSMAX; i++) {
-       w = &Winstk[i];
-       w->winnum = i + 1;
--      w->rc = Rc.win[i];
-+      memcpy(&w->rc, &Rc.win[i], sizeof(RCF_t));
-       w->captab[0] = Cap_norm;
-       w->captab[1] = Cap_norm;
-       w->captab[2] = w->cap_bold;
-@@ -2375,9 +2375,10 @@
-       w->captab[6] = w->capclr_hdr;
-       w->captab[7] = w->capclr_rowhigh;
-       w->captab[8] = w->capclr_rownorm;
--      w->next = w + 1;
--      w->prev = w - 1;
--      ++w;
-+      if (i < GROUPSMAX+1)
-+         w->next = w + 1;
-+      if (i > 0)
-+         w->prev = w - 1;
+-      win_names(&Winstk[i], Winstk[i].rc.winname);
++      /* Please, never use something like sprintf(x, "%s", x); ... see win_names() */
++      char buf[WINNAMSIZ];
++      strncpy(buf, Winstk[i].rc.winname, WINNAMSIZ);
++      win_names(&Winstk[i], buf);
+       capsmk(&Winstk[i]);
     }
-       /* fixup the circular chains... */
-    Winstk[3].next = &Winstk[0];
+    // rely on this next guy to force a call (eventually) to reframewins


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-4/procps.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- procps.spec	8 Jul 2005 08:56:34 -0000	1.38
+++ procps.spec	8 Jul 2005 10:05:48 -0000	1.39
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.5
-Release: 6.1
+Release: 6.2
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -100,7 +100,7 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
-* Fri Jul  8 2005 Karel Zak <kzak at redhat.com> 3.2.5-6.1
+* Fri Jul  8 2005 Karel Zak <kzak at redhat.com> 3.2.5-6.2
 - fix #161449 - "top" ignores user and system toprc
 - fix #161559 - top segfaults when resizing konsole
 - fix #160796 - vmstat crashes when accessing LVM partition.