creating...

diff --git a/main/bumsg.fnc b/main/bumsg.fnc
index d4c8efb..91881d3 100644 (file)
--- a/main/bumsg.fnc
+++ b/main/bumsg.fnc
@@ -58,8 +58,8 @@ LOGGER="/usr/bin/logger -t $0 -i"
 # @param $8 argument 7
 # @param $9 argument 8
 logmsg() {
-  local msgid=$1
-  local strmsg="`getmsg $1 $2 $3 $4 $5 $6 $7 $8 $9`"
+  local msgid="$1"
+  local strmsg="`getmsg \"$1\" \"$2\" \"$3\" \"$4\" \"$5\" \"$6\" \"$7\" \"$8\" \"$9\"`"
 
   ismsgEnvSysout "${msgid}"
   local issysout=$?
@@ -95,15 +95,15 @@ logmsg() {
 # @param $9 argument 8
 # @echo message text
 getmsg() {
-  local msgid=$1
-  local arg1=$2
-  local arg2=$3
-  local arg3=$4
-  local arg4=$5
-  local arg5=$6
-  local arg6=$7
-  local arg7=$8
-  local arg8=$9
+  local msgid="$1"
+  local arg1="$2"
+  local arg2="$3"
+  local arg3="$4"
+  local arg4="$5"
+  local arg5="$6"
+  local arg6="$7"
+  local arg7="$8"
+  local arg8="$9"
   local msgtextkey="`getmsgIdEnvKey ${msgid}`"
   local msgtextkeyString="`getmsgEnvValue ${msgtextkey}`"
   local printfString=""
@@ -115,8 +115,29 @@ getmsg() {
     printfString="${printfString}[${msgid}]"
   fi
   printfString="${printfString}${msgtextkeyString}"
-  local outMessage="`printf \"${printfString}\" ${arg1} ${arg2} ${arg3} ${arg4} ${arg5} ${arg6} ${arg7} ${arg8}`"
-  echo ${outMessage}
+  local outMessage=""
+
+  if [ ${#arg1} = 0 ]; then
+    outMessage="`printf \"${printfString}\"`"
+  elif [ ${#arg2} = 0 ]; then
+    outMessage="`printf \"${printfString}\" \"${arg1}\"`"
+  elif [ ${#arg3} = 0 ]; then
+    outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\"`"
+  elif [ ${#arg4} = 0 ]; then
+    outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\"`"
+  elif [ ${#arg5} = 0 ]; then
+    outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\"`"
+  elif [ ${#arg6} = 0 ]; then
+    outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\" \"${arg5}\"`"
+  elif [ ${#arg7} = 0 ]; then
+    outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\" \"${arg5}\" \"${arg6}\"`"
+  elif [ ${#arg8} = 0 ]; then
+    outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\" \"${arg5}\" \"${arg6}\" \"${arg7}\"`"
+  else
+    outMessage="`printf \"${printfString}\" \"${arg1}\" \"${arg2}\" \"${arg3}\" \"${arg4}\" \"${arg5}\" \"${arg6}\" \"${arg7}\" \"${arg8}\"`"
+  fi
+
+  echo "${outMessage}"
 
   return 0
 }
@@ -127,9 +148,9 @@ getmsg() {
 # @param $1 message id
 # @echo message id environment key
 getmsgIdEnvKey() {
-  local msgid=$1
-  local msgtextkey='${MSG_'${msgid}'}'
-  echo ${msgtextkey}
+  local msgid="$1"
+  local msgtextkey='${MSG_'"${msgid}"'}'
+  echo "${msgtextkey}"
   return 0
 }
 
@@ -139,9 +160,9 @@ getmsgIdEnvKey() {
 # @param $1 environment key
 # @echo message environment value
 getmsgEnvValue() {
-  local envkey=$1
+  local envkey="$1"
   local msgtextkeyString="`eval \"echo ${envkey}\"`"
-  echo ${msgtextkeyString}
+  echo "${msgtextkeyString}"
   return 0
 }
 
@@ -152,7 +173,7 @@ getmsgEnvValue() {
 # @return 0:true 1:false 2:unknown
 getmsgEnvBooleanValue() {
   local envkey="$1"
-  local envvalue="`getmsgEnvValue ${envkey}`"
+  local envvalue="`getmsgEnvValue \"${envkey}\"`"
   if [ "${envvalue}" = "true" ]; then
     return 0
   fi
@@ -181,8 +202,8 @@ getmsgEnvBooleanValue() {
 # @return 0:do output 1:none
 ismsgEnvSysout() {
   local msgid="$1"
-  local envkey="`getmsgIdEnvKey ${msgid}'_sysout'`"
-  getmsgEnvBooleanValue ${envkey}
+  local envkey="`getmsgIdEnvKey \"${msgid}\"'_sysout'`"
+  getmsgEnvBooleanValue "${envkey}"
   local envvalue=$?
   case "${envvalue}" in
     "0" ) return 0 ;;
@@ -199,8 +220,8 @@ ismsgEnvSysout() {
 # @return 0:do output 1:none
 ismsgEnvSyserr() {
   local msgid="$1"
-  local envkey="`getmsgIdEnvKey ${msgid}'_syserr'`"
-  getmsgEnvBooleanValue ${envkey}
+  local envkey="`getmsgIdEnvKey \"${msgid}\"'_syserr'`"
+  getmsgEnvBooleanValue "${envkey}"
   local envvalue=$?
   case "${envvalue}" in
     "0" ) return 0 ;;
@@ -217,8 +238,8 @@ ismsgEnvSyserr() {
 # @return 0:do output 1:none
 ismsgEnvLogger() {
   local msgid="$1"
-  local envkey="`getmsgIdEnvKey ${msgid}'_logger'`"
-  getmsgEnvBooleanValue ${envkey}
+  local envkey="`getmsgIdEnvKey \"${msgid}\"'_logger'`"
+  getmsgEnvBooleanValue "${envkey}"
   local envvalue=$?
   case "${envvalue}" in
     "0" ) return 0 ;;
@@ -235,8 +256,8 @@ ismsgEnvLogger() {
 # @return 0:do output 1:none
 ismsgEnvEmbedid() {
   local msgid="$1"
-  local envkey="`getmsgIdEnvKey ${msgid}'_embedid'`"
-  getmsgEnvBooleanValue ${envkey}
+  local envkey="`getmsgIdEnvKey \"${msgid}\"'_embedid'`"
+  getmsgEnvBooleanValue "${envkey}"
   local envvalue=$?
   case "${envvalue}" in
     "0" ) return 0 ;;