3.1.11
This commit is contained in:
parent
0db94e6a1a
commit
45764fb735
6
Makefile
6
Makefile
@ -18,9 +18,9 @@
|
||||
|
||||
VERSION := 3
|
||||
SUBVERSION := 1
|
||||
MINORVERSION := 10
|
||||
TARVERSION := 3.1.10
|
||||
LIBVERSION := 3.1.10
|
||||
MINORVERSION := 11
|
||||
TARVERSION := 3.1.11
|
||||
LIBVERSION := 3.1.11
|
||||
|
||||
############ vars
|
||||
|
||||
|
4
NEWS
4
NEWS
@ -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
|
||||
|
||||
handle GPLONLY_ symbols #143549 #188374
|
||||
|
@ -673,15 +673,16 @@ static unsigned int getFileLines(const char* szFile){
|
||||
|
||||
unsigned int getdiskstat(struct disk_stat **disks, struct partition_stat **partitions){
|
||||
FILE* fd;
|
||||
buff[BUFFSIZE-1] = 0;
|
||||
int units,
|
||||
i,
|
||||
disk_type,
|
||||
disk_num,
|
||||
cDisk=0,
|
||||
cPartition=0;
|
||||
|
||||
*disks = NULL;
|
||||
*partitions = NULL;
|
||||
buff[BUFFSIZE-1] = 0;
|
||||
units = getFileLines("/proc/diskstats");
|
||||
fd = fopen("/proc/diskstats", "rb");
|
||||
if(!fd) crash("/proc/diskstats");
|
||||
@ -760,7 +761,7 @@ unsigned int getslabinfo (struct slab_cache **slab){
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
unsigned get_pid_digits(void){
|
||||
char buf[24];
|
||||
char pidbuf[24];
|
||||
char *endp;
|
||||
long rc;
|
||||
int fd;
|
||||
@ -770,11 +771,11 @@ unsigned get_pid_digits(void){
|
||||
ret = 5;
|
||||
fd = open("/proc/sys/kernel/pid_max", O_RDONLY);
|
||||
if(fd==-1) goto out;
|
||||
rc = read(fd, buf, sizeof buf);
|
||||
rc = read(fd, pidbuf, sizeof pidbuf);
|
||||
close(fd);
|
||||
if(rc<3) goto out;
|
||||
buf[rc] = '\0';
|
||||
rc = strtol(buf,&endp,10);
|
||||
pidbuf[rc] = '\0';
|
||||
rc = strtol(pidbuf,&endp,10);
|
||||
if(rc<42) goto out;
|
||||
if(*endp && *endp!='\n') goto out;
|
||||
rc--; // the pid_max value is really the max PID plus 1
|
||||
|
@ -1,15 +1,15 @@
|
||||
Begin4
|
||||
Title: procps
|
||||
Version: 3.1.10
|
||||
Entered-date: 2003-06-08
|
||||
Version: 3.1.11
|
||||
Entered-date: 2003-07-14
|
||||
Description: Linux system utilities
|
||||
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.10.tar.gz
|
||||
242kB procps-3.1.11.tar.gz
|
||||
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
|
||||
End
|
||||
|
@ -3,7 +3,7 @@ Summary: System and process monitoring utilities
|
||||
Name: procps
|
||||
%define major_version 3
|
||||
%define minor_version 1
|
||||
%define revision 10
|
||||
%define revision 11
|
||||
%define version %{major_version}.%{minor_version}.%{revision}
|
||||
Version: %{version}
|
||||
Release: 1
|
||||
|
Loading…
Reference in New Issue
Block a user