From 04ce4db830b600ac41499fc6bcec2887c993e931 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Thu, 26 Nov 2009 19:55:22 +0300 Subject: [PATCH] vmstat: do not scale si/so just like bi/bo Use strtoull insteadof strtoul for some counters. A patch from Debian. Bug-Debian: http://bugs.debian.org/558361 Bug-Debian: http://bugs.debian.org/558134 Backported-by: Sami Kerola --- proc/sysinfo.c | 2 +- vmstat.8 | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/proc/sysinfo.c b/proc/sysinfo.c index 5d17cefa..1d7b797e 100644 --- a/proc/sysinfo.c +++ b/proc/sysinfo.c @@ -647,7 +647,7 @@ void meminfo(void){ ); head = tail+1; if(!found) goto nextline; - *(found->slot) = strtoul(head,&tail,10); + *(found->slot) = (unsigned long)strtoull(head,&tail,10); nextline: tail = strchr(head, '\n'); if(!tail) break; diff --git a/vmstat.8 b/vmstat.8 index 127704da..499cf4e4 100644 --- a/vmstat.8 +++ b/vmstat.8 @@ -67,7 +67,9 @@ The \fB-D\fP reports some summary statistics about disk activity. .PP The \fB\-p\fP followed by some partition name for detailed statistics (2.5.70 or above required) .PP -The \fB\-S\fP followed by k or K or m or M switches outputs between 1000, 1024, 1000000, or 1048576 bytes +The \fB\-S\fP followed by k or K or m or M switches outputs between +1000, 1024, 1000000, or 1048576 bytes. Note this does not change the +swap (si/so) or block (bi/bo) fields. .PP The \fB\-V\fP switch results in displaying version information. .PP