From f70ac4c2919b01dffa99df9d7bf8f23262e4019b Mon Sep 17 00:00:00 2001
From: Alexey Gladkov <gladkov.alexey@gmail.com>
Date: Mon, 15 Apr 2024 18:22:30 +0200
Subject: [PATCH] Remove initlog

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
 data/bin/initlog               | 141 ---------------------------------
 data/etc/rc.d/init.d/functions |  19 ++---
 2 files changed, 10 insertions(+), 150 deletions(-)
 delete mode 100755 data/bin/initlog

diff --git a/data/bin/initlog b/data/bin/initlog
deleted file mode 100755
index cb0d4bf9..00000000
--- a/data/bin/initlog
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash -eu
-
-. shell-error
-. shell-getopt
-. shell-signal
-
-message_time=1
-
-show_help() {
-	cat <<EOF
-Usage: $PROG [OPTION...]
-
-Logs messages and events to the logfile.
-
-Options:
-   -n, --name=STRING         name of service being logged;
-   -s, --string=STRING       string to log;
-   -c, --cmd=STRING          command to run, logging output;
-   -e, --event=INT           event being logged (see man page);
-   -f, --facility=STRING     facility to log at (default: 'local7');
-   -p, --priority=STRING     priority to log at (default: 'notice');
-   -h, --help                show this text and exit.
-
-Report bugs to http://bugzilla.altlinux.org/
-
-EOF
-	exit
-}
-
-workdir=
-cleanup_handler() {
-	[ -z "$workdir" ] || rm -rf -- "$workdir"
-}
-
-prefix=
-logEvent() {
-	local fmt cmdname cmdevent logstring
-
-	cmdname="$1"; shift
-	cmdevent="$1"; shift
-	logstring="$1"; shift
-
-	case "$cmdevent" in
-		0) fmt="%s babbles incoherently" ;;
-		1) fmt="%s succeeded" ;;
-		2) fmt="%s failed" ;;
-		3) fmt="%s cancelled at user request" ;;
-		4) fmt="%s failed due to a failed dependency" ;;
-		*) fmt="%s" ;;
-	esac
-	# shellcheck disable=SC2059
-	printf "$fmt\\n" "${prefix}$cmdname: $logstring"
-	exit
-}
-
-logString() {
-	printf '%s\n' "$1: $2"
-	exit
-}
-
-runCommand() {
-	local line ret cmdname cmd
-
-	cmdname="$1"; shift
-	cmd="$1"; shift
-	{
-		ret=0
-		$cmd || ret=$?
-		echo "$ret" >"$workdir/ret"
-		echo
-	} 2>&1 |
-	while [ ! -f "$workdir/ret" ]; do
-		eof=
-		read -r line || eof=1
-		[ -z "$line" ] || printf '%s: %s\n' "$cmdname" "$line"
-		[ -z "$eof" ] || break
-	done
-	read -r ret < "$workdir/ret"
-	exit $ret
-}
-
-TEMP=`getopt -n "$PROG" -o 'c:,e:,f:,l:,n:,p:,s:,h,q' -l 'cmd:,event:,facility:,log:,name:,priority:,string:,help,quiet' -- "$@"` ||
-	show_usage
-eval set -- "$TEMP"
-
-logfile="${INITLOG_FILE:-/tmp/$PROG.log}"
-cmd=
-cmdevent=
-cmdname=
-logstring=
-facility='local7'
-priority='notice'
-while :; do
-	case "$1" in
-		-l|--log)       shift; logfile="$1";   ;;
-		-c|--cmd)       shift; cmd="$1";       ;;
-		-n|--name)      shift; cmdname="$1";   ;;
-		-e|--event)     shift; cmdevent="$1";  ;;
-		-f|--facility)  shift; facility="$1";  ;;
-		-p| --priority) shift; priority="$1";  ;;
-		-s|--string)    shift; logstring="$1"; ;;
-		-h|--help)
-			show_help
-			;;
-		-q|--quiet)
-			;;
-		--) shift; break
-			;;
-	esac
-	shift
-done
-
-[ -n "$cmd" ] && [ -n "$logstring" ] &&
-	fatal "--cmd and --run are incompatible with --string" ||:
-
-[ -n "$cmdname" ] && [ -z "$logstring" ] && [ -z "$cmdevent" ] && [ -z "$cmd" ] &&
-	fatal "--name requires one of --event, --string or --cmd" ||:
-
-[ -n "$cmdevent" ] && [ -z "$cmdname" ] && [ -z "$logstring" ] &&
-	fatal "--event requires one of --cmdname or --logstring" ||:
-
-[ -z "$message_time" ] ||
-	prefix="$(date +"${message_time_format:-[%Y-%m-%d %T]} " 2>/dev/null)" ||:
-
-cmdname="${cmdname##*/}"
-[ -n "$cmdname" ] ||
-	cmdname='(none)'
-
-[ -z "$cmdevent" ] ||
-	logEvent "$cmdname" "$cmdevent" "$logstring" >>"$logfile" 2>&1
-
-[ -z "$logstring" ] ||
-	logString "$cmdname" "$logstring" >>"$logfile" 2>&1
-
-[ -z "$cmd" ] || {
-	set_cleanup_handler cleanup_handler
-	workdir="$(mktemp -dt "$PROG.XXXXXXXXXX")"
-	runCommand "$cmdname" "$cmd" >>"$logfile" 2>&1
-}
-
-message "nothing to do"
diff --git a/data/etc/rc.d/init.d/functions b/data/etc/rc.d/init.d/functions
index dfaf2cd3..0764ae63 100644
--- a/data/etc/rc.d/init.d/functions
+++ b/data/etc/rc.d/init.d/functions
@@ -9,6 +9,7 @@
 # Set the initial default search path for use by startup scripts.
 export PATH="/sbin:/usr/sbin:/usr/local/sbin:/lib/initrd/bin:/bin:/usr/bin:/usr/local/bin"
 
+. shell-error
 . shell-var
 
 SourceIfExists()     { [ -f "$1" ] && . "$@"; }
@@ -17,6 +18,7 @@ SourceIfNotEmpty()   { [ -s "$1" ] && . "$@"; }
 ExecIfExecutable()   { [ -x "$1" ] && "$@"; }
 absolute() { { command -v "$@"; } 2>/dev/null; }
 
+message_time=1
 SHOW_TIMESTAMP=1
 QUIET=no
 LANG=C
@@ -43,10 +45,6 @@ CONSOLETYPE=$(absolute consoletype) && [ "$($CONSOLETYPE)" = serial ] &&
 [ "$BOOTUP" != color ] ||
 	SourceIfNotEmpty /etc/init.d/outformat
 
-INITLOG=initlog
-INITLOG_ARGS=
-[ "${BOOTUP-}" = verbose ] || INITLOG_ARGS="-q"
-
 [ "${LOGLEVEL:--1}" -ge 0 ] 2>/dev/null ||
 	LOGLEVEL=1
 
@@ -156,7 +154,7 @@ start_daemon()
 	[ -z "$ANNOUNCE" ] || msg_starting "$DISPNAME"
 
 	# Actually start the daemon.
-	$INITLOG $INITLOG_ARGS -n "service: $BASENAME" -c "start-stop-daemon $FLAGS -- $*"
+	start-stop-daemon $FLAGS -- "$@"
 	STATUS=$?
 
 	if [ $STATUS = 0 ]; then
@@ -444,7 +442,8 @@ echo_passed()
 # Log that something succeeded
 success()
 {
-	$INITLOG $INITLOG_ARGS -n "service: $0" -s "$1" -e 1
+	[ -z "${INITLOG_FILE-}" ] ||
+		message "$1 succeeded" >"$INITLOG_FILE"
 	[ "${RDLOG-}" != 'console' ] ||
 		return 0
 	echo_success
@@ -456,7 +455,8 @@ success()
 failure()
 {
 	local rc=$?
-	$INITLOG $INITLOG_ARGS -n "service: $0" -s "$1" -e 2
+	[ -z "${INITLOG_FILE-}" ] ||
+		message "$1 failed" >"$INITLOG_FILE"
 	[ "${RDLOG-}" != 'console' ] ||
 		return $rc
 	echo_failure
@@ -468,7 +468,8 @@ failure()
 passed()
 {
 	local rc=$?
-	$INITLOG $INITLOG_ARGS -n "service: $0" -s "$1" -e 1
+	[ -z "${INITLOG_FILE-}" ] ||
+		message "$1 passed" >"$INITLOG_FILE"
 	[ "${RDLOG-}" != 'console' ] ||
 		return $rc
 	echo_passed
@@ -483,7 +484,7 @@ action()
 	STRING="$1"
 	shift
 	[ "${RDLOG-}" = 'console' ] || echo_msg "$STRING"
-	$INITLOG $INITLOG_ARGS -c "$*"
+	"$@"
 	rc=$?
 	[ $rc -eq 0 ] && success "$STRING" || failure "$STRING"
 	return $rc