- update to 1.10

Changed files:
    atop-acct-alpha.patch -> 1.3

diff --git a/atop-acct-alpha.patch b/atop-acct-alpha.patch
index d2081f353efcee373d2f9c4e73a8dc93b3580bc2..ad3ab46adf2102ef815ac65c9e10dc294cb93710 100644 (file)
--- a/atop-acct-alpha.patch
+++ b/atop-acct-alpha.patch
@@ -1,33 +1,26 @@
-diff -durN atop-1.6.orig/acctproc.c atop-1.6/acctproc.c
---- atop-1.6.orig/acctproc.c   Tue Sep  3 10:03:33 2002
-+++ atop-1.6/acctproc.c        Tue Sep 17 14:17:57 2002
-@@ -55,6 +55,7 @@
- 
- #include <sys/types.h>
- #include <stdio.h>
-+#include <string.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <unistd.h>
-@@ -76,7 +77,11 @@
- static        uint    acctsize;       /* previous size of account file          */
+diff -ur atop-1.10.orig/acctproc.c atop-1.10/acctproc.c
+--- atop-1.10.orig/acctproc.c  2003-07-16 02:03:08.000000000 +0200
++++ atop-1.10/acctproc.c       2003-07-16 02:08:24.000000000 +0200
+@@ -98,7 +98,11 @@
+ static        off_t   acctsize;       /* previous size of account file          */
  int                   acctfd   = -1;  /* fd of account file                     */
  
+-static count_t        acctexp(comp_t ct);
 +#ifdef __alpha__
-+static long   acctexp(time_t ct);
++static count_t        acctexp(time_t ct);
 +#else
- static long   acctexp(comp_t ct);
++static count_t        acctexp(comp_t ct);
 +#endif
  
  /*
  ** Semaphore-handling
-@@ -419,8 +424,13 @@
+@@ -439,8 +443,13 @@
                api->cpu.utime  = acctexp(acctrec.ac_utime);
                api->mem.minflt = acctexp(acctrec.ac_minflt);
                api->mem.majflt = acctexp(acctrec.ac_majflt);
 +#ifdef __alpha
-+              api->mem.iosw   = 0;
-+              api->dsk.ior    = 0;
++              api->mem.iosw   = 0;
++              api->dsk.ior    = 0;
 +#else
                api->mem.iosw   = acctexp(acctrec.ac_swaps);
                api->dsk.ior    = acctexp(acctrec.ac_rw);
@@ -35,17 +28,18 @@ diff -durN atop-1.6.orig/acctproc.c atop-1.6/acctproc.c
  
                strcpy(api->gen.name, acctrec.ac_comm);
        }
-@@ -433,8 +443,13 @@
+@@ -453,8 +462,13 @@
  /*
  ** expand the special compression-method
  */
 +#ifdef __alpha
-+long
++static count_t
 +acctexp(time_t ct)
 +#else
- long
+ static count_t
  acctexp(comp_t ct)
 +#endif
  {
-         register long e;
-         register long f;
+         count_t       exp;
+         count_t val;
+Tylko w atop-1.10: acctproc.c~