File hylafax-6.0.2-faxaddmodem.diff of Package hylafax

File hylafax-6.0.2-faxaddmodem.diff of Package hylafax (Revision 1da717ffb6ded6c87172d958f0605b12)

Currently displaying revision 1da717ffb6ded6c87172d958f0605b12, show latest

@@ -521,11 +530,11 @@ getServerParameters()
 echoServerSedCommands()
 {
     (for i in $RequiredServerParameters; do
-	eval echo \"$i:\$$i:\"
+	eval echo -e \"$i\\x00\$$i\\x00\"
      done
      for i in $OptionalServerParameters; do
-	eval echo \"$i:\$$i:\$default$i\"
-     done) | $AWK -F: '
+	eval echo \"$i\\x00\$$i\\x00\$default$i\"
+     done) | $AWK -F\000 '
 function p(tag, value)
 {
     tabs = substr("\t\t\t", 1, 3-int((length(tag)+1)/8));
@@ -657,8 +666,8 @@ EOF
 printServerConfig()
 {
     (for i in $ServerParameters; do
-	eval echo \"$i:\$$i:\$default$i\"
-    done) | $AWK -F: '
+	eval echo \"$i\\x00\$$i\\x00\$default$i\"
+    done) | $AWK -F\000 '
 function p(tag, value)
 {
     tabs = substr("\t\t\t", 1, 3-int((length(tag)+1)/8));
@@ -1413,20 +1429,38 @@ echoModemSedCommands()
     ModemCmds=""
 
     (for i in $ModemParameters; do
-	eval echo \"$i:\$$i:\$proto$i\"
+	eval x=\$$i
+	x=`echo $x | $SED 's/&/\\\\&/g'`
+	eval $i=\$x
+	eval x="\$proto$i"
+	x=`echo $x | $SED 's/&/\\\\&/g'`
+	eval proto$i=\$x
+	eval echo -e \"$i\\x00\$$i\\x00\$proto$i\"
     done
     case "$ModemType" in
     Class1*)
 	for i in $Class1Parameters; do
-	    eval echo \"$i:\$$i:\$proto$i\"
+	    eval x="\$$i"
+	    x=`echo $x | $SED 's/G/\\\\&/g'`
+	    eval $i=\$x
+	    eval x="\$proto$i"
+	    x=`echo $x | $SED 's/&/\\\\&/g'`
+	    eval proto$i=\$x
+	    eval echo \"$i\\x00\$$i\\x00\$proto$i\"
 	done
 	;;
     Class2*)
 	for i in $Class2Parameters; do
-	    eval echo \"$i:\$$i:\$proto$i\"
+	    eval x="\$$i"
+	    x=`echo $x | $SED 's/G/\\\\&/g'`
+	    eval $i=\$x
+	    eval x="\$proto$i"
+	    x=`echo $x | $SED 's/&/\\\\&/g'`
+	    eval proto$i=\$x
+	    eval echo \"$i\\x00\$$i\\x00\$proto$i\"
 	done
 	;;
-    esac) | $AWK -F: '
+    esac) | $AWK -F\000 '
 function p(tag, value)
 {
     if (match(value, "^[^\"].*[ ]") == 0)
@@ -1482,20 +1516,20 @@ checkFlowControlAgainstTTY()
 printModemConfig()
 {
     (for i in $ModemParameters; do
-	eval echo \"$i:\$$i:\$proto$i\"
+	eval echo \"$i\\x00\$$i\\x00\$proto$i\"
     done
     case "$ModemType" in
     Class1*)
 	for i in $Class1Parameters; do
-	    eval echo \"$i:\$$i:\$proto$i\"
+	    eval echo \"$i\\x00\$$i\\x00\$proto$i\"
 	done
 	;;
     Class2*)
 	for i in $Class2Parameters; do
-	    eval echo \"$i:\$$i:\$proto$i\"
+	    eval echo \"$i\\x00\$$i\\x00\$proto$i\"
 	done
 	;;
-    esac) | $AWK -F: '
+    esac) | $AWK -F\000 '
 function p(tag, value)
 {
     tabs = substr("\t\t\t", 1, 3-int((length(tag)+1)/8));
@@ -1876,11 +1910,11 @@ CheckedParameters="
 echoSchedulerParameters()
 {
     (for i in $RequiredSchedulerParameters; do
-	eval echo \"$i:\$$i:\"
+	eval echo \"$i\\x00\$$i\\x00\"
      done
      for i in $OptionalSchedulerParameters; do
-	eval echo \"$i:\$$i:\$default$i\"
-     done) | $AWK -F: '
+	eval echo \"$i\\x00\$$i\\x00\$default$i\"
+     done) | $AWK -F\000 '
 function p(tag, value)
 {
     tabs = substr("\t\t\t", 1, 3-int((length(tag)+1)/8));
@@ -1898,8 +1932,8 @@ $2 != $3{ p($1, $2) }'
 printSchedulerConfig()
 {
     (for i in $SchedulerParameters; do
-	eval echo \"$i:\$$i:\$default$i\"
-    done) | $AWK -F: '
+	eval echo \"$i\\x00\$$i\\x00\$default$i\"
+    done) | $AWK -F\000 '
 function p(tag, value)
 {
     tabs = substr("\t\t\t", 1, 3-int((length(tag)+1)/8));