Index: ossp-pkg/shtool/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v
rcsdiff -q -kk '-r1.167' '-r1.168' -u '/v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v' 2>/dev/null
--- ChangeLog	2002/02/02 18:47:29	1.167
+++ ChangeLog	2002/02/23 09:18:03	1.168
@@ -9,7 +9,13 @@
 
  ChangeLog
 
- Changes between 1.6.0 and 1.6.1 (01-Feb-2002 to xx-Feb-2002):
+ Changes between 1.6.0 and 1.6.1 (01-Feb-2002 to 23-Feb-2002):
+
+   *) Port to POSIX 1003.1-2001 (SUSv3) standard:
+      sh.echo, sh.version: "head -1" -> "sed -e 'q'"
+      sh.path: "sort -u | tail -1" -> "sort -r -u | sed -e q"
+      sh.subst: diff -u1 -> diff -U1
+      [Paul Eggert <eggert@twinsun.com>]
 
    *) Fixed various typos in shtool.pod.
       [Ralf S. Engelschall, Liones <liones@myrealbox.com>]
Index: ossp-pkg/shtool/sh.echo
RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.echo,v
rcsdiff -q -kk '-r1.29' '-r1.30' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.echo,v' 2>/dev/null
--- sh.echo	2001/12/31 15:06:04	1.29
+++ sh.echo	2002/02/23 09:18:03	1.30
@@ -194,13 +194,13 @@
 if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%d'`" != . ]; then
     if [ ".$domainname" = . ]; then
         if [ -f /etc/resolv.conf ]; then
-            domainname="`egrep '^[ 	]*domain' /etc/resolv.conf | head -1 |\
+            domainname="`egrep '^[ 	]*domain' /etc/resolv.conf | sed -e 'q' |\
                          sed -e 's/.*domain//' \
                              -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
                              -e 's/^\.//' -e 's/^/./' |\
                          awk '{ printf("%s", $1); }'`"
             if [ ".$domainname" = . ]; then
-                domainname="`egrep '^[ 	]*search' /etc/resolv.conf | head -1 |\
+                domainname="`egrep '^[ 	]*search' /etc/resolv.conf | sed -e 'q' |\
                              sed -e 's/.*search//' \
                                  -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
                                  -e 's/ .*//' -e 's/	.*//' \
Index: ossp-pkg/shtool/sh.path
RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.path,v
rcsdiff -q -kk '-r1.21' '-r1.22' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.path,v' 2>/dev/null
--- sh.path	2001/12/31 15:06:04	1.21
+++ sh.path	2002/02/23 09:18:03	1.22
@@ -100,7 +100,7 @@
         pc=`expr $pc - 1`
     done
     if [ $found = 1 ]; then
-        perl="`cat $tmpfile | sort -u | tail -1 | cut -d: -f4`"
+        perl="`cat $tmpfile | sort -r -u | sed -e 'q' | cut -d: -f4`"
         rm -f $tmpfile >/dev/null 2>&1
         echo "$perl"
         exit 0
Index: ossp-pkg/shtool/sh.subst
RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.subst,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.subst,v' 2>/dev/null
--- sh.subst	2002/01/02 17:04:56	1.4
+++ sh.subst	2002/02/23 09:18:03	1.5
@@ -92,7 +92,7 @@
                 rm -f $file.new
                 skip=yes
             else
-                (diff -u1 $file $file.new >$tmpfile) 2>/dev/null
+                (diff -U1 $file $file.new >$tmpfile) 2>/dev/null
                 if [ ".`cat $tmpfile`" = . ]; then
                     (diff -C1 $file $file.new >$tmpfile) 2>/dev/null
                     if [ ".`cat $tmpfile`" = . ]; then
Index: ossp-pkg/shtool/sh.version
RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.version,v
rcsdiff -q -kk '-r1.31' '-r1.32' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.version,v' 2>/dev/null
--- sh.version	2001/12/31 15:06:04	1.31
+++ sh.version	2002/02/23 09:18:03	1.32
@@ -55,8 +55,8 @@
 elif [ -r $file ]; then
     #   determine triple from given file
     eval `grep 'Version [0-9]*.[0-9]*[sabp.][0-9]* ([0-9]*-[a-zA-Z]*-[0-9]*)' $file |\
-          head -1 | sed -e 's%.*Version \([0-9]*\)\.\([0-9]*\)\([sabp.]\)\([0-9]*\) (\([0-9]*-[a-zA-Z]*-[0-9]*\)).*%\
-          ver="\1";rev="\2";typ="\3";lev="\4";tim="\5"%'`
+          sed -e 's%.*Version \([0-9]*\)\.\([0-9]*\)\([sabp.]\)\([0-9]*\) (\([0-9]*-[a-zA-Z]*-[0-9]*\)).*%\
+          ver="\1";rev="\2";typ="\3";lev="\4";tim="\5"%' -e 'q'`
 else
     #   intialise to first version
     ver=0