From 82cb7d701292569b9cb87bd4946a67945ce7743d Mon Sep 17 00:00:00 2001
From: Denis Knauf <mkv5bu@sweb1.mobilkom.at>
Date: Mon, 30 Jul 2012 12:02:42 +0200
Subject: [PATCH] solaris-compatibility-fixes.

---
 Makefile    |  3 ++-
 logarchiver |  2 +-
 logcleaner  |  3 +++
 logmanager  | 10 +++++-----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 0f37259..5338819 100644
--- a/Makefile
+++ b/Makefile
@@ -20,10 +20,11 @@ testdir/.lmtab: testdir
 
 testdir/.prepare: testdir testdir/.lmtab
 	touch $</aaaaaaaaaaaaa.log
-	for f in `seq 1 10` ; do touch $</"logfile-$$f-`date +%Y%m%d%H%M%S`.log" || exit 1 ; done
+	for f in 1 2 3 4 5 6 7 8 9 10 ; do touch $</"logfile-$$f-`date +%Y%m%d%H%M%S`.log" || exit 1 ; done
 	touch $</no_log
 	touch $</no.log.txt
 	touch $@
+.PHONY: testdir/.prepare
 
 test: testdir/.prepare testdir/.lmtab
 	cd testdir ; ../logmanager -nc .lmtab
diff --git a/logarchiver b/logarchiver
index 4e6ba96..155ac11 100755
--- a/logarchiver
+++ b/logarchiver
@@ -28,7 +28,7 @@ do
 done
 shift `expr $OPTIND - 1`
 
-if ! [ 0 -lt $# ]
+if [ 0 -ge $# ]
 then
 	echo "Error: DIR expected"
 	help
diff --git a/logcleaner b/logcleaner
index 6667f7a..8d631a2 100755
--- a/logcleaner
+++ b/logcleaner
@@ -22,6 +22,9 @@ do
 	a) a="$OPTARG" ; shift ;;
 	i) i=-i ;;
 	n) n=echo ;;
+	*) echo "Unknown Option: $o" >&2
+		help
+		;;
 	esac
 done
 shift `expr $OPTIND - 1`
diff --git a/logmanager b/logmanager
index cb529e7..5918359 100755
--- a/logmanager
+++ b/logmanager
@@ -20,9 +20,9 @@ EOF
 }
 
 with_n() {
-	local cmd=$1
+	__cmd=$1
 	shift
-	"$cmd" -n "$@"
+	"$__cmd" -n "$@"
 }
 
 while getopts hc:a:r:z:C:nN o
@@ -71,8 +71,8 @@ do
 	do
 		e="`basename "${exp}"`"
 		exp="`dirname "${exp}"`"
-		$cmd $archiver -e "$e" "$dir"
+		$cmd $archiver -e "$e" -- "$dir"
 	done
-	$cmd $compressor "$dir"
-	[ 0 = "$age" ] || $cmd $cleaner "$age" "$dir"
+	$cmd $compressor -- "$dir"
+	[ 0 = "$age" ] || $cmd $cleaner "$age" -- "$dir"
 done