Index: ossp-pkg/shtool/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v
rcsdiff -q -kk '-r1.228' '-r1.229' -u '/v/ossp/cvs/ossp-pkg/shtool/ChangeLog,v' 2>/dev/null
--- ChangeLog	2006/04/19 16:35:17	1.228
+++ ChangeLog	2006/09/29 06:13:16	1.229
@@ -9,6 +9,12 @@
 
  ChangeLog
 
+ Changes between 2.0.6 and 2.0.7 (19-Apr-2006 to xx-Sep-2006):
+
+   *) Fix and enhance "shtool echo -e" command by adding a missing
+      line-continuation and adding support for MacOS X via nidump(8).
+      [Ralf S. Engelschall]
+
  Changes between 2.0.5 and 2.0.6 (07-Feb-2006 to 19-Apr-2006):
 
    *) Add support for Sun Niagara (sun4v) architecture to
Index: ossp-pkg/shtool/sh.echo
RCS File: /v/ossp/cvs/ossp-pkg/shtool/sh.echo,v
rcsdiff -q -kk '-r1.40' '-r1.41' -u '/v/ossp/cvs/ossp-pkg/shtool/sh.echo,v' 2>/dev/null
--- sh.echo	2006/02/04 09:43:25	1.40
+++ sh.echo	2006/09/29 06:13:17	1.41
@@ -146,11 +146,14 @@
                     userid=`grep "^${username}:" /etc/passwd 2>/dev/null | \
                             sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
                     if [ ".$userid" = . ]; then
-                        userid=`(ypcat passwd) 2>/dev/null |
-                                grep "^${username}:" | \
+                        userid=`(ypmatch "${username}" passwd) 2>/dev/null | \
                                 sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
                         if [ ".$userid" = . ]; then
-                            userid='?'
+                            userid=`(nidump passwd . | grep "^${username}:") 2>/dev/null | \
+                                    sed -e 's/[^:]*:[^:]*://' -e 's/:.*$//'`
+                            if [ ".$userid" = . ]; then
+                                userid='?'
+                            fi
                         fi
                     fi
                 fi
@@ -175,10 +178,14 @@
                 groupid=`grep "^${username}:" /etc/passwd 2>/dev/null | \
                          sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
                 if [ ".$groupid" = . ]; then
-                    groupid=`(ypcat passwd) 2>/dev/null | grep "^${username}:" | \
+                    groupid=`(ypmatch "${username}" passwd) 2>/dev/null | \
                              sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
                     if [ ".$groupid" = . ]; then
-                        groupid='?'
+                        groupid=`(nidump passwd . | grep "^${username}:") 2>/dev/null | \
+                                 sed -e 's/[^:]*:[^:]*:[^:]*://' -e 's/:.*$//'`
+                        if [ ".$groupid" = . ]; then
+                            groupid='?'
+                        fi
                     fi
                 fi
             fi
@@ -207,7 +214,12 @@
                                grep "^[^:]*:[^:]*:${groupid}:" | \
                                sed -e 's/:.*$//'`
                     if [ ".$groupname" = . ]; then
-                        groupname='?'
+                        groupname=`(nidump group .) 2>/dev/null | \
+                                   grep "^[^:]*:[^:]*:${groupid}:" | \
+                                   sed -e 's/:.*$//'`
+                        if [ ".$groupname" = . ]; then
+                            groupname='?'
+                        fi
                     fi
                 fi
             fi