sar/sadc: Dereference nr array pointer in struct activity

[sysstat] / sa1.in

diff --git a/sa1.in b/sa1.in
index 79ed60c6f574e83d8a73f9611c06df7622f860d2..3ae2e3bc41558b6596d1120c36d0ff566380bc70 100644 (file)
--- a/sa1.in
+++ b/sa1.in
@@ -1,38 +1,62 @@
 #!/bin/sh
 # @SA_LIB_DIR@/sa1
-# (C) 1999-2019 Sebastien Godard (sysstat <at> orange.fr)
+# (C) 1999-2020 Sebastien Godard (sysstat <at> orange.fr)
 #
 #@(#) @PACKAGE_NAME@-@PACKAGE_VERSION@
 #@(#) sa1: Collect and store binary data in system activity data file.
 #
 
 # Set default value for some variables.
-# Used only if ${SYSCONFIG_DIR}/sysstat doesn't exist!
+# Used only if ${SYSCONFIG_DIR}/${SYSCONFIG_FILE} doesn't exist!
 HISTORY=0
 SADC_OPTIONS=""
 SA_DIR=@SA_DIR@
 SYSCONFIG_DIR=@SYSCONFIG_DIR@
+SYSCONFIG_FILE=@SYSCONFIG_FILE@
 UMASK=0022
+LONG_NAME=n
 
-[ -r ${SYSCONFIG_DIR}/sysstat ] && . ${SYSCONFIG_DIR}/sysstat
+[ -r ${SYSCONFIG_DIR}/${SYSCONFIG_FILE} ] && . ${SYSCONFIG_DIR}/${SYSCONFIG_FILE}
 
 umask ${UMASK}
 
+# If the user-supplied value for SA_DIR in sysconfig file is not a directory
+# then fall back on default directory. Create this default directory if it doesn't exist.
 [ -d ${SA_DIR} ] || SA_DIR=@SA_DIR@
+[ -d @SA_DIR@ ] || mkdir @SA_DIR@
 
 if [ ${HISTORY} -gt 28 ]
 then
        SADC_OPTIONS="${SADC_OPTIONS} -D"
+       LONG_NAME=y
 fi
 
 ENDIR=@SA_LIB_DIR@
 cd ${ENDIR}
 [ "$1" = "--boot" ] && shift && BOOT=y || BOOT=n
-if [ $# = 0 ] && [ "${BOOT}" = "n" ]
+[ "$1" = "--sleep" ] && shift && SLEEP=y || SLEEP=n
+
+ROTATE=n
+[ "$1" = "--rotate" ] && shift && ROTATE=y && [ "$1" = "iso" ] && shift && LONG_NAME=y
+if [ "${ROTATE}" = "y" ]
+then
+       if [ "${LONG_NAME}" = "y" ]
+       then
+               DATE=`date --date=yesterday +%Y%m%d`
+       else
+               DATE=`date --date=yesterday +%d`
+       fi
+       SA_DIR=${SA_DIR}/sa${DATE}
+fi
+
+if [ "${SLEEP}" = "y" ]
+then
+       exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} -C "LINUX SLEEP MODE ($*)" ${SA_DIR}
+elif [ $# = 0 ] && [ "${BOOT}" = "n" ]
 then
 # Note: Stats are written at the end of previous file *and* at the
 # beginning of the new one (when there is a file rotation) only if
-# outfile has been specified as '-' on the command line...
+# outfile has not been explicitly specified on the command line...
        exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 ${SA_DIR}
 else
        exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* ${SA_DIR}