makefs: Remove redundant 'stampst' checks in several backends

[bnovkov]

Summary

PR: 285630
Sponsored by: Klara, Inc.
Sponsored by: The FreeBSD Foundation

[jlduran]

This would break the test case mentioned in D49492, where makefs ignores the time in the mtree file.
If this is the desired behavior, the test should be updated accordingly.

usr.sbin/makefs/ffs.c

 accounting_file="/var/account/acct"
 
 extra_commands="rotate_log"
 
 start_cmd="accounting_start"
 stop_cmd="accounting_stop"
 rotate_log_cmd="accounting_rotate_log"
 
+create_accounting_file()
+{
+        install -o root -g wheel -m 0640 /dev/null "${accounting_file}"
+}
+
 accounting_start()
 {
         local _dir
 
         _dir="${accounting_file%/*}"
         if [ ! -d "$_dir" ]; then
-                if ! mkdir -p "$_dir"; then
+                if ! mkdir -p -m 0750 "$_dir"; then
                         err 1 "Could not create $_dir."
                 fi
         fi
 
         if [ ! -e "$accounting_file" ]; then
                 echo -n "Creating accounting file ${accounting_file}"
-                touch "$accounting_file"
+                create_accounting_file
                 echo '.'
         fi
-        chmod 644 "$accounting_file"
 
         echo "Turning on accounting."
         ${accounting_command} ${accounting_file}
 }
 
 accounting_stop()
 {
         echo "Turning off accounting."
         ${accounting_command}
 }
 
 accounting_rotate_log()
 {
-        local _dir _file
+        # Note that this function must handle being called as "onerotate_log"
+        # (by the periodic scripts) when accounting is disabled, and handle
+        # being called multiple times (by an admin making mistakes) without
+        # anything having actually rotated the old .0 file out of the way.
 
-        _dir="${accounting_file%/*}"
-        cd $_dir
+        if [ -e "${accounting_file}.0" ]; then
+                err 1 "Cannot rotate accounting log, ${accounting_file}.0 already exists."
+        fi
 
-        if checkyesno accounting_enable; then
-                _file=`mktemp newacct-XXXXX`
-                chmod 644 $_file
-                ${accounting_command} ${_dir}/${_file}
+        if [ ! -e "${accounting_file}" ]; then
+                err 1 "Cannot rotate accounting log, ${accounting_file} does not exist."
         fi
 
         mv ${accounting_file} ${accounting_file}.0
 
         if checkyesno accounting_enable; then
-                mv $_file ${accounting_file}
+                create_accounting_file
+                ${accounting_command} "${accounting_file}"
         fi
 }
 
 load_rc_config $name
 run_rc_command "$1"

usr.sbin/makefs/msdos.c

 accounting_file="/var/account/acct"
 
 extra_commands="rotate_log"
 
 start_cmd="accounting_start"
 stop_cmd="accounting_stop"
 rotate_log_cmd="accounting_rotate_log"
 
+create_accounting_file()
+{
+        install -o root -g wheel -m 0640 /dev/null "${accounting_file}"
+}
+
 accounting_start()
 {
         local _dir
 
         _dir="${accounting_file%/*}"
         if [ ! -d "$_dir" ]; then
-                if ! mkdir -p "$_dir"; then
+                if ! mkdir -p -m 0750 "$_dir"; then
                         err 1 "Could not create $_dir."
                 fi
         fi
 
         if [ ! -e "$accounting_file" ]; then
                 echo -n "Creating accounting file ${accounting_file}"
-                touch "$accounting_file"
+                create_accounting_file
                 echo '.'
         fi
-        chmod 644 "$accounting_file"
 
         echo "Turning on accounting."
         ${accounting_command} ${accounting_file}
 }
 
 accounting_stop()
 {
         echo "Turning off accounting."
         ${accounting_command}
 }
 
 accounting_rotate_log()
 {
-        local _dir _file
+        # Note that this function must handle being called as "onerotate_log"
+        # (by the periodic scripts) when accounting is disabled, and handle
+        # being called multiple times (by an admin making mistakes) without
+        # anything having actually rotated the old .0 file out of the way.
 
-        _dir="${accounting_file%/*}"
-        cd $_dir
+        if [ -e "${accounting_file}.0" ]; then
+                err 1 "Cannot rotate accounting log, ${accounting_file}.0 already exists."
+        fi
 
-        if checkyesno accounting_enable; then
-                _file=`mktemp newacct-XXXXX`
-                chmod 644 $_file
-                ${accounting_command} ${_dir}/${_file}
+        if [ ! -e "${accounting_file}" ]; then
+                err 1 "Cannot rotate accounting log, ${accounting_file} does not exist."
         fi
 
         mv ${accounting_file} ${accounting_file}.0
 
         if checkyesno accounting_enable; then
-                mv $_file ${accounting_file}
+                create_accounting_file
+                ${accounting_command} "${accounting_file}"
         fi
 }
 
 load_rc_config $name
 run_rc_command "$1"

usr.sbin/makefs/msdos/msdosfs_vnops.c

 accounting_file="/var/account/acct"
 
 extra_commands="rotate_log"
 
 start_cmd="accounting_start"
 stop_cmd="accounting_stop"
 rotate_log_cmd="accounting_rotate_log"
 
+create_accounting_file()
+{
+        install -o root -g wheel -m 0640 /dev/null "${accounting_file}"
+}
+
 accounting_start()
 {
         local _dir
 
         _dir="${accounting_file%/*}"
         if [ ! -d "$_dir" ]; then
-                if ! mkdir -p "$_dir"; then
+                if ! mkdir -p -m 0750 "$_dir"; then
                         err 1 "Could not create $_dir."
                 fi
         fi
 
         if [ ! -e "$accounting_file" ]; then
                 echo -n "Creating accounting file ${accounting_file}"
-                touch "$accounting_file"
+                create_accounting_file
                 echo '.'
         fi
-        chmod 644 "$accounting_file"
 
         echo "Turning on accounting."
         ${accounting_command} ${accounting_file}
 }
 
 accounting_stop()
 {
         echo "Turning off accounting."
         ${accounting_command}
 }
 
 accounting_rotate_log()
 {
-        local _dir _file
+        # Note that this function must handle being called as "onerotate_log"
+        # (by the periodic scripts) when accounting is disabled, and handle
+        # being called multiple times (by an admin making mistakes) without
+        # anything having actually rotated the old .0 file out of the way.
 
-        _dir="${accounting_file%/*}"
-        cd $_dir
+        if [ -e "${accounting_file}.0" ]; then
+                err 1 "Cannot rotate accounting log, ${accounting_file}.0 already exists."
+        fi
 
-        if checkyesno accounting_enable; then
-                _file=`mktemp newacct-XXXXX`
-                chmod 644 $_file
-                ${accounting_command} ${_dir}/${_file}
+        if [ ! -e "${accounting_file}" ]; then
+                err 1 "Cannot rotate accounting log, ${accounting_file} does not exist."
         fi
 
         mv ${accounting_file} ${accounting_file}.0
 
         if checkyesno accounting_enable; then
-                mv $_file ${accounting_file}
+                create_accounting_file
+                ${accounting_command} "${accounting_file}"
         fi
 }
 
 load_rc_config $name
 run_rc_command "$1"