emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

3.1.11

Browse Source
This commit is contained in:
albert 2003-07-14 12:11:43 +00:00
parent 0db94e6a1a
commit 45764fb735
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -18,9 +18,9 @@
VERSION := 3 VERSION := 3
SUBVERSION := 1 SUBVERSION := 1
MINORVERSION := 10 MINORVERSION := 11
TARVERSION := 3.1.10 TARVERSION := 3.1.11
LIBVERSION := 3.1.10 LIBVERSION := 3.1.11
############ vars ############ vars

4
NEWS
View File

@ -1,3 +1,7 @@
procps-3.1.10 --> procps-3.1.11
compile with gcc 2.95 again (C99 issue)
procps-3.1.9 --> procps-3.1.10 procps-3.1.9 --> procps-3.1.10
handle GPLONLY_ symbols #143549 #188374 handle GPLONLY_ symbols #143549 #188374

11
proc/sysinfo.c
View File

@ -673,15 +673,16 @@ static unsigned int getFileLines(const char* szFile){
unsigned int getdiskstat(struct disk_stat **disks, struct partition_stat **partitions){ unsigned int getdiskstat(struct disk_stat **disks, struct partition_stat **partitions){
FILE* fd; FILE* fd;
buff[BUFFSIZE-1] = 0;
int units, int units,
i, i,
disk_type, disk_type,
disk_num, disk_num,
cDisk=0, cDisk=0,
cPartition=0; cPartition=0;
*disks = NULL; *disks = NULL;
*partitions = NULL; *partitions = NULL;
buff[BUFFSIZE-1] = 0;
units = getFileLines("/proc/diskstats"); units = getFileLines("/proc/diskstats");
fd = fopen("/proc/diskstats", "rb"); fd = fopen("/proc/diskstats", "rb");
if(!fd) crash("/proc/diskstats"); if(!fd) crash("/proc/diskstats");
@ -760,7 +761,7 @@ unsigned int getslabinfo (struct slab_cache **slab){
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
unsigned get_pid_digits(void){ unsigned get_pid_digits(void){
char buf[24]; char pidbuf[24];
char *endp; char *endp;
long rc; long rc;
int fd; int fd;
@ -770,11 +771,11 @@ unsigned get_pid_digits(void){
ret = 5; ret = 5;
fd = open("/proc/sys/kernel/pid_max", O_RDONLY); fd = open("/proc/sys/kernel/pid_max", O_RDONLY);
if(fd==-1) goto out; if(fd==-1) goto out;
rc = read(fd, buf, sizeof buf); rc = read(fd, pidbuf, sizeof pidbuf);
close(fd); close(fd);
if(rc<3) goto out; if(rc<3) goto out;
buf[rc] = '\0'; pidbuf[rc] = '\0';
rc = strtol(buf,&endp,10); rc = strtol(pidbuf,&endp,10);
if(rc<42) goto out; if(rc<42) goto out;
if(*endp && *endp!='\n') goto out; if(*endp && *endp!='\n') goto out;
rc--; // the pid_max value is really the max PID plus 1 rc--; // the pid_max value is really the max PID plus 1

8
procps.lsm
View File

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

2
procps.spec
View File

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