s/use vars/our/g modules that aren't independently maintained on CPAN

[p5sagit/p5-mst-13.2.git] / ext / POSIX / POSIX.pm

diff --git a/ext/POSIX/POSIX.pm b/ext/POSIX/POSIX.pm
index ce315dc..59c753c 100644 (file)
--- a/ext/POSIX/POSIX.pm
+++ b/ext/POSIX/POSIX.pm
@@ -1,6 +1,6 @@
 package POSIX;
 
-use vars qw($VERSION @ISA %EXPORT_TAGS @EXPORT_OK $AUTOLOAD); 
+our(@ISA, %EXPORT_TAGS, @EXPORT_OK, $AUTOLOAD) = ();
 
 use Carp;
 use AutoLoader;
@@ -8,10 +8,10 @@ require Config;
 use Symbol;
 
 require Exporter;
-require DynaLoader;
-@ISA = qw(Exporter DynaLoader);
+use XSLoader ();
+@ISA = qw(Exporter);
 
-$VERSION = "1.00" ;
+our $VERSION = "1.03" ;
 
 %EXPORT_TAGS = (
 
@@ -68,7 +68,7 @@ $VERSION = "1.00" ;
                _POSIX_LINK_MAX _POSIX_MAX_CANON _POSIX_MAX_INPUT
                _POSIX_NAME_MAX _POSIX_NGROUPS_MAX _POSIX_OPEN_MAX
                _POSIX_PATH_MAX _POSIX_PIPE_BUF _POSIX_SSIZE_MAX
-               _POSIX_STREADM_MAX _POSIX_TZNAME_MAX)],
+               _POSIX_STREAM_MAX _POSIX_TZNAME_MAX)],
 
     locale_h =>        [qw(LC_ALL LC_COLLATE LC_CTYPE LC_MONETARY LC_NUMERIC
                LC_TIME NULL localeconv setlocale)],
@@ -161,7 +161,10 @@ $VERSION = "1.00" ;
 
 );
 
-Exporter::export_tags();
+# Exporter::export_tags();
+for (values %EXPORT_TAGS) {
+  push @EXPORT, @$_;
+}
 
 @EXPORT_OK = qw(
     closedir opendir readdir rewinddir
@@ -179,6 +182,7 @@ Exporter::export_tags();
     alarm chdir chown close fork getlogin getppid getpgrp link
        pipe read rmdir sleep unlink write
     utime
+    nice
 );
 
 # Grandfather old foo_h form to new :foo_h form
@@ -190,7 +194,7 @@ sub import {
 }
 
 
-bootstrap POSIX $VERSION;
+XSLoader::load 'POSIX', $VERSION;
 
 my $EINVAL = constant("EINVAL", 0);
 my $EAGAIN = constant("EAGAIN", 0);
@@ -267,25 +271,25 @@ sub toupper {
 
 sub closedir {
     usage "closedir(dirhandle)" if @_ != 1;
-    closedir($_[0]);
+    CORE::closedir($_[0]);
 }
 
 sub opendir {
     usage "opendir(directory)" if @_ != 1;
     my $dirhandle = gensym;
-    opendir($dirhandle, $_[0])
+    CORE::opendir($dirhandle, $_[0])
        ? $dirhandle
        : undef;
 }
 
 sub readdir {
     usage "readdir(dirhandle)" if @_ != 1;
-    readdir($_[0]);
+    CORE::readdir($_[0]);
 }
 
 sub rewinddir {
     usage "rewinddir(dirhandle)" if @_ != 1;
-    rewinddir($_[0]);
+    CORE::rewinddir($_[0]);
 }
 
 sub errno {
@@ -300,42 +304,42 @@ sub creat {
 
 sub fcntl {
     usage "fcntl(filehandle, cmd, arg)" if @_ != 3;
-    fcntl($_[0], $_[1], $_[2]);
+    CORE::fcntl($_[0], $_[1], $_[2]);
 }
 
 sub getgrgid {
     usage "getgrgid(gid)" if @_ != 1;
-    getgrgid($_[0]);
+    CORE::getgrgid($_[0]);
 }
 
 sub getgrnam {
     usage "getgrnam(name)" if @_ != 1;
-    getgrnam($_[0]);
+    CORE::getgrnam($_[0]);
 }
 
 sub atan2 {
     usage "atan2(x,y)" if @_ != 2;
-    atan2($_[0], $_[1]);
+    CORE::atan2($_[0], $_[1]);
 }
 
 sub cos {
     usage "cos(x)" if @_ != 1;
-    cos($_[0]);
+    CORE::cos($_[0]);
 }
 
 sub exp {
     usage "exp(x)" if @_ != 1;
-    exp($_[0]);
+    CORE::exp($_[0]);
 }
 
 sub fabs {
     usage "fabs(x)" if @_ != 1;
-    abs($_[0]);
+    CORE::abs($_[0]);
 }
 
 sub log {
     usage "log(x)" if @_ != 1;
-    log($_[0]);
+    CORE::log($_[0]);
 }
 
 sub pow {
@@ -345,22 +349,22 @@ sub pow {
 
 sub sin {
     usage "sin(x)" if @_ != 1;
-    sin($_[0]);
+    CORE::sin($_[0]);
 }
 
 sub sqrt {
     usage "sqrt(x)" if @_ != 1;
-    sqrt($_[0]);
+    CORE::sqrt($_[0]);
 }
 
 sub getpwnam {
     usage "getpwnam(name)" if @_ != 1;
-    getpwnam($_[0]);
+    CORE::getpwnam($_[0]);
 }
 
 sub getpwuid {
     usage "getpwuid(uid)" if @_ != 1;
-    getpwuid($_[0]);
+    CORE::getpwuid($_[0]);
 }
 
 sub longjmp {
@@ -381,12 +385,12 @@ sub sigsetjmp {
 
 sub kill {
     usage "kill(pid, sig)" if @_ != 2;
-    kill $_[1], $_[0];
+    CORE::kill $_[1], $_[0];
 }
 
 sub raise {
     usage "raise(sig)" if @_ != 1;
-    kill $$, $_[0];    # Is this good enough?
+    CORE::kill $_[0], $$;      # Is this good enough?
 }
 
 sub offsetof {
@@ -479,12 +483,12 @@ sub fwrite {
 
 sub getc {
     usage "getc(handle)" if @_ != 1;
-    getc($_[0]);
+    CORE::getc($_[0]);
 }
 
 sub getchar {
     usage "getchar()" if @_ != 0;
-    getc(STDIN);
+    CORE::getc(STDIN);
 }
 
 sub gets {
@@ -499,7 +503,7 @@ sub perror {
 
 sub printf {
     usage "printf(pattern, args...)" if @_ < 1;
-    printf STDOUT @_;
+    CORE::printf STDOUT @_;
 }
 
 sub putc {
@@ -516,17 +520,17 @@ sub puts {
 
 sub remove {
     usage "remove(filename)" if @_ != 1;
-    unlink($_[0]);
+    CORE::unlink($_[0]);
 }
 
 sub rename {
     usage "rename(oldfilename, newfilename)" if @_ != 2;
-    rename($_[0], $_[1]);
+    CORE::rename($_[0], $_[1]);
 }
 
 sub rewind {
     usage "rewind(filehandle)" if @_ != 1;
-    seek($_[0],0,0);
+    CORE::seek($_[0],0,0);
 }
 
 sub scanf {
@@ -535,7 +539,7 @@ sub scanf {
 
 sub sprintf {
     usage "sprintf(pattern,args)" if @_ == 0;
-    sprintf(shift,@_);
+    CORE::sprintf(shift,@_);
 }
 
 sub sscanf {
@@ -564,7 +568,7 @@ sub vsprintf {
 
 sub abs {
     usage "abs(x)" if @_ != 1;
-    abs($_[0]);
+    CORE::abs($_[0]);
 }
 
 sub atexit {
@@ -597,7 +601,7 @@ sub div {
 
 sub exit {
     usage "exit(status)" if @_ != 1;
-    exit($_[0]);
+    CORE::exit($_[0]);
 }
 
 sub free {
@@ -639,7 +643,7 @@ sub srand {
 
 sub system {
     usage "system(command)" if @_ != 1;
-    system($_[0]);
+    CORE::system($_[0]);
 }
 
 sub memchr {
@@ -718,7 +722,7 @@ sub strspn {
 
 sub strstr {
     usage "strstr(big, little)" if @_ != 2;
-    index($_[0], $_[1]);
+    CORE::index($_[0], $_[1]);
 }
 
 sub strtok {
@@ -727,71 +731,71 @@ sub strtok {
 
 sub chmod {
     usage "chmod(mode, filename)" if @_ != 2;
-    chmod($_[0], $_[1]);
+    CORE::chmod($_[0], $_[1]);
 }
 
 sub fstat {
     usage "fstat(fd)" if @_ != 1;
     local *TMP;
     open(TMP, "<&$_[0]");              # Gross.
-    my @l = stat(TMP);
+    my @l = CORE::stat(TMP);
     close(TMP);
     @l;
 }
 
 sub mkdir {
     usage "mkdir(directoryname, mode)" if @_ != 2;
-    mkdir($_[0], $_[1]);
+    CORE::mkdir($_[0], $_[1]);
 }
 
 sub stat {
     usage "stat(filename)" if @_ != 1;
-    stat($_[0]);
+    CORE::stat($_[0]);
 }
 
 sub umask {
     usage "umask(mask)" if @_ != 1;
-    umask($_[0]);
+    CORE::umask($_[0]);
 }
 
 sub wait {
     usage "wait()" if @_ != 0;
-    wait();
+    CORE::wait();
 }
 
 sub waitpid {
     usage "waitpid(pid, options)" if @_ != 2;
-    waitpid($_[0], $_[1]);
+    CORE::waitpid($_[0], $_[1]);
 }
 
 sub gmtime {
     usage "gmtime(time)" if @_ != 1;
-    gmtime($_[0]);
+    CORE::gmtime($_[0]);
 }
 
 sub localtime {
     usage "localtime(time)" if @_ != 1;
-    localtime($_[0]);
+    CORE::localtime($_[0]);
 }
 
 sub time {
     usage "time()" if @_ != 0;
-    time;
+    CORE::time;
 }
 
 sub alarm {
     usage "alarm(seconds)" if @_ != 1;
-    alarm($_[0]);
+    CORE::alarm($_[0]);
 }
 
 sub chdir {
     usage "chdir(directory)" if @_ != 1;
-    chdir($_[0]);
+    CORE::chdir($_[0]);
 }
 
 sub chown {
     usage "chown(filename, uid, gid)" if @_ != 3;
-    chown($_[0], $_[1], $_[2]);
+    CORE::chown($_[0], $_[1], $_[2]);
 }
 
 sub execl {
@@ -820,13 +824,20 @@ sub execvp {
 
 sub fork {
     usage "fork()" if @_ != 0;
-    fork;
+    CORE::fork;
 }
 
 sub getcwd
 {
     usage "getcwd()" if @_ != 0;
-    chop($cwd = `pwd`);
+    if ($^O eq 'MSWin32') {
+       # this perhaps applies to everyone else also?
+       require Cwd;
+       $cwd = &Cwd::cwd;
+    }
+    else {
+       chop($cwd = `pwd`);
+    }
     $cwd;
 }
 
@@ -853,12 +864,12 @@ sub getgroups {
 
 sub getlogin {
     usage "getlogin()" if @_ != 0;
-    getlogin();
+    CORE::getlogin();
 }
 
 sub getpgrp {
     usage "getpgrp()" if @_ != 0;
-    getpgrp($_[0]);
+    CORE::getpgrp;
 }
 
 sub getpid {
@@ -868,7 +879,7 @@ sub getpid {
 
 sub getppid {
     usage "getppid()" if @_ != 0;
-    getppid;
+    CORE::getppid;
 }
 
 sub getuid {
@@ -883,12 +894,16 @@ sub isatty {
 
 sub link {
     usage "link(oldfilename, newfilename)" if @_ != 2;
-    link($_[0], $_[1]);
+    CORE::link($_[0], $_[1]);
 }
 
 sub rmdir {
     usage "rmdir(directoryname)" if @_ != 1;
-    rmdir($_[0]);
+    CORE::rmdir($_[0]);
+}
+
+sub setbuf {
+    redef "IO::Handle::setbuf()";
 }
 
 sub setgid {
@@ -901,18 +916,22 @@ sub setuid {
     $< = $_[0];
 }
 
+sub setvbuf {
+    redef "IO::Handle::setvbuf()";
+}
+
 sub sleep {
     usage "sleep(seconds)" if @_ != 1;
-    sleep($_[0]);
+    CORE::sleep($_[0]);
 }
 
 sub unlink {
     usage "unlink(filename)" if @_ != 1;
-    unlink($_[0]);
+    CORE::unlink($_[0]);
 }
 
 sub utime {
     usage "utime(filename, atime, mtime)" if @_ != 3;
-    utime($_[1], $_[2], $_[0]);
+    CORE::utime($_[1], $_[2], $_[0]);
 }