diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-18 22:02:15 -0400 |
---|---|---|
committer | lianah <lianahady@gmail.com> | 2014-06-19 18:24:40 -0400 |
commit | 3de701d46b7b3bbdac40ad017c7f9a0a1cd8120b (patch) | |
tree | bd680d29dccebebaded04848cb7597bbbd793f91 /src | |
parent | dd5dee0a40a03ea5fc7c3685aa2ce17d073a22ab (diff) |
Proper escaping in option documentation.
Diffstat (limited to 'src')
-rwxr-xr-x | src/options/mkoptions | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/options/mkoptions b/src/options/mkoptions index 32f81455b..de0986de1 100755 --- a/src/options/mkoptions +++ b/src/options/mkoptions @@ -1124,6 +1124,11 @@ $@" mandoc="$mandoc [*]" fi + # in man, minus sign is \-, different from hyphen + the_manopt="`echo "$the_opt" | sed 's,-,\\\\\\-,g'`" + mandoc="`echo "$mandoc" | sed 's,-,\\\\\\-,g'`" + mansmtdoc="`echo "$mansmtdoc" | sed 's,-,\\\\\\-,g'`" + if [ "$the_opt" ]; then doc_line= while [ -n "$the_doc" ]; do @@ -1147,14 +1152,14 @@ $@" #line $lineno \"$kf\" \"$(echo "$doc_line" | sed 's,'\'',\\'\'',g;s,",\\",g')" common_manpage_documentation="${common_manpage_documentation} -.IP \"$the_opt\" +.IP \"$the_manopt\" $mandoc" elif [ "$category" != UNDOCUMENTED ]; then remaining_documentation="${remaining_documentation}\\n\" #line $lineno \"$kf\" \"$(echo "$doc_line" | sed 's,'\'',\\'\'',g;s,",\\",g')" remaining_manpage_documentation="${remaining_manpage_documentation} -.IP \"$the_opt\" +.IP \"$the_manopt\" $mandoc" fi fi @@ -1286,19 +1291,22 @@ function doc-alternate { the_doc="$(expr "$remaining_doc" : '\(.*\) ')" done + # in man, minus sign is \-, different from hyphen + the_manopt="`echo "$the_opt" | sed 's,-,\\\\\\-,g'`" + if [ "$category" = COMMON ]; then common_documentation="${common_documentation}\\n\" #line $lineno \"$kf\" \"$(echo "$doc_line" | sed 's,'\'',\\'\'',g;s,",\\",g')" common_manpage_documentation="${common_manpage_documentation} -.IP \"$the_opt\" +.IP \"$the_manopt\" $@" else remaining_documentation="${remaining_documentation}\\n\" #line $lineno \"$kf\" \"$(echo "$doc_line" | sed 's,'\'',\\'\'',g;s,",\\",g')" remaining_manpage_documentation="${remaining_manpage_documentation} -.IP \"$the_opt\" +.IP \"$the_manopt\" $@" fi else |