summaryrefslogtreecommitdiff
blob: 6c83f0bb92647aa91aa3db12336721c466468e8c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
https://bugs.launchpad.net/ubuntu/+source/time/+bug/742248
https://bugs.gentoo.org/332253

--- time-1.7.2/ChangeLog
+++ time-1.7.2/ChangeLog
@@ -1,6 +1,12 @@
 Fri Dec 21 23:00:00 2012  David C Niemi <gnutime@dcn.tuxers.net>
 	* Version 1.7.1.
 
+Fri Oct  1 00:00:00 2010  Bob Proulx  <bob@proulx.com>
+	* time.c (summarize): Do not call ptok on ru_maxrss.
+	  The struct rusage reports ru_maxrss in kbytes not pages and
+	  should not be converted through pages-to-kbytes again.
+	  Reported by Sven Hartrumpf.
+
 Thu Jul 11 12:37:17 1996  David J MacKenzie  <djm@catapult.va.pubnix.com>
 
 	* Version 1.7.
--- time-1.7.2/time.c
+++ time-1.7.2/time.c
@@ -394,7 +394,7 @@
 		       ptok ((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS (v));
 	      break;
 	    case 'M':		/* Maximum resident set size.  */
-	      fprintf (fp, "%lu", ptok ((UL) resp->ru.ru_maxrss));
+	      fprintf (fp, "%lu", (UL) resp->ru.ru_maxrss);
 	      break;
 	    case 'O':		/* Outputs.  */
 	      fprintf (fp, "%ld", resp->ru.ru_oublock);