Merge maint-5.004 branch (5.004_01) with mainline.

p4raw-id: //depot/perl@84

5 files changed, 89 insertions, 10 deletions

diff --git a/ext/DynaLoader/dl_aix.xs b/ext/DynaLoader/dl_aix.xs
index bdf33b2410..746666636a 100644
--- a/ext/DynaLoader/dl_aix.xs
+++ b/ext/DynaLoader/dl_aix.xs
@@ -29,6 +29,12 @@
 #include <a.out.h>
 #include <ldfcn.h>
 
+/* If using PerlIO, redefine these macros from <ldfcn.h> */
+#ifdef USE_PERLIO
+#define FSEEK(ldptr,o,p)        PerlIO_seek(IOPTR(ldptr),(p==BEGINNING)?(OFFSET(ldptr)+o):o,p)
+#define FREAD(p,s,n,ldptr)      PerlIO_read(IOPTR(ldptr),p,s*n)
+#endif
+
 /*
  * We simulate dlopen() et al. through a call to load. Because AIX has
  * no call to find an exported symbol we read the loader section of the
@@ -389,7 +395,13 @@ static int readExports(ModulePtr mp)
 			;
 		return -1;
 	}
+/* This first case is a hack, since it assumes that the 3rd parameter to
+   FREAD is 1. See the redefinition of FREAD above to see how this works. */
+#ifdef USE_PERLIO
+	if (FREAD(ldbuf, sh.s_size, 1, ldp) != sh.s_size) {
+#else
 	if (FREAD(ldbuf, sh.s_size, 1, ldp) != 1) {
+#endif
 		errvalid++;
 		strcpy(errbuf, "readExports: cannot read loader section");
 		safefree(ldbuf);
diff --git a/ext/Fcntl/Fcntl.pm b/ext/Fcntl/Fcntl.pm
index 678b7fd897..6214323c31 100644
--- a/ext/Fcntl/Fcntl.pm
+++ b/ext/Fcntl/Fcntl.pm
@@ -24,10 +24,18 @@ pack up your own arguments to pass as args for locking functions, etc.
 
 =head1 EXPORTED SYMBOLS
 
-By default your system's F_* and O_* constants (eg, F_DUPFD and O_CREAT)
-are exported into your namespace.  You can request that the flock()
-constants (LOCK_SH, LOCK_EX, LOCK_NB and LOCK_UN) be provided by using
-the tag C<:flock>.  See L<Exporter>.
+By default your system's F_* and O_* constants (eg, F_DUPFD and
+O_CREAT) and the FD_CLOEXEC constant are exported into your namespace.
+
+You can request that the flock() constants (LOCK_SH, LOCK_EX, LOCK_NB
+and LOCK_UN) be provided by using the tag C<:flock>.  See L<Exporter>.
+
+You can request that the old constants (FAPPEND, FASYNC, FCREAT,
+FDEFER, FEXCL, FNDELAY, FNONBLOCK, FSYNC, FTRUNC) be provided for
+compatibility reasons by using the tag C<:Fcompat>.  For new
+applications the newer versions of these constants are suggested
+(O_APPEND, O_ASYNC, O_CREAT, O_DEFER, O_EXCL, O_NDELAY, O_NONBLOCK,
+O_SYNC, O_TRUNC).
 
 Please refer to your native fcntl() and open() documentation to see
 what constants are implemented in your system.
@@ -45,11 +53,12 @@ $VERSION = "1.03";
 @EXPORT =
   qw(
      F_DUPFD F_GETFD F_GETLK F_SETFD F_GETFL F_SETFL F_SETLK F_SETLKW
-     FD_CLOEXEC F_RDLCK F_UNLCK F_WRLCK
+     FD_CLOEXEC F_RDLCK F_UNLCK F_WRLCK F_POSIX
      O_CREAT O_EXCL O_NOCTTY O_TRUNC
      O_APPEND O_NONBLOCK
      O_NDELAY O_DEFER
      O_RDONLY O_RDWR O_WRONLY
+     O_BINARY O_TEXT
      O_EXLOCK O_SHLOCK O_ASYNC O_DSYNC O_RSYNC O_SYNC
      F_SETOWN F_GETOWN
      );
@@ -57,10 +66,13 @@ $VERSION = "1.03";
 # Other items we are prepared to export if requested
 @EXPORT_OK = qw(
     LOCK_SH LOCK_EX LOCK_NB LOCK_UN
+    FAPPEND FASYNC FCREAT FDEFER FEXCL FNDELAY FNONBLOCK FSYNC FTRUNC
 );
 # Named groups of exports
 %EXPORT_TAGS = (
-    'flock' => [qw(LOCK_SH LOCK_EX LOCK_NB LOCK_UN)],
+    'flock'   => [qw(LOCK_SH LOCK_EX LOCK_NB LOCK_UN)],
+    'Fcompat' => [qw(FAPPEND FASYNC FCREAT FDEFER FEXCL
+	               FNDELAY FNONBLOCK FSYNC FTRUNC)],
 );
 
 sub AUTOLOAD {
diff --git a/ext/Fcntl/Fcntl.xs b/ext/Fcntl/Fcntl.xs
index a94864332e..9034031c9c 100644
--- a/ext/Fcntl/Fcntl.xs
+++ b/ext/Fcntl/Fcntl.xs
@@ -75,6 +75,12 @@ int arg;
 #else
 	        goto not_there;
 #endif
+	    if (strEQ(name, "F_POSIX"))
+#ifdef F_POSIX
+	        return F_POSIX;
+#else
+	        goto not_there;
+#endif
 	    if (strEQ(name, "F_SETFL"))
 #ifdef F_SETFL
 	        return F_SETFL;
@@ -119,13 +125,61 @@ int arg;
 #endif
 	    errno = EINVAL;
 	    return 0;
-	} else
-	  if (strEQ(name, "FD_CLOEXEC"))
+	}
+        if (strEQ(name, "FAPPEND"))
+#ifdef FAPPEND
+            return FAPPEND;
+#else
+            goto not_there;
+#endif
+        if (strEQ(name, "FASYNC"))
+#ifdef FASYNC
+            return FASYNC;
+#else
+            goto not_there;
+#endif
+        if (strEQ(name, "FCREAT"))
+#ifdef FCREAT
+            return FCREAT;
+#else
+            goto not_there;
+#endif
+	if (strEQ(name, "FD_CLOEXEC"))
 #ifdef FD_CLOEXEC
 	    return FD_CLOEXEC;
 #else
 	    goto not_there;
 #endif
+        if (strEQ(name, "FEXCL"))
+#ifdef FEXCL
+            return FEXCL;
+#else
+            goto not_there;
+#endif
+        if (strEQ(name, "FNDELAY"))
+#ifdef FNDELAY
+            return FNDELAY;
+#else
+            goto not_there;
+#endif
+        if (strEQ(name, "FNONBLOCK"))
+#ifdef FNONBLOCK
+            return FNONBLOCK;
+#else
+            goto not_there;
+#endif
+        if (strEQ(name, "FSYNC"))
+#ifdef FSYNC
+            return FSYNC;
+#else
+            goto not_there;
+#endif
+        if (strEQ(name, "FTRUNC"))
+#ifdef FTRUNC
+            return FTRUNC;
+#else
+            goto not_there;
+#endif
 	break;
     case 'L':
     	if (strnEQ(name, "LOCK_", 5)) {
diff --git a/ext/SDBM_File/Makefile.PL b/ext/SDBM_File/Makefile.PL
index 210879f90b..02dfd7d84f 100644
--- a/ext/SDBM_File/Makefile.PL
+++ b/ext/SDBM_File/Makefile.PL
@@ -5,11 +5,11 @@ use ExtUtils::MakeMaker;
 #	config, all, clean, realclean and sdbm/Makefile
 # which perform the corresponding actions in the subdirectory.
 
-$define = ($^O eq 'MSWin32') ? '/D "MSDOS"' : '';
+$define = ($^O eq 'MSWin32') ? '-DMSDOS' : '';
 
 WriteMakefile(
     NAME	=> 'SDBM_File',
-    MYEXTLIB => 'sdbm/libsdbm$(LIB_EXT)',
+    MYEXTLIB => 'sdbm'.($^O eq 'MSWin32' ? '\\' : '/').'libsdbm$(LIB_EXT)',
     MAN3PODS 	=> ' ', 	# Pods will be built by installman.
     XSPROTOARG => '-noprototypes', 		# XXX remove later?
     VERSION_FROM => 'SDBM_File.pm',
diff --git a/ext/SDBM_File/sdbm/Makefile.PL b/ext/SDBM_File/sdbm/Makefile.PL
index 21ad7576c3..50fd83eb25 100644
--- a/ext/SDBM_File/sdbm/Makefile.PL
+++ b/ext/SDBM_File/sdbm/Makefile.PL
@@ -7,6 +7,7 @@ WriteMakefile(
     NAME      => 'sdbm', # (doesn't matter what the name is here) oh yes it does
     LINKTYPE  => 'static',
     DEFINE    => $define,
+    INC       => '-I$(PERL_INC)', # force PERL_INC dir ahead of system -I's
     SKIP      => [qw(dynamic dynamic_lib)],
     OBJECT    => '$(O_FILES)',
     clean     => {'FILES' => 'dbu libsdbm.a dbd dba dbe x-dbu *.dir *.pag'},