Add support ATOPACCTDIR env variable

Now we can set custom process accounting directory via env
variable ATOPACCTDIR instead of ACCTDIR constant.

Author: mrqwer88

acctproc.c

@@ -134,9 +134,12 @@
 #include "atopacctd.h"
 
 #define	ACCTDIR		"/var/cache/atop.d"
+#define	ACCTDIRENV	"ATOPACCTDIR"
 #define	ACCTFILE	"atop.acct"
 #define	ACCTENV		"ATOPACCT"
 
+static	char	*acctdir = ACCTDIR;
+
 static	char 	acctatop;	/* boolean: atop's own accounting busy ?  */
 static	off_t	acctsize;	/* previous size of account file	  */
 static	int	acctrecsz;	/* size of account record		  */
@@ -246,6 +249,19 @@ acctswon(void)
 		}
 	}
 
+	/*
+	** when a particular environment variable is present, atop should
+	** use a specific directory for accounting-file (as defined by the environment
+	** variable)
+	*/
+	if ( (ep = getenv(ACCTDIRENV)) && *ep)
+	{
+		acctdir = ep;
+	}
+
+	char acctfilepath[128];
+	snprintf(acctfilepath, sizeof acctfilepath, "%s/%s", acctdir, ACCTFILE);
+
 	/*
  	** when the atopacctd daemon is active on this system,
 	** it should be the preferred way to read the accounting records
@@ -420,16 +436,16 @@ acctswon(void)
 		** if this directory exists (e.g. previous atop-run killed)
 		** it will be cleaned and newly created
 		*/
-		if ( mkdir(ACCTDIR, 0700) == -1)
+		if ( mkdir(acctdir, 0700) == -1)
 		{
 			if (errno == EEXIST)
 			{
 				(void) acct(0);
-				(void) unlink(ACCTDIR "/" ACCTFILE);
-				(void) rmdir(ACCTDIR);
+				(void) unlink(acctfilepath);
+				(void) rmdir(acctdir);
 			}
 
-			if ( mkdir(ACCTDIR, 0700) == -1)
+			if ( mkdir(acctdir, 0700) == -1)
 			{
 				/*
 				** persistent failure
@@ -438,19 +454,18 @@ acctswon(void)
 				return 4;
 			}
 		}
-
 		/*
 		** create accounting file in new directory
 		*/
-		(void) close( creat(ACCTDIR "/" ACCTFILE, 0600) );
+		(void) close( creat( acctfilepath, 0600) );
 
 		/*
 		** switch on accounting
 		*/
-		if ( acct(ACCTDIR "/" ACCTFILE) < 0)
+		if ( acct( acctfilepath ) < 0)
 		{
-			(void) unlink(ACCTDIR "/" ACCTFILE);
-			(void) rmdir(ACCTDIR);
+			(void) unlink(acctfilepath);
+			(void) rmdir(acctdir);
 			(void) semop(sematopid, &semrelse, 1);
 
 			return 5;
@@ -461,11 +476,11 @@ acctswon(void)
 	** accounting is switched on now;
 	** open accounting-file
 	*/
-	if ( (acctfd = open(ACCTDIR "/" ACCTFILE, O_RDONLY) ) < 0)
+	if ( (acctfd = open(acctfilepath, O_RDONLY) ) < 0)
 	{
 		(void) acct(0);
-		(void) unlink(ACCTDIR "/" ACCTFILE);
-		(void) rmdir(ACCTDIR);
+		(void) unlink(acctfilepath);
+		(void) rmdir(acctdir);
 
 		(void) semop(sematopid, &semrelse, 1);
 		return 1;
@@ -486,8 +501,8 @@ acctswon(void)
 	{
 		(void) acct(0);
 		(void) close(acctfd);
-		(void) unlink(ACCTDIR "/" ACCTFILE);
-		(void) rmdir(ACCTDIR);
+		(void) unlink(acctfilepath);
+		(void) rmdir(acctdir);
 
 		acctfd = -1;
 		return 1;
@@ -509,8 +524,8 @@ acctswon(void)
 	{
 		(void) acct(0);
 		(void) close(acctfd);
-		(void) unlink(ACCTDIR "/" ACCTFILE);
-		(void) rmdir(ACCTDIR);
+		(void) unlink(acctfilepath);
+		(void) rmdir(acctdir);
 
 		acctfd = -1;
 		return 1;
@@ -621,14 +636,24 @@ acctswoff(void)
 
 			if (after.st_size > before.st_size)
 			{
+
+				char *ep;
+				if ( (ep = getenv(ACCTDIRENV)) && *ep)
+				{
+					acctdir = ep;
+				}
+
+				char acctfilepath[128];
+				snprintf(acctfilepath, sizeof acctfilepath, "%s/%s", acctdir, ACCTFILE);
+
 				/*
 				** remove the directory and file
 				*/
 				regainrootprivs(); /* get root privs again */
 
 				(void) acct(0);
-				(void) unlink(ACCTDIR "/" ACCTFILE);
-				(void) rmdir(ACCTDIR);
+				(void) unlink(acctfilepath);
+				(void) rmdir(acctdir);
 
 				if (! droprootprivs() )
 					cleanstop(42);
@@ -965,10 +990,24 @@ acctrestarttrial()
 
 	(void) acct(0);		// switch off accounting
 
-	if ( truncate(ACCTDIR "/" ACCTFILE, 0) == 0)
+	/*
+	** when a particular environment variable is present, atop should
+	** use a specific directory for accounting-file (as defined by the environment
+	** variable)
+	*/
+	char *ep;
+	if ( (ep = getenv(ACCTDIRENV)) && *ep)
+	{
+		acctdir = ep;
+	}
+
+	char acctfilepath[128];
+	snprintf(acctfilepath, sizeof acctfilepath, "%s/%s", acctdir, ACCTFILE);
+
+	if ( truncate(acctfilepath, 0) == 0)
 		(void) lseek(acctfd, 0, SEEK_SET);
 
-	(void) acct(ACCTDIR "/" ACCTFILE);
+	(void) acct(acctfilepath);
 
 	if (! droprootprivs() )
 		cleanstop(42);

man/atop.1

@@ -223,6 +223,10 @@ will never read more than 50 MiB with process information from the
 process accounting file per interval (approx. 70000 finished processes).
 In interactive mode a warning is given whenever processes have been skipped
 for this reason.
+
+When the environment variable ATOPACCTDIR set and not empty, it specifies directory for process accounting file instead of 
+.I /var/cache/atop.d
+which set by default.
 .PP
 .SH COLORS
 For the resource consumption on system level,