From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Oct 2014 23:48:04 +0000 (+0000)
Subject: Tolerate lack of ac_minflt and ac_majflt (and use %lu as is right).
X-Git-Tag: debian/4.4.1~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=51b1ba5e732a7d7245ed567004e88d36acc01c32;hp=a2dd98f3f51c34d2d85a139f1fcaaf76a10fdd10

Tolerate lack of ac_minflt and ac_majflt (and use %lu as is right).
---

diff --git a/cprogs/acctdump.c b/cprogs/acctdump.c
index 7139922..35acfb3 100644
--- a/cprogs/acctdump.c
+++ b/cprogs/acctdump.c
@@ -43,6 +43,7 @@ typedef unsigned long long u64;
 
 typedef struct acct_v3 struct_acct;
 #define HAVE_AC_EXITCODE
+#define HAVE_AC_FLT
 
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
@@ -177,8 +178,11 @@ static void printbanner(void) {
 	  , stdout);
   }
   if (usages) {
-    fputs("  user time   sys time  elap time   minflt   maxflt",
-	  stdout);
+    fputs("  user time   sys time  elap time "
+#ifdef HAVE_AC_FLT
+	  "  minflt   maxflt"
+#endif
+	  , stdout);
   }
   putchar('\n');
   checkstdout();
@@ -289,12 +293,15 @@ static void printrecord(const struct_acct *as, const char *filename) {
 #endif /*HAVE_AC_EXITCODE*/
 
   if (usages) {
-    printf(" %10lu %10lu %10lu %8ld %8ld",
+    printf(" %10lu %10lu %10lu",
 	   (unsigned long)as->ac_utime,
 	   (unsigned long)as->ac_stime,
-	   (unsigned long)as->ac_etime,
+	   (unsigned long)as->ac_etime);
+#ifdef HAVE_AC_FLT
+    printf(" %8lu %8lu",
 	   (unsigned long)as->ac_minflt,
 	   (unsigned long)as->ac_majflt);
+#endif
   }
   putchar('\n');
 
diff --git a/debian/changelog b/debian/changelog
index 9350f09..644c984 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ chiark-utils (4.4.1) unstable; urgency=low
   * Use different struct acct, and different headers, on different
     platforms.
   * Tolerate lack of ac_exitcode.
+  * Tolerate lack of ac_minflt and ac_majflt (and use %lu as is right).
 
  --