From 7e1af8bca57f405a8444b575a870918a6d88fc5c Mon Sep 17 00:00:00 2001 From: Perl 5 Porters Date: Fri, 20 Dec 1996 11:14:00 +1200 Subject: [inseparable changes from patch from perl5.003_12 to perl5.003_13] DOCUMENTATION Subject: small doc tweaks for _12 Date: Thu, 19 Dec 1996 11:05:57 -0500 From: Roderick Schertler Files: lib/UNIVERSAL.pm pod/perldiag.pod pod/perltie.pod Msg-ID: <1826.851011557@eeyore.ibcinc.com> (applied based on p5p patch as commit 3314ffc68a11690bd9977cbdd7ea0601ad6ced13) PORTABILITY Subject: Add missing backslash in Configure From: Chip Salzenberg Files: Configure UTILITIES, LIBRARY, AND EXTENSIONS Subject: Include libnet-1.01 instead of old Net::FTP From: Graham Barr Files: MANIFEST lib/Net/Cmd.pm lib/Net/Domain.pm lib/Net/DummyInetd.pm lib/Net/FTP.pm lib/Net/NNTP.pm lib/Net/Netrc.pm lib/Net/POP3.pm lib/Net/SMTP.pm lib/Net/SNPP.pm lib/Net/Socket.pm lib/Net/Telnet.pm lib/Net/Time.pm pod/perlmod.pod Subject: Use binmode when doing binary FTP From: Ilya Zakharevich Files: lib/Net/FTP.pm Subject: Re: Open3.pm tries to close unopened file handle Date: 18 Dec 1996 22:19:54 -0500 From: Roderick Schertler Files: MANIFEST lib/IPC/Open2.pm lib/IPC/Open3.pm lib/open2.pl lib/open3.pl pod/perldiag.pod pod/perlfunc.pod t/lib/open2.t t/lib/open3.t Msg-ID: (applied based on p5p patch as commit 982b4e8fc47473059e209787b589853f4c8f8f9e) Subject: Long-standing problem in Socket module Date: Wed, 18 Dec 1996 23:18:14 -0500 From: Spider Boardman Files: Configure Porting/Glossary config_H config_h.SH ext/Socket/Socket.pm ext/Socket/Socket.xs Msg-ID: <199612190418.XAA07291@Orb.Nashua.NH.US> (applied based on p5p patch as commit 3e6a22d2723daf415793f9a4fc1b57f4d8a576fd) Subject: flock() constants Date: Thu, 19 Dec 1996 01:37:17 -0500 From: Roderick Schertler Files: ext/Fcntl/Fcntl.pm ext/Fcntl/Fcntl.xs pod/perlfunc.pod Msg-ID: <26669.850977437@eeyore.ibcinc.com> (applied based on p5p patch as commit 3dea0e15e4684f6defe2f25a16bc696b96697ac2) --- ext/Fcntl/Fcntl.pm | 17 +++++++++++++++-- ext/Fcntl/Fcntl.xs | 31 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) (limited to 'ext/Fcntl') diff --git a/ext/Fcntl/Fcntl.pm b/ext/Fcntl/Fcntl.pm index 9d000a1e68..489853416d 100644 --- a/ext/Fcntl/Fcntl.pm +++ b/ext/Fcntl/Fcntl.pm @@ -7,6 +7,7 @@ Fcntl - load the C Fcntl.h defines =head1 SYNOPSIS use Fcntl; + use Fcntl qw(:DEFAULT :flock); =head1 DESCRIPTION @@ -21,14 +22,21 @@ far more likely chance of getting the numbers right. Only C<#define> symbols get translated; you must still correctly 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. + =cut -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD); +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $AUTOLOAD); require Exporter; require DynaLoader; @ISA = qw(Exporter DynaLoader); -$VERSION = "1.00"; +$VERSION = "1.01"; # Items to export into callers namespace by default # (move infrequently used names to @EXPORT_OK below) @EXPORT = @@ -42,6 +50,11 @@ $VERSION = "1.00"; ); # Other items we are prepared to export if requested @EXPORT_OK = qw( + LOCK_SH LOCK_EX LOCK_NB LOCK_UN +); +# Named groups of exports +%EXPORT_TAGS = ( + 'flock' => [qw(LOCK_SH LOCK_EX LOCK_NB LOCK_UN)], ); sub AUTOLOAD { diff --git a/ext/Fcntl/Fcntl.xs b/ext/Fcntl/Fcntl.xs index 90f3af5028..0f51b100d7 100644 --- a/ext/Fcntl/Fcntl.xs +++ b/ext/Fcntl/Fcntl.xs @@ -115,6 +115,37 @@ int arg; goto not_there; #endif break; + case 'L': + if (strnEQ(name, "LOCK_", 5)) { + /* We support flock() on systems which don't have it, so + always supply the constants. */ + if (strEQ(name, "LOCK_SH")) +#ifdef LOCK_SH + return LOCK_SH; +#else + return 1; +#endif + if (strEQ(name, "LOCK_EX")) +#ifdef LOCK_EX + return LOCK_EX; +#else + return 2; +#endif + if (strEQ(name, "LOCK_NB")) +#ifdef LOCK_NB + return LOCK_NB; +#else + return 4; +#endif + if (strEQ(name, "LOCK_UN")) +#ifdef LOCK_UN + return LOCK_UN; +#else + return 8; +#endif + } else + goto not_there; + break; case 'O': if (strnEQ(name, "O_", 2)) { if (strEQ(name, "O_CREAT")) -- cgit v1.2.1