From: Gisle Aas <gisle@aas.no>
Date: Tue, 1 Nov 2005 00:02:37 +0000 (-0800)
Subject: Re: futimes [PATCH]
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fc8d54b0ec8f51a3b3106f2c54bd0f1ada739e0e;p=p5sagit%2Fp5-mst-13.2.git

Re: futimes [PATCH]
Message-ID: <lrbr1494o2.fsf@caliper.activestate.com>

p4raw-id: //depot/perl@25951
---

diff --git a/t/io/fs.t b/t/io/fs.t
index ecb014f..58204dd 100755
--- a/t/io/fs.t
+++ b/t/io/fs.t
@@ -14,9 +14,11 @@ my $Is_VMSish = ($^O eq 'VMS');
 
 if (($^O eq 'MSWin32') || ($^O eq 'NetWare')) {
     $wd = `cd`;
-} elsif ($^O eq 'VMS') {
+}
+elsif ($^O eq 'VMS') {
     $wd = `show default`;
-} else {
+}
+else {
     $wd = `pwd`;
 }
 chomp($wd);
@@ -227,56 +229,58 @@ SKIP: {
 
 
 sub check_utime_result {
-($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
-    $blksize,$blocks) = stat('b');
+    ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
+     $blksize,$blocks) = stat('b');
 
-SKIP: {
-    skip "bogus inode num", 1 if ($^O eq 'MSWin32') || ($^O eq 'NetWare');
+ SKIP: {
+	skip "bogus inode num", 1 if ($^O eq 'MSWin32') || ($^O eq 'NetWare');
 
-    ok($ino,    'non-zero inode num');
-}
+	ok($ino,    'non-zero inode num');
+    }
 
-SKIP: {
-    skip "filesystem atime/mtime granularity too low", 2
-      unless $accurate_timestamps;
+ SKIP: {
+	skip "filesystem atime/mtime granularity too low", 2
+	    unless $accurate_timestamps;
 
-    print "# atime - $atime  mtime - $mtime  delta - $delta\n";
-    if($atime == 500000000 && $mtime == 500000000 + $delta) {
-        pass('atime');
-        pass('mtime');
-    }
-    else {
-        if ($^O =~ /\blinux\b/i) {
-            print "# Maybe stat() cannot get the correct atime, ".
-                  "as happens via NFS on linux?\n";
-            $foo = (utime 400000000,500000000 + 2*$delta,'b');
-            my ($new_atime, $new_mtime) = (stat('b'))[8,9];
-            print "# newatime - $new_atime  nemtime - $new_mtime\n";
-            if ($new_atime == $atime && $new_mtime - $mtime == $delta) {
-                pass("atime - accounted for possible NFS/glibc2.2 bug on linux");
-                pass("mtime - accounted for possible NFS/glibc2.2 bug on linux");
-            }
-            else {
-                fail("atime - $atime/$new_atime $mtime/$new_mtime");
-                fail("mtime - $atime/$new_atime $mtime/$new_mtime");
-            }
-        }
-        elsif ($^O eq 'VMS') {
-            # why is this 1 second off?
-            is( $atime, 500000001,          'atime' );
-            is( $mtime, 500000000 + $delta, 'mtime' );
-        }
-        elsif ($^O eq 'beos') {
-            SKIP: { skip "atime not updated", 1; }
-            is($mtime, 500000001, 'mtime');
-        }
-        else {
-            fail("atime");
-            fail("mtime");
-        }
+	print "# atime - $atime  mtime - $mtime  delta - $delta\n";
+	if($atime == 500000000 && $mtime == 500000000 + $delta) {
+	    pass('atime');
+	    pass('mtime');
+	}
+	else {
+	    if ($^O =~ /\blinux\b/i) {
+		print "# Maybe stat() cannot get the correct atime, ".
+		    "as happens via NFS on linux?\n";
+		$foo = (utime 400000000,500000000 + 2*$delta,'b');
+		my ($new_atime, $new_mtime) = (stat('b'))[8,9];
+		print "# newatime - $new_atime  nemtime - $new_mtime\n";
+		if ($new_atime == $atime && $new_mtime - $mtime == $delta) {
+		    pass("atime - accounted for possible NFS/glibc2.2 bug on linux");
+		    pass("mtime - accounted for possible NFS/glibc2.2 bug on linux");
+		}
+		else {
+		    fail("atime - $atime/$new_atime $mtime/$new_mtime");
+		    fail("mtime - $atime/$new_atime $mtime/$new_mtime");
+		}
+	    }
+	    elsif ($^O eq 'VMS') {
+		# why is this 1 second off?
+		is( $atime, 500000001,          'atime' );
+		is( $mtime, 500000000 + $delta, 'mtime' );
+	    }
+	    elsif ($^O eq 'beos') {
+            SKIP: {
+		    skip "atime not updated", 1;
+		}
+		is($mtime, 500000001, 'mtime');
+	    }
+	    else {
+		fail("atime");
+		fail("mtime");
+	    }
+	}
     }
 }
-}
 
 SKIP: {
     skip "has futimes", 1 if ($Config{d_futimes} || "") eq "define";
@@ -422,7 +426,8 @@ if ($^O eq 'VMS') {
     `set file tmp.dir/protection=o:d`;
     ok(rename('tmp.dir', 'tmp1.dir'), "rename on directories") ||
       print "# errno: $!\n";
-} else {
+}
+else {
     ok(rename('tmp', 'tmp1'), "rename on directories");
 }