Tolerate variation in ac_flag field name, and, to an extent, value.

diff --git a/cprogs/acctdump.c b/cprogs/acctdump.c
index 35acfb3e4cad8727794876af93fb14a27bf63a2f..77e1896f253ad8bbd78032e161eba20e029c4bb3 100644 (file)
--- a/cprogs/acctdump.c
+++ b/cprogs/acctdump.c
@@ -44,6 +44,7 @@ typedef unsigned long long u64;
 typedef struct acct_v3 struct_acct;
 #define HAVE_AC_EXITCODE
 #define HAVE_AC_FLT
+#define FIELD_AC_FLAG(as) ((as)->ac_flag)
 
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 
@@ -52,6 +53,7 @@ typedef struct acct_v3 struct_acct;
 #include <sys/acct.h>
 
 typedef struct acctv2 struct_acct;
+#define FIELD_AC_FLAG(as) ((as)->ac_flagx & ~ANVER)
 
 #else
 
@@ -245,7 +247,7 @@ static void printrecord(const struct_acct *as, const char *filename) {
     }
   }
 
-  r= as->ac_flag;
+  r= FIELD_AC_FLAG(as);
   for (i=1, fp= "FS4DX"; *fp; fp++, i<<=1) {
     if (r&i) {
       putchar(*fp);

diff --git a/debian/changelog b/debian/changelog
index 644c9845db8b4716d8c2f827673e741c73d04929..58d6224b69853da079cee517e36b4cbfca0633c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ chiark-utils (4.4.1) unstable; urgency=low
     platforms.
   * Tolerate lack of ac_exitcode.
   * Tolerate lack of ac_minflt and ac_majflt (and use %lu as is right).
+  * Tolerate variation in ac_flag field name, and, to an extent, value.
 
  --