X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fdtprintinfo%2Fsym2num;h=0f554d8611654d0947faa7bd5d5f4a1b046dbbdb;hb=ee4a0a37ea2352311e30f1c63df1d1b471c30e8d;hp=ba22f7e80e40de3464d147aaf9de37b83863dba3;hpb=72c954e5b30ba058df88864cfe0a31b9468e3a23;p=oweals%2Fcde.git

diff --git a/cde/programs/dtprintinfo/sym2num b/cde/programs/dtprintinfo/sym2num
index ba22f7e8..0f554d86 100755
--- a/cde/programs/dtprintinfo/sym2num
+++ b/cde/programs/dtprintinfo/sym2num
@@ -10,13 +10,11 @@
 #             by gencat.
 #
 
-typeset -u CAP_SYMBOL_NAME
-
 (( $# != 2 )) && { print "usage: sym2num <symbol name> <source file>" ;\
                  exit 1 ; }
 
 SYMBOL_NAME=$1
-CAP_SYMBOL_NAME=$1   # capitalized symbol name
+CAP_SYMBOL_NAME=`echo $1 | tr '[:lower:]' '[:upper:]'`  # capitalized symbol
 SOURCE_FILE=$2
 inc_file=${SYMBOL_NAME}_msg.h     # include file
 
@@ -61,11 +59,15 @@ then
 elif [[ -f /usr/libexec/cpp ]] #BSD
 then
    cpp_path=/usr/libexec
+elif [[ -f /usr/bin/cpp ]]     #BSD
+then
+   cpp_path=/usr/bin
 elif [[ -f /lib/cpp ]]         #HP
 then
    cpp_path=/lib
 fi
    ( cat ${inc_file} | sed -n /define/p ; cat ${SOURCE_FILE} ) | \
-   ${cpp_path}/cpp -P | sed '/^$/d' | sed 's/^\([1-9][0-9]*\)[ ]*\(.*\)/\1 \2/'
+   ${cpp_path}/cpp -P | sed -e '/^$/d' -e 's/^\$$/\$ /' \
+    -e 's/\"\"$/\"/' -e 's/XDQUOTE/\"/' -e "s/XSQUOTE/\'/" \
+    -e 's/^\([1-9][0-9]*\)[ ]*[\"]*\(\"\)\(.*\)/\1 \2\3/'
 
-