Loop in S_init_perllib(), only calling S_incpush*() with INCPUSH_ADD_OLD_VERS

[p5sagit/p5-mst-13.2.git] / t / op / pwent.t

diff --git a/t/op/pwent.t b/t/op/pwent.t
index 4cccbfe..9653c6b 100755 (executable)
--- a/t/op/pwent.t
+++ b/t/op/pwent.t
@@ -3,7 +3,7 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
-    eval {my @n = getpwuid 0};
+    eval {my @n = getpwuid 0; setpwent()};
     if ($@ && $@ =~ /(The \w+ function is unimplemented)/) {
        print "1..0 # Skip: $1\n";
        exit 0;
@@ -41,6 +41,71 @@ BEGIN {
        }
     }
 
+    if (not defined $where &&          # Try dscl
+       $Config{useperlio} eq 'define') {       # need perlio
+
+       # Map dscl items to passwd fields, and provide support for
+       # mucking with the dscl output if we need to (and we do).
+       my %want = do {
+           my $inx = 0;
+           map {$_ => {inx => $inx++, mung => sub {$_[0]}}}
+               qw{RecordName Password UniqueID PrimaryGroupID
+               RealName NFSHomeDirectory UserShell};
+       };
+
+       # The RecordName for a /User record is the username. In some
+       # cases there are synonyms (e.g. _www and www), in which case we
+       # get a blank-delimited list. We prefer the first entry in the
+       # list because getpwnam() does.
+       $want{RecordName}{mung} = sub {(split '\s+', $_[0], 2)[0]};
+
+       # The UniqueID and PrimaryGroupID for a /User record are the
+       # user ID and the primary group ID respectively. In cases where
+       # the high bit is set, 'dscl' returns a negative number, whereas
+       # getpwnam() returns its twos complement. This mungs the dscl
+       # output to agree with what getpwnam() produces. Interestingly
+       # enough, getpwuid(-2) returns the right record ('nobody'), even
+       # though it returns the uid as 4294967294. If you track uid_t
+       # on an i386, you find it is an unsigned int, which makes the
+       # unsigned version the right one; but both /etc/passwd and
+       # /etc/master.passwd contain negative numbers.
+       $want{UniqueID}{mung} = $want{PrimaryGroupID}{mung} = sub {
+           unpack 'L', pack 'l', $_[0]};
+
+       foreach my $dscl (qw(/usr/bin/dscl)) {
+           -x $dscl or next;
+           open (my $fh, '-|', join (' ', $dscl, qw{. -readall /Users},
+                   keys %want, '2>/dev/null')) or next;
+           my $data;
+           my @rec;
+           while (<$fh>) {
+               chomp;
+               if ($_ eq '-') {
+                   @rec and $data .= join (':', @rec) . "\n";
+                   @rec = ();
+                   next;
+               }
+               my ($name, $value) = split ':\s+', $_, 2;
+               unless (defined $value) {
+                   s/:$//;
+                   $name = $_;
+                   $value = <$fh>;
+                   chomp $value;
+                   $value =~ s/^\s+//;
+               }
+               if (defined (my $info = $want{$name})) {
+                   $rec[$info->{inx}] = $info->{mung}->($value);
+               }
+           }
+           @rec and $data .= join (':', @rec) . "\n";
+           if (open (PW, '<', \$data)) {
+               $where = "dscl . -readall /Users";
+               undef $reason;
+               last;
+           }
+       }
+    }
+
     if (not defined $where) {  # Try local.
        my $PW = "/etc/passwd";
        if (-f $PW && open(PW, $PW) && defined(<PW>)) {
@@ -49,6 +114,18 @@ BEGIN {
        }
     }
 
+    if (not defined $where) {      # Try NIS+
+     foreach my $niscat (qw(/bin/niscat)) {
+         if (-x $niscat &&
+           open(PW, "$niscat passwd.org_dir 2>/dev/null |") &&
+           defined(<PW>)) {
+           $where = "NIS+ $niscat passwd.org_dir";
+           undef $reason;
+           last;
+         }
+     }
+    }
+
     if ($reason) {     # Give up.
        print "1..0 # Skip: $reason\n";
        exit 0;
@@ -68,12 +145,21 @@ my $tst = 1;
 my %perfect;
 my %seen;
 
+print "# where $where\n";
+
 setpwent();
+
 while (<PW>) {
     chomp;
     # LIMIT -1 so that users with empty shells don't fall off
     my @s = split /:/, $_, -1;
-    my ($name_s, $passwd_s, $uid_s, $gid_s, $gcos_s, $home_s, $shell_s) = @s;
+    my ($name_s, $passwd_s, $uid_s, $gid_s, $gcos_s, $home_s, $shell_s);
+    (my $v) = $Config{osvers} =~ /^(\d+)/;
+    if ($^O eq 'darwin' && $v < 9) {
+       ($name_s, $passwd_s, $uid_s, $gid_s, $gcos_s, $home_s, $shell_s) = @s[0,1,2,3,7,8,9];
+    } else {
+       ($name_s, $passwd_s, $uid_s, $gid_s, $gcos_s, $home_s, $shell_s) = @s;
+    }
     next if /^\+/; # ignore NIS includes
     if (@s) {
        push @{ $seen{$name_s} }, $.;
@@ -88,7 +174,7 @@ while (<PW>) {
     }
     # In principle we could whine if @s != 7 but do we know enough
     # of passwd file formats everywhere?
-    if (@s == 7) {
+    if (@s == 7 || ($^O eq 'darwin' && @s == 10)) {
        @n = getpwuid($uid_s);
        # 'nobody' et al.
        next unless @n;
@@ -110,9 +196,12 @@ while (<PW>) {
     }
     $n++;
 }
+
 endpwent();
 
-if (keys %perfect == 0) {
+print "# max = $max, n = $n, perfect = ", scalar keys %perfect, "\n";
+
+if (keys %perfect == 0 && $n) {
     $max++;
     print <<EOEX;
 #