rpms/procinfo/devel procinfo-18-ranges.patch, 1.1, 1.2 procinfo.spec, 1.15, 1.16

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/procinfo/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11644

Modified Files:
	procinfo-18-ranges.patch procinfo.spec 
Log Message:
- improve ranges patch (thanks to karsten)

procinfo-18-ranges.patch:
 procinfo.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Index: procinfo-18-ranges.patch
===================================================================
RCS file: /cvs/dist/rpms/procinfo/devel/procinfo-18-ranges.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procinfo-18-ranges.patch	12 Oct 2005 09:01:13 -0000	1.1
+++ procinfo-18-ranges.patch	12 Oct 2005 10:04:31 -0000	1.2
@@ -1,14 +1,16 @@
---- procinfo-18/procinfo.c.ranges	2005-10-12 11:02:51.000000000 +0200
-+++ procinfo-18/procinfo.c	2005-10-12 11:03:59.000000000 +0200
-@@ -231,7 +231,7 @@
+--- procinfo-18/procinfo.c.ranges	2005-10-12 12:07:20.000000000 +0200
++++ procinfo-18/procinfo.c	2005-10-12 12:09:17.000000000 +0200
+@@ -231,8 +231,8 @@
  
      fseek (loadavgfp, 0L, SEEK_SET);
      fgets (line, sizeof (line), loadavgfp);
 -    strcpy (loadavg, line);
+-    loadavg[strlen (loadavg) - 1] = '\0';
 +    strncpy (loadavg, line, sizeof (loadavg));
-     loadavg[strlen (loadavg) - 1] = '\0';
++    loadavg[sizeof (loadavg) - 1] = '\0';
      fgets (line, sizeof (line), loadavgfp);
  
+     printf ("Bootup: %s    Load average: %s\n\n", booted, loadavg);
 @@ -481,7 +481,7 @@
  
  		for (i = 0; i < nr_irqs; i++) {


Index: procinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/procinfo/devel/procinfo.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- procinfo.spec	12 Oct 2005 09:01:13 -0000	1.15
+++ procinfo.spec	12 Oct 2005 10:04:31 -0000	1.16
@@ -1,7 +1,7 @@
 Summary: A tool for gathering and displaying system information.
 Name: procinfo
 Version: 18
-Release: 17
+Release: 18
 License: GPL
 Group: Applications/System
 Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2
@@ -59,6 +59,9 @@
 %{_mandir}/man8/socklist.8*
 
 %changelog
+* Wed Oct 12 2005 Karel Zak <kzak at redhat.com> 18-18
+- improve procinfo-18-ranges.patch
+
 * Wed Oct 12 2005 Karel Zak <kzak at redhat.com> 18-17
 - fix #170424 - procinfo crashing on X86_64