diff --git a/frysk-common/frysk.xml b/frysk-common/frysk.xml index 404b014..8991af9 100644 --- a/frysk-common/frysk.xml +++ b/frysk-common/frysk.xml @@ -62,7 +62,8 @@ frysk - The Frysk Debugging, Tracing, and Monitoring Tool Suite + The Frysk Debugging, Tracing, and Monitoring + Tool Suite diff --git a/frysk-common/manpages.sh b/frysk-common/manpages.sh index ac0c0b6..c41513a 100755 --- a/frysk-common/manpages.sh +++ b/frysk-common/manpages.sh @@ -57,6 +57,24 @@ sed -n < ${template} \ # Generate the body for the man pages. +refpurposegrep=$(cat << EOF +//{ + :loop + /<\/refpurpose>/b break + N + b loop + + :break + s,^.*,, + s,.*$,, + s,\(^[[:space:]]*\|[[:space:]]*$\),,g + s,[[:space:]]\+, ,g + p + q +} +EOF +) + suffix= for xmlfile in "$@" ; do if expr x"${xmlfile}" : "x-" > /dev/null ; then @@ -84,7 +102,7 @@ EOF
  • ${name}.${n} EOF # Catch empty (aka not on one line) refpurpose tags. - desc=$(sed -n 's/\(.*\)<\/refpurpose>/\1/ p' $xmlfile) + desc=$(sed -n "$refpurposegrep" $xmlfile) if test -z "$desc"; then exit 1; fi echo "$desc" echo "
  • " diff --git a/frysk-core/frysk/bindir/fdebuginfo.xml b/frysk-core/frysk/bindir/fdebuginfo.xml index 3798c06..8f88f0b 100644 --- a/frysk-core/frysk/bindir/fdebuginfo.xml +++ b/frysk-core/frysk/bindir/fdebuginfo.xml @@ -70,7 +70,8 @@ fdebuginfo - display the debug-info paths for a process and its shared modules + display the debug-info paths for a process + and its shared modules diff --git a/frysk-core/frysk/bindir/ferror.xml b/frysk-core/frysk/bindir/ferror.xml index 6d4bc90..b8742b6 100644 --- a/frysk-core/frysk/bindir/ferror.xml +++ b/frysk-core/frysk/bindir/ferror.xml @@ -70,7 +70,8 @@ ferror - print a stack trace when the given message is printed by the traced program + print a stack trace when the given message is printed + by the traced program diff --git a/frysk-core/frysk/bindir/fmaps.xml b/frysk-core/frysk/bindir/fmaps.xml index 692967e..de7a3dd 100644 --- a/frysk-core/frysk/bindir/fmaps.xml +++ b/frysk-core/frysk/bindir/fmaps.xml @@ -69,9 +69,8 @@ - fmaps - print the process or a corefile's address maps. - + fmapsprint the process or a corefile's + address maps diff --git a/frysk-core/frysk/pkglibdir/fparser.xml b/frysk-core/frysk/pkglibdir/fparser.xml index 3635e45..352e330 100644 --- a/frysk-core/frysk/pkglibdir/fparser.xml +++ b/frysk-core/frysk/pkglibdir/fparser.xml @@ -62,7 +62,8 @@ fparser - Runs the frysk standalone source code parser utility. + runs the frysk standalone source code parser + utility diff --git a/frysk-core/frysk/pkglibdir/funit-exit.xml b/frysk-core/frysk/pkglibdir/funit-exit.xml index d420b15..513ab11 100644 --- a/frysk-core/frysk/pkglibdir/funit-exit.xml +++ b/frysk-core/frysk/pkglibdir/funit-exit.xml @@ -62,7 +62,8 @@ funit-exit - exits with specified status, or terminates with the specified signal + exits with specified status, + or terminates with the specified signal diff --git a/frysk-sys/frysk/pkglibdir/funit-procmask.xml b/frysk-sys/frysk/pkglibdir/funit-procmask.xml index add4d7b..9e82450 100644 --- a/frysk-sys/frysk/pkglibdir/funit-procmask.xml +++ b/frysk-sys/frysk/pkglibdir/funit-procmask.xml @@ -62,7 +62,8 @@ funit-procmask - Test the processes signal mask for the presence (or absence) of a list if signals + test the processes signal mask for the presence + (or absence) of a list if signals diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am index 9f6a8c8..5a95c67 100644 --- a/frysk-top/Makefile.am +++ b/frysk-top/Makefile.am @@ -89,7 +89,7 @@ manpages manpages/index.html: $(srcdir)/frysk-gui/frysk/bindir/*.xml \ -"Test framework" \ $(srcdir)/*/frysk/pkglibdir/*.xml \ - || (echo "Bad [not on one line] refpurpose tag found."; exit 1) + || (echo "Bad xml file or no refpurpose tag found."; exit 1) mv manpages/index.new manpages/index.html # Generate JAVADOC documentation.