In article <4eb05403.7060...@cs.ucla.edu>, Paul Eggert <egg...@cs.ucla.edu> wrote:
> On 11/01/11 11:12, David Evans wrote: > > > I will have to assume that Bash or sed on both FreeBSD and > > OS X is broken in some way. > > Quite possibly, but I've run into similar issues many times over > the years, with various shells, and it's fairly easy to work around > these bugs. I installed the following patch; please give it a try. > > * MODULES.html.sh: Fix sed-script shell quoting and locale issues. > (func_module): Replace foo=` ... sed -e COMPLICATED ... ` with > bar=COMPLICATED; foo=` ... sed -e "$bar" ... ` when COMPLICATED > contains (possibly-quoted) backslashes. This should avoid > all-too-common shell bugs if COMPLICATED contains backslashes in > the "wrong" places. Reported by David Evans in > <http://lists.gnu.org/archive/html/bug-gnulib/2011-11/msg00013.html>. > When 'sed' uses character ranges like A-Z, invoke it in the C locale, > because we want ASCII ranges. Is there some reason we don't use > the C locale everywhere in this script? > (func_module, top level): Avoid unwanted pathname expansion when > $repo_url_prefix or $repo_url_suffix_repl contain shell > metacharacters like '?' and '*'. > diff --git a/MODULES.html.sh b/MODULES.html.sh > index ba85225..34ca5cc 100755 > --- a/MODULES.html.sh > +++ b/MODULES.html.sh > @@ -1512,19 +1512,26 @@ func_module () > # parentheses (as per GNU standards, section "GNU Manuals"). > # - Flag the remaining symbol() constructs as errors. > # - Change 'xxx' to <CODE>xxx</CODE>. > + sed_extract_element=' > + '$sed_lt' > + '$sed_gt' > + '$sed_remove_trailing_empty_line' > + s,^, , > + s,$, , > + s,\([^a-zA-Z_]\)'$posix_functions'() \(function\|macro\),\1<A > HREF="'$POSIX2008_URL'/functions/\2.html">\2</A> \3,g > + s,\([^a-zA-Z_]\)'$posix_functions' \(function\|macro\),\1<A > HREF="'$POSIX2008_URL'/functions/\2.html">\2</A> \3,g > + s,\([^a-zA-Z_]\)'$posix_functions'(),\1<A > HREF="'$POSIX2008_URL'/functions/\2.html">\2</A> <SPAN > STYLE="color:#FF0000;">what?? If you mean a function\, please say > so.</SPAN>,g > + s,\([^a-zA-Z_]\)'$posix2001_functions'() \(function\|macro\),\1<A > HREF="'$POSIX2001_URL'xsh/\2.html">\2</A> \3,g > + s,\([^a-zA-Z_]\)'$posix2001_functions' \(function\|macro\),\1<A > HREF="'$POSIX2001_URL'xsh/\2.html">\2</A> \3,g > + s,\([^a-zA-Z_]\)'$posix2001_functions'(),\1<A > HREF="'$POSIX2001_URL'xsh/\2.html">\2</A> <SPAN STYLE="color:#FF0000;">what?? > If you mean a function\, please say so.</SPAN>,g > + s,\([^a-zA-Z_]\)\([a-zA-Z_][a-zA-Z0-9_]*\)() \(function\|macro\),\1\2 > \3,g > + s,\([^a-zA-Z_]\)\([a-zA-Z_][a-zA-Z0-9_]*\)(),\1\2 <SPAN > STYLE="color:#FF0000;">what?? If you mean a function\, please say > so.</SPAN>,g > + s, '"'"'\([a-zA-Z0-9_ -]*\)'"'"'\([^a-zA-Z0-9_]\), <CODE>\1</CODE>\2,g > + s,^ ,, > + s, $,, > + ' > element=`gnulib-tool --extract-description $1 \ > - | sed -e "$sed_lt" -e "$sed_gt" -e > "$sed_remove_trailing_empty_line" \ > - -e 's,^, ,' -e 's,$, ,' \ > - -e 's,\([^a-zA-Z_]\)'"${posix_functions}"'() > \(function\|macro\),\1<A HREF="'"$POSIX2008_URL"'/functions/\2.html">\2</A> > \3,g' \ > - -e 's,\([^a-zA-Z_]\)'"${posix_functions}"' > \(function\|macro\),\1<A HREF="'"$POSIX2008_URL"'/functions/\2.html">\2</A> > \3,g' \ > - -e 's,\([^a-zA-Z_]\)'"${posix_functions}"'(),\1<A > HREF="'"$POSIX2008_URL"'/functions/\2.html">\2</A> <SPAN > STYLE="color:#FF0000;">what?? If you mean a function\, please say > so.</SPAN>,g' \ > - -e 's,\([^a-zA-Z_]\)'"${posix2001_functions}"'() > \(function\|macro\),\1<A HREF="'"$POSIX2001_URL"'xsh/\2.html">\2</A> \3,g' \ > - -e 's,\([^a-zA-Z_]\)'"${posix2001_functions}"' > \(function\|macro\),\1<A HREF="'"$POSIX2001_URL"'xsh/\2.html">\2</A> \3,g' \ > - -e 's,\([^a-zA-Z_]\)'"${posix2001_functions}"'(),\1<A > HREF="'"$POSIX2001_URL"'xsh/\2.html">\2</A> <SPAN > STYLE="color:#FF0000;">what?? If you mean a function\, please say > so.</SPAN>,g' \ > - -e 's,\([^a-zA-Z_]\)\([a-zA-Z_][a-zA-Z0-9_]*\)() > \(function\|macro\),\1\2 \3,g' \ > - -e 's,\([^a-zA-Z_]\)\([a-zA-Z_][a-zA-Z0-9_]*\)(),\1\2 > <SPAN STYLE="color:#FF0000;">what?? If you mean a function\, please say > so.</SPAN>,g' \ > - -e 's, '"'"'\([a-zA-Z0-9_ -]*\)'"'"'\([^a-zA-Z0-9_]\), > <CODE>\1</CODE>\2,g' \ > - -e 's,^ ,,' -e 's, $,,'` > + | LC_ALL=C sed -e "$sed_extract_element"` > func_echo "<TD ALIGN=LEFT VALIGN=TOP WIDTH=\"80%\">$element" > > func_end TR > @@ -1539,13 +1546,19 @@ func_module () > includes=`gnulib-tool --extract-include-directive $1` > files=`gnulib-tool --extract-filelist $1 \ > | grep -v '^m4/gnulib-common\.m4$'` > + sed_extract_element=' > + '$sed_lt' > + '$sed_gt' > + '$sed_remove_trailing_empty_line' > + s,^#include "\(.*\)"$,#include "<A > HREF="'$repo_url_prefix'lib/\1'$repo_url_suffix_repl'">\1</A>", > + s,^#include <'$posix_headers'\.h>$,#include \<<A > HREF="'$POSIX2008_URL'/basedefs/\1.h.html">\1.h</A>\>, > + s,<A > HREF="'$POSIX2008_URL'/basedefs/\([a-zA-Z0-9_]*\)/\([a-zA-Z0-9_]*\)\.h\.html"> > ,<A HREF="'$POSIX2008_URL'/basedefs/\1_\2.h.html">, > + s,^#include <'$posix2001_headers'\.h>$,#include \<<A > HREF="'$POSIX2001_URL'xbd/\1.h.html">\1.h</A>\>, > + s/$/<BR>/ > + ' > element=`echo "$includes" \ > - | sed -e "$sed_lt" -e "$sed_gt" -e > "$sed_remove_trailing_empty_line" \ > - -e 's,^#include "\(.*\)"$,#include "<A > HREF="'$repo_url_prefix'lib/\1'$repo_url_suffix_repl'">\1</A>",' \ > - -e 's,^#include <'"${posix_headers}"'\.h>$,#include > \<<A HREF="'"$POSIX2008_URL"'/basedefs/\1.h.html">\1.h</A>\>,' \ > - -e 's,<A > HREF="'"$POSIX2008_URL"'/basedefs/\([a-zA-Z0-9_]*\)/\([a-zA-Z0-9_]*\)\.h\.html > ">,<A HREF="'"$POSIX2008_URL"'/basedefs/\1_\2.h.html">,' \ > - -e 's,^#include > <'"${posix2001_headers}"'\.h>$,#include \<<A > HREF="'"$POSIX2001_URL"'xbd/\1.h.html">\1.h</A>\>,' \ > - -e 's/$/<BR>/' | tr -d "$trnl" | sed -e 's/<BR>$//'` > + | LC_ALL=C sed -e "$sed_extract_element" | tr -d "$trnl" \ > + | sed -e 's/<BR>$//'` > test -n "$element" || element='---' > func_echo "<TD ALIGN=LEFT VALIGN=TOP>$element" > > @@ -1554,21 +1567,28 @@ func_module () > | sed -n -e "$sed_choose_unconditional_nonstandard_include" > | \ > | sed -e "$sed_escape_dot" | tr -d "$trnl"` > sed_choose_lib_files='s,^lib/\(.*\)$,\1,p' > + sed_extract_include=' > + \|^'"$includefile"'$|d > + s,^\(.*\)$,<A > HREF="'$repo_url_prefix'lib/\1'$repo_url_suffix_repl'">\1</A>, > + s/$/<BR>/ > + ' > element=`echo "$files" \ > | sed -e '/^$/d' \ > | sed -n -e "$sed_choose_lib_files" \ > - | sed -e '\|^'"${includefile}"'$|d' \ > - -e 's,^\(.*\)$,<A > HREF="'$repo_url_prefix'lib/\1'$repo_url_suffix_repl'">\1</A>,' \ > - -e 's/$/<BR>/' | tr -d "$trnl" | sed -e 's/<BR>$//'` > + | sed -e "$sed_extract_include" \ > + | tr -d "$trnl" | sed -e 's/<BR>$//'` > test -n "$element" || element='---' > func_echo "<TD ALIGN=LEFT VALIGN=TOP>$element" > > sed_choose_m4_files='s,^m4/\(.*\)$,\1,p' > + sed_extract_repo_url=' > + /^onceonly/d > + s,^\(.*\)$,<A > HREF="'$repo_url_prefix'm4/\1'$repo_url_suffix_repl'">\1</A>, > + ' > element=`(echo "$files" \ > | sed -e "$sed_remove_trailing_empty_line" \ > | sed -n -e "$sed_choose_m4_files" \ > - | sed -e '/^onceonly/d' \ > - -e 's,^\(.*\)$,<A > HREF="'$repo_url_prefix'm4/\1'$repo_url_suffix_repl'">\1</A>,'; \ > + | sed -e "$sed_extract_repo_url"; \ > gnulib-tool --extract-autoconf-snippet $1 \ > | sed -e "$sed_remove_trailing_empty_line") \ > | sed -e 's/$/<BR>/' | tr -d "$trnl" | sed -e 's/<BR>$//'` > @@ -3600,7 +3620,7 @@ if test -n "$missed_files"; then > func_echo "$element" > > func_echo '<PRE>' > - echo "$missed_files" | sed -e 's,^\(.*\)$,<A > HREF="'$repo_url_prefix'\1'$repo_url_suffix_repl'">\1</A>,' > + echo "$missed_files" | sed -e 's,^\(.*\)$,<A > HREF="'"$repo_url_prefix"'\1'"$repo_url_suffix_repl"'">\1</A>,' > echo '</PRE>' > > fi Thanks for that. I've solved the problem more simply by installed GNU sed on both FreeBSD and OS X, and it now works.
