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

Merge remote-tracking branch 'sami/to-craig' into sami-merge

Browse Source 
Conflicts:
	pgrep.c
	w.c
This commit is contained in:
Craig Small
2012-03-03 13:56:32 +11:00
parent cda4b65add 96e86ef1a0
commit 502a79e02f
10 changed files with 83 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vmstat.c
View File

@ -356,7 +356,7 @@ static int diskpartition_format(const char *partition_name)
struct disk_stat *disks;
struct partition_stat *partitions, *current_partition = NULL;
unsigned long ndisks, j, k, npartitions;
const char format[] = "%20u %10llu %10u %10u\n";
const char format[] = "%20u %10llu %10u %10llu\n";
fDiskstat = fopen("/proc/diskstats", "rb");
if (!fDiskstat)