X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FFcntl%2FFcntl.pm;h=83edeb60d855f24b01b5ea669e89b05e68f13554;hb=500a801928e3d02ca64835521d3b82c60838e663;hp=92103a1eaf545caa30b21e43bab4f4fae13db500;hpb=ee8c7f5465f003860e2347a2946abacac39bd9b9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/Fcntl/Fcntl.pm b/ext/Fcntl/Fcntl.pm
index 92103a1..83edeb6 100644
--- a/ext/Fcntl/Fcntl.pm
+++ b/ext/Fcntl/Fcntl.pm
@@ -11,8 +11,8 @@ Fcntl - load the C Fcntl.h defines
 
 =head1 DESCRIPTION
 
-This module is just a translation of the C F<fnctl.h> file.
-Unlike the old mechanism of requiring a translated F<fnctl.ph>
+This module is just a translation of the C F<fcntl.h> file.
+Unlike the old mechanism of requiring a translated F<fcntl.ph>
 file, this uses the B<h2xs> program (see the Perl source distribution)
 and your native C compiler.  This means that it has a 
 far more likely chance of getting the numbers right.
@@ -55,12 +55,16 @@ See L<perlfunc/stat> about the S_I* constants.
 
 =cut
 
+use strict;
 our($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $AUTOLOAD);
 
 require Exporter;
 use XSLoader ();
 @ISA = qw(Exporter);
-$VERSION = "1.03";
+BEGIN {
+  $VERSION = "1.06";
+}
+
 # Items to export into callers namespace by default
 # (move infrequently used names to @EXPORT_OK below)
 @EXPORT =
@@ -137,6 +141,13 @@ $VERSION = "1.03";
 
 # Other items we are prepared to export if requested
 @EXPORT_OK = qw(
+	DN_ACCESS
+	DN_ATTRIB
+	DN_CREATE
+	DN_DELETE
+	DN_MODIFY
+	DN_MULTISHOT
+	DN_RENAME
 	FAPPEND
 	FASYNC
 	FCREAT
@@ -149,22 +160,35 @@ $VERSION = "1.03";
 	FRSYNC
 	FSYNC
 	FTRUNC
+	F_GETLEASE
+	F_GETSIG
+	F_NOTIFY
+	F_SETLEASE
+	F_SETSIG
 	LOCK_EX
+	LOCK_MAND
 	LOCK_NB
+	LOCK_READ
+	LOCK_RW
 	LOCK_SH
 	LOCK_UN
-	S_ISUID S_ISGID S_ISVTX S_ISTXT
-	_S_IFMT S_IFREG S_IFDIR S_IFLNK
+	LOCK_WRITE
+	O_IGNORE_CTTY
+	O_NOATIME
+	O_NOLINK
+	O_NOTRANS
+	SEEK_CUR
+	SEEK_END
+	SEEK_SET
 	S_IFSOCK S_IFBLK S_IFCHR S_IFIFO S_IFWHT S_ENFMT
-	S_IRUSR S_IWUSR S_IXUSR S_IRWXU
+	S_IREAD S_IWRITE S_IEXEC
 	S_IRGRP S_IWGRP S_IXGRP S_IRWXG
 	S_IROTH S_IWOTH S_IXOTH S_IRWXO
-	S_IREAD S_IWRITE S_IEXEC
+	S_IRUSR S_IWUSR S_IXUSR S_IRWXU
+	S_ISUID S_ISGID S_ISVTX S_ISTXT
+	_S_IFMT S_IFREG S_IFDIR S_IFLNK
 	&S_ISREG &S_ISDIR &S_ISLNK &S_ISSOCK &S_ISBLK &S_ISCHR &S_ISFIFO
 	&S_ISWHT &S_ISENFMT &S_IFMT &S_IMODE
-	SEEK_SET
-	SEEK_CUR
-	SEEK_END
 );
 # Named groups of exports
 %EXPORT_TAGS = (
@@ -186,6 +210,11 @@ $VERSION = "1.03";
                   )],
 );
 
+# Force the constants to become inlined
+BEGIN {
+  XSLoader::load 'Fcntl', $VERSION;
+}
+
 sub S_IFMT  { @_ ? ( $_[0] & _S_IFMT() ) : _S_IFMT()  }
 sub S_IMODE { $_[0] & 07777 }
 
@@ -201,22 +230,15 @@ sub S_ISENFMT  { ( $_[0] & _S_IFMT() ) == S_IFENFMT() }
 
 sub AUTOLOAD {
     (my $constname = $AUTOLOAD) =~ s/.*:://;
-    my $val = constant($constname, 0);
-    if ($! != 0) {
-	if ($! =~ /Invalid/ || $!{EINVAL}) {
-	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
-	    goto &AutoLoader::AUTOLOAD;
-	}
-	else {
-	    my ($pack,$file,$line) = caller;
-	    die "Your vendor has not defined Fcntl macro $constname, used at $file line $line.
-";
-	}
+    die "&Fcntl::constant not defined" if $constname eq 'constant';
+    my ($error, $val) = constant($constname);
+    if ($error) {
+        my (undef,$file,$line) = caller;
+        die "$error at $file line $line.\n";
     }
+    no strict 'refs';
     *$AUTOLOAD = sub { $val };
     goto &$AUTOLOAD;
 }
 
-XSLoader::load 'Fcntl', $VERSION;
-
 1;