command_util: Output array members with backslashes.

[paraslash.git] / command_util.sh

diff --git a/command_util.sh b/command_util.sh
index 563ab1a25ebe80e6e7bd837fa5e613d8ba3e880c..875b5e6957f7509a15352cdfc6a9c7239402a448 100755 (executable)
--- a/command_util.sh
+++ b/command_util.sh
@@ -198,42 +198,39 @@ make_proto()
        for source_file in $source_files; do
                match=$(grep "^\(__noreturn \)*int com_$name_txt(" $source_file | head -n 1 | sed -e 's/$/;/1')
                if test -n "$match"; then
-                       result="$result $match$CR"
+                       result="$result$match$CR"
                        break
                fi
        done
-       echo
 }
 
 make_array_member()
 {
-       local TAB='     '
+       local TAB='     ' CR='
+'
        local tmp
 
-       result="
-       {
-       .name = \"$name_txt\",
-       .handler = com_$name_txt,
-       "
+       result="{.name = \"$name_txt\", .handler = com_$name_txt, "
        if test -n "$perms_txt"; then
                result="$result .perms = $perms_txt,"
        fi
-       result="$result
-       .description = \"$desc_txt\",
-       .usage = \"$usage_txt\",
-       .help = "
+       result="$result.description = \"$desc_txt\", .usage = \"$usage_txt\", \\$CR .help = "
        tmp="$(printf "%s\n" "$help_txt" | sed -e 's/^/\"/g' -e 's/$/\\n\"/g' \
-               -e "s/$TAB/\\\t/g")"
-       result="$result $tmp },"
+               -e "s/$TAB/\\\t/g" -e's/$/\\/g')"
+       result="$result$tmp$CR}, \\$CR"
 }
 
 make_completion()
 {
-       result="  {.name = \"$name_txt\", .completer = ${name_txt}_completer}, \\"
+       local CR='
+'
+       result="  {.name = \"$name_txt\", .completer = ${name_txt}_completer}, \\$CR"
 }
 
 template_loop()
 {
+       local loop_result=
+
        local t_name="$name_txt"
        local t_perms="$perms_txt"
        local t_desc="$desc_txt"
@@ -251,11 +248,10 @@ template_loop()
                usage_txt=$(echo "$t_usage" | $sed_cmd)
                help_txt=$(printf "%s\n" "$t_help" | $sed_cmd)
                prototype=$(echo "$template_prototype" | $sed_cmd)
-               result=
                $1
-               echo "$result"
+               loop_result="$loop_result$result"
        done
-
+       result="$loop_result"
 }
 
 com_c_file()
@@ -273,10 +269,11 @@ com_c_file()
                fi
                if test $template -eq 0; then
                        make_array_member
-                       echo "$result"
+                       printf "%s" "$result"
                        continue
                fi
                template_loop make_array_member
+               printf "%s" "$result"
        done
        echo '{.name = NULL}};'
 }
@@ -294,10 +291,11 @@ com_header()
                fi
                if test $template -eq 0; then
                        make_proto
-                       echo "$result"
+                       printf "%s" "$result"
                        continue
                fi
                template_loop make_proto
+               printf "%s" "$result"
        done
 }
 
@@ -315,10 +313,11 @@ com_completion()
                fi
                if test $template -eq 0; then
                        make_completion
-                       echo "$result"
+                       printf "%s" "$result"
                        continue
                fi
                template_loop make_completion
+               printf "%s" "$result"
        done
        echo
 }