File acct-6.3.5-axp.dif of Package acct

--- accton.c
+++ accton.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>
--- sa.c
+++ sa.c
@@ -1158,27 +1158,17 @@
 
       if (print_users)
 	{
-	  printf ("%-8.8s"
+	  printf ("%-8.8s", uid_name (rec->ac_uid));
 #if defined(HAVE_ACUTIME) && defined(HAVE_ACSTIME)
-		  " %6.2f cpu"
+	  printf (" %6.2f cpu", ut + st);
 #endif
 #if defined(HAVE_ACMEM)
-		  " %8.0fk mem"
+	  printf (" %8.0fk mem", mu);
 #endif
 #ifdef HAVE_ACIO
-		  " %6.0f io"
-#endif
-		  " %-*.*s%s\n",
-		  uid_name (rec->ac_uid),
-#if defined(HAVE_ACUTIME) && defined(HAVE_ACSTIME)
-		  ut + st,
-#endif
-#if defined(HAVE_ACMEM)
-		  mu,
-#endif
-#ifdef HAVE_ACIO
-		  di,
+	  printf (" %6.0f io", di);
 #endif
+	  printf (" %-*.*s%s\n",
 		  COMM_LEN, COMM_LEN, rec->ac_comm,
 		  (rec->ac_flag & AFORK) ? "*" : "");
 	}
openSUSE Build Service is sponsored by