trans-coord/gnun/server/gnun gnun-validate-html.in

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/01/22 08:10:04

Modified files:
        gnun/server/gnun: gnun-validate-html.in 

Log message:
        Fix options processing; add `--expand-to' option.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-validate-html.in?cvsroot=trans-coord&r1=1.12&r2=1.13

Patches:
Index: gnun-validate-html.in
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/gnun-validate-html.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gnun-validate-html.in       21 Oct 2011 11:46:05 -0000      1.12
+++ gnun-validate-html.in       22 Jan 2012 08:10:04 -0000      1.13
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 
 # This file is part of GNUnited Nations.
 
@@ -32,6 +32,7 @@
 Usage: gnun-validate-html OPTION... FILE
 
 Options:
+      --expand-to=FILE       Specify file to output expanded HTML
       --root=DIRECTORY       Specify top directory for working copy
       --version              Display version info and exit
       --help                 Display this help and exit
@@ -47,8 +48,9 @@
 
 params=$#
 ROOT=../..
+OUTPUT=
 
-while [ ${params} -gt 1 ]; do
+while [ ${params} -ge 1 ]; do
   case "$1" in
       --help )
          usage
@@ -66,6 +68,14 @@
       --root=* )
          ROOT="${1#--root=}"
          ;;
+      --expand-to )
+         shift
+         params=$((${params}-1))
+         OUTPUT="$1"
+         ;;
+      --expand-to=* )
+         OUTPUT="${1#--expand-to=}"
+         ;;
       * )
           break
          ;;
@@ -91,6 +101,9 @@
 TMP2=`mktemp -t gnun.2.XXXXXX`
 trap "rm -f $TMP1 $TMP2" EXIT
 
+# Use $TMP1 if no $OUTPUT is specified.
+OUTPUT="${OUTPUT:-${TMP1}}"
+
 # Expand input file's #include directives and save the result in
 # $TMP1.
 cat > $TMP2 <<"EOF"
@@ -146,13 +159,13 @@
 { print; }
 EOF
 
address@hidden@ -v script_name=$TMP2 -v root="$ROOT" -f $TMP2 $1 > $TMP1
address@hidden@ -v script_name=$TMP2 -v root="${ROOT}" -f $TMP2 $1 > "${OUTPUT}"
 
 if @AWK@ '
   # Check whether we are validating HTML5 or some other flavor of HTML
   /<!DOCTYPE/ {
      exit $0 ~ /<!DOCTYPE[ \t\f\n\r\v]+html[ \t\f\n\r\v]*>/;
-  }' $TMP1;
+  }' "${OUTPUT}";
 then
   # Use our old procedure
   VALIDATE=--valid
@@ -169,14 +182,14 @@
           vex = 1;
         }
     }
-    { print; }' $TMP1 > $TMP2
-  mv $TMP2 $TMP1
+    { print; }' "${OUTPUT}" > $TMP2
+  mv $TMP2 "${OUTPUT}"
   VALIDATE="--dtdvalid $DTD/html5.dtd"
 fi
 
-# Execute xmllint on $TMP1 and save its output to $TMP2.
+# Execute xmllint on $OUTPUT and save its output to $TMP2.
 set +e
-xmllint --path "$DTD" $VALIDATE --nonet --noout $TMP1 2> $TMP2
+xmllint --path "$DTD" $VALIDATE --nonet --noout "${OUTPUT}" 2> $TMP2
 LINTSTATUS=$?
 set -e
 
@@ -189,7 +202,7 @@
 @SED@ '
   /line [[:digit:]]\+/ {
      p
-     s=^.*line \([[:digit:]]\+\).*$=head -n \1 '"$TMP1"' | tail -n 1=
+     s=^.*line \([[:digit:]]\+\).*$=head -n \1 '"${OUTPUT}"' | tail -n 1=
      e
   }' $TMP2