sar/sadc: Dereference nr array pointer in struct activity

[sysstat] / sa1.in

diff --git a/sa1.in b/sa1.in
index 86f06853c1ea4a5b35764203061196dda16b0429..3ae2e3bc41558b6596d1120c36d0ff566380bc70 100644 (file)
--- a/sa1.in
+++ b/sa1.in
@@ -1,55 +1,63 @@
 #!/bin/sh
 # @SA_LIB_DIR@/sa1
-# (C) 1999-2014 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=""
-DDIR=@SA_DIR@
-DATE=`date +%d`
-CURRENTFILE=sa${DATE}
-CURRENTDIR=`date +%Y%m`
+SA_DIR=@SA_DIR@
 SYSCONFIG_DIR=@SYSCONFIG_DIR@
-umask 0022
+SYSCONFIG_FILE=@SYSCONFIG_FILE@
+UMASK=0022
+LONG_NAME=n
+
+[ -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@
 
-[ -r ${SYSCONFIG_DIR}/sysstat ] && . ${SYSCONFIG_DIR}/sysstat
 if [ ${HISTORY} -gt 28 ]
 then
-       cd ${DDIR} || exit 1
-       [ -d ${CURRENTDIR} ] || mkdir -p ${CURRENTDIR}
-       # If ${CURRENTFILE} exists and is a regular file, then make sure
-               # the file was modified this day (and not e.g. month ago)
-       # and move it to ${CURRENTDIR}
-       [ ! -L ${CURRENTFILE} ] &&
-               [ -f ${CURRENTFILE} ] &&
-               [ "`date +%Y%m%d -r ${CURRENTFILE}`" = "${CURRENTDIR}${DATE}" ] &&
-               mv -f ${CURRENTFILE} ${CURRENTDIR}/${CURRENTFILE}
-       touch ${CURRENTDIR}/${CURRENTFILE}
-       # Remove the "compatibility" link and recreate it to point to
-       # the (new) current file
-       rm -f ${CURRENTFILE}
-       ln -s ${CURRENTDIR}/${CURRENTFILE} ${CURRENTFILE}
-else
-       # If ${CURRENTFILE} exists, is a regular file and is from a previous
-       # month then delete it so that it is recreated by sadc afresh
-       [ -f ${CURRENTFILE} ] && [ "`date +%Y%m -r ${CURRENTFILE}`" -lt "${CURRENTDIR}" ] && rm -f ${CURRENTFILE}
+       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...
-       exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 -
+# 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} $* -
+       exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* ${SA_DIR}
 fi
-