summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hartmann <ian@gentoo.org>2006-06-25 12:48:46 +0000
committerChristian Hartmann <ian@gentoo.org>2006-06-25 12:48:46 +0000
commitea4dfd7ddb81d0a4ef158d02eb88daf2b2664b48 (patch)
treea15fec6c3be377aabd946e1ae59202edbea2c287 /dev-lang/perl/files
parentRemoved obsolete patchfiles (diff)
downloadhistorical-ea4dfd7ddb81d0a4ef158d02eb88daf2b2664b48.tar.gz
historical-ea4dfd7ddb81d0a4ef158d02eb88daf2b2664b48.tar.bz2
historical-ea4dfd7ddb81d0a4ef158d02eb88daf2b2664b48.zip
Removed obsolete patchfiles #2
Package-Manager: portage-2.1.1_pre1-r2
Diffstat (limited to 'dev-lang/perl/files')
-rw-r--r--dev-lang/perl/files/CAN-2005-0156-suid.patch20
-rw-r--r--dev-lang/perl/files/CAN-2005-0448-rmtree.patch279
-rw-r--r--dev-lang/perl/files/file_path_rmtree.patch29
-rw-r--r--dev-lang/perl/files/perl-5.8.4-NDBM-GDBM-compat.patch10
-rw-r--r--dev-lang/perl/files/perl-5.8.5-tempfiles.patch60
-rw-r--r--dev-lang/perl/files/perl-5.8.6-tempfiles.patch60
-rw-r--r--dev-lang/perl/files/perl-tempfiles.patch60
-rw-r--r--dev-lang/perl/files/perl-uclibc.patch15
8 files changed, 0 insertions, 533 deletions
diff --git a/dev-lang/perl/files/CAN-2005-0156-suid.patch b/dev-lang/perl/files/CAN-2005-0156-suid.patch
deleted file mode 100644
index 8305cdb4415e..000000000000
--- a/dev-lang/perl/files/CAN-2005-0156-suid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- perlio.c.orig 2005-02-04 17:29:22.196825296 -0500
-+++ perlio.c 2005-02-04 17:31:42.538687640 -0500
-@@ -448,7 +448,7 @@
- va_list ap;
- dSYS;
- va_start(ap, fmt);
-- if (!dbg) {
-+ if (!dbg && !PL_tainting && PL_uid == PL_euid && PL_gid == PL_egid) {
- char *s = PerlEnv_getenv("PERLIO_DEBUG");
- if (s && *s)
- dbg = PerlLIO_open3(s, O_WRONLY | O_CREAT | O_APPEND, 0666);
-@@ -465,7 +465,7 @@
- s = CopFILE(PL_curcop);
- if (!s)
- s = "(none)";
-- sprintf(buffer, "%s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
-+ sprintf(buffer, "%.40s:%" IVdf " ", s, (IV) CopLINE(PL_curcop));
- len = strlen(buffer);
- vsprintf(buffer+len, fmt, ap);
- PerlLIO_write(dbg, buffer, strlen(buffer));
diff --git a/dev-lang/perl/files/CAN-2005-0448-rmtree.patch b/dev-lang/perl/files/CAN-2005-0448-rmtree.patch
deleted file mode 100644
index 602a4ad57bcd..000000000000
--- a/dev-lang/perl/files/CAN-2005-0448-rmtree.patch
+++ /dev/null
@@ -1,279 +0,0 @@
---- Path.pm.old
-+++ Path.pm
-@@ -72,27 +72,17 @@
-
- =item *
-
--a boolean value, which if TRUE will cause C<rmtree> to
--skip any files to which you do not have delete access
--(if running under VMS) or write access (if running
--under another OS). This will change in the future when
--a criterion for 'delete permission' under OSs other
--than VMS is settled. (defaults to FALSE)
-+a boolean value, which if FALSE (the default for non-root users) will
-+cause C<rmtree> to adjust the mode of directories (if required) prior
-+to attempting to remove the contents. Note that on interruption or
-+failure of C<rmtree>, directories may be left with more permissive
-+modes for the owner.
-
- =back
-
- It returns the number of files successfully deleted. Symlinks are
- simply deleted and not followed.
-
--B<NOTE:> If the third parameter is not TRUE, C<rmtree> is B<unsecure>
--in the face of failure or interruption. Files and directories which
--were not deleted may be left with permissions reset to allow world
--read and write access. Note also that the occurrence of errors in
--rmtree can be determined I<only> by trapping diagnostic messages
--using C<$SIG{__WARN__}>; it is not apparent from the return value.
--Therefore, you must be extremely careful about using C<rmtree($foo,$bar,0)>
--in situations where security is an issue.
--
- =head1 DIAGNOSTICS
-
- =over 4
-@@ -118,6 +108,7 @@
- use Exporter ();
- use strict;
- use warnings;
-+use Cwd 'getcwd';
-
- our $VERSION = "1.06";
- our @ISA = qw( Exporter );
-@@ -166,111 +157,133 @@
- @created;
- }
-
--sub rmtree {
-- my($roots, $verbose, $safe) = @_;
-- my(@files);
-- my($count) = 0;
-- $verbose ||= 0;
-- $safe ||= 0;
--
-- if ( defined($roots) && length($roots) ) {
-- $roots = [$roots] unless ref $roots;
-- }
-- else {
-- carp "No root path(s) specified\n";
-- return 0;
-- }
--
-- my($root);
-- foreach $root (@{$roots}) {
-- if ($Is_MacOS) {
-- $root = ":$root" if $root !~ /:/;
-- $root =~ s#([^:])\z#$1:#;
-- } else {
-- $root =~ s#/\z##;
-+sub _rmtree;
-+sub _rmtree
-+{
-+ my ($path, $prefix, $up, $up_dev, $up_ino, $verbose, $safe) = @_;
-+
-+ my ($dev, $ino) = lstat $path or do {
-+ carp "Can't stat $prefix$path ($!)" unless $!{ENOENT};
-+ return 0;
-+ };
-+
-+ unless (-d _)
-+ {
-+ print "unlink $prefix$path\n" if $verbose;
-+ unless (unlink $path)
-+ {
-+ carp "Can't remove file $prefix$path ($!)";
-+ return 0;
- }
-- (undef, undef, my $rp) = lstat $root or next;
-- $rp &= 07777; # don't forget setuid, setgid, sticky bits
-- if ( -d _ ) {
-- # notabene: 0777 is for making readable in the first place,
-- # it's also intended to change it to writable in case we have
-- # to recurse in which case we are better than rm -rf for
-- # subtrees with strange permissions
-- chmod(0777, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
-- or carp "Can't make directory $root read+writeable: $!"
-- unless $safe;
--
-- if (opendir my $d, $root) {
-- no strict 'refs';
-- if (!defined ${"\cTAINT"} or ${"\cTAINT"}) {
-- # Blindly untaint dir names
-- @files = map { /^(.*)$/s ; $1 } readdir $d;
-- } else {
-- @files = readdir $d;
-- }
-- closedir $d;
-- }
-- else {
-- carp "Can't read $root: $!";
-- @files = ();
-- }
-
-- # Deleting large numbers of files from VMS Files-11 filesystems
-- # is faster if done in reverse ASCIIbetical order
-- @files = reverse @files if $Is_VMS;
-- ($root = VMS::Filespec::unixify($root)) =~ s#\.dir\z## if $Is_VMS;
-- if ($Is_MacOS) {
-- @files = map("$root$_", @files);
-- } else {
-- @files = map("$root/$_", grep $_!~/^\.{1,2}\z/s,@files);
-- }
-- $count += rmtree(\@files,$verbose,$safe);
-- if ($safe &&
-- ($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) {
-- print "skipped $root\n" if $verbose;
-- next;
-- }
-- chmod 0777, $root
-- or carp "Can't make directory $root writeable: $!"
-- if $force_writeable;
-- print "rmdir $root\n" if $verbose;
-- if (rmdir $root) {
-- ++$count;
-- }
-- else {
-- carp "Can't remove directory $root: $!";
-- chmod($rp, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
-- or carp("and can't restore permissions to "
-- . sprintf("0%o",$rp) . "\n");
-- }
-- }
-- else {
-- if ($safe &&
-- ($Is_VMS ? !&VMS::Filespec::candelete($root)
-- : !(-l $root || -w $root)))
-- {
-- print "skipped $root\n" if $verbose;
-- next;
-- }
-- chmod 0666, $root
-- or carp "Can't make file $root writeable: $!"
-- if $force_writeable;
-- print "unlink $root\n" if $verbose;
-- # delete all versions under VMS
-- for (;;) {
-- unless (unlink $root) {
-- carp "Can't unlink file $root: $!";
-- if ($force_writeable) {
-- chmod $rp, $root
-- or carp("and can't restore permissions to "
-- . sprintf("0%o",$rp) . "\n");
-- }
-- last;
-- }
-- ++$count;
-- last unless $Is_VMS && lstat $root;
-- }
-+ return 1;
-+ }
-+
-+ unless (chdir $path)
-+ {
-+ carp "Can't chdir to $prefix$path ($!)";
-+ return 0;
-+ }
-+
-+ # avoid a race condition where a directory may be replaced by a
-+ # symlink between the lstat and the chdir
-+ my ($new_dev, $new_ino, $perm) = stat '.';
-+ unless ("$new_dev:$new_ino" eq "$dev:$ino")
-+ {
-+ croak "Directory $prefix$path changed before chdir, aborting";
-+ }
-+
-+ $perm &= 07777;
-+ my $nperm = $perm | 0700;
-+ unless ($safe or $nperm == $perm or chmod $nperm, '.')
-+ {
-+ carp "Can't make directory $prefix$path read+writeable ($!)";
-+ $nperm = $perm;
-+ }
-+
-+ my $count = 0;
-+ if (opendir my $dir, '.')
-+ {
-+ my $entry;
-+ while (defined ($entry = readdir $dir))
-+ {
-+ next if $entry =~ /^\.\.?$/;
-+ $entry =~ /^(.*)$/s; $entry = $1; # untaint
-+ $count += _rmtree $entry, "$prefix$path/", '..', $dev, $ino,
-+ $verbose, $safe;
- }
-+
-+ closedir $dir;
-+ }
-+
-+ # restore directory permissions if required (in case the rmdir
-+ # below fails) now, while we're still in the directory and may do
-+ # so without a race via '.'
-+ unless ($nperm == $perm or chmod $perm, '.')
-+ {
-+ carp "Can't restore permissions on directory $prefix$path ($!)";
-+ }
-+
-+ # don't leave the caller in an unexpected directory
-+ unless (chdir $up)
-+ {
-+ croak "Can't return to $up from $prefix$path ($!)";
-+ }
-+
-+ # ensure that a chdir .. didn't take us somewhere other than
-+ # where we expected (see CVE-2002-0435)
-+ unless (($new_dev, $new_ino) = stat '.'
-+ and "$new_dev:$new_ino" eq "$up_dev:$up_ino")
-+ {
-+ croak "Previous directory $up changed since entering $prefix$path";
-+ }
-+
-+ print "rmdir $prefix$path\n" if $verbose;
-+ if (rmdir $path)
-+ {
-+ $count++;
-+ }
-+ else
-+ {
-+ carp "Can't remove directory $prefix$path ($!)";
-+ }
-+
-+ return $count;
-+}
-+
-+sub rmtree
-+{
-+ my ($p, $verbose, $safe) = @_;
-+ $p = [] unless defined $p and length $p;
-+ $p = [ $p ] unless ref $p;
-+ my @paths = grep defined && length, @$p;
-+
-+ # default to "unsafe" for non-root (will chmod dirs)
-+ $safe = $> ? 0 : 1 unless defined $safe;
-+
-+ unless (@paths)
-+ {
-+ carp "No root path(s) specified";
-+ return;
-+ }
-+
-+ my $oldpwd = getcwd or do {
-+ carp "Can't fetch initial working directory";
-+ return;
-+ };
-+
-+ my ($dev, $ino) = stat '.' or do {
-+ carp "Can't stat initial working directory";
-+ return;
-+ };
-+
-+ # untaint
-+ for ($oldpwd) { /^(.*)$/s; $_ = $1 }
-+
-+ my $count = 0;
-+ for my $path (@paths)
-+ {
-+ $count += _rmtree $path, '', $oldpwd, $dev, $ino, $verbose, $safe;
- }
-
- $count;
diff --git a/dev-lang/perl/files/file_path_rmtree.patch b/dev-lang/perl/files/file_path_rmtree.patch
deleted file mode 100644
index 2518ddefe686..000000000000
--- a/dev-lang/perl/files/file_path_rmtree.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/File/Path.pm 2003-08-14 02:00:52.000000000 -0400
-+++ lib/File/Path.pm.chmod 2005-01-26 06:20:44.228146880 -0500
-@@ -196,7 +196,7 @@ sub rmtree {
- # it's also intended to change it to writable in case we have
- # to recurse in which case we are better than rm -rf for
- # subtrees with strange permissions
-- chmod(0777, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
-+ chmod(0700, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
- or carp "Can't make directory $root read+writeable: $!"
- unless $safe;
-
-@@ -230,7 +230,7 @@ sub rmtree {
- print "skipped $root\n" if $verbose;
- next;
- }
-- chmod 0777, $root
-+ chmod 0700, $root
- or carp "Can't make directory $root writeable: $!"
- if $force_writeable;
- print "rmdir $root\n" if $verbose;
-@@ -252,7 +252,7 @@ sub rmtree {
- print "skipped $root\n" if $verbose;
- next;
- }
-- chmod 0666, $root
-+ chmod 0600, $root
- or carp "Can't make file $root writeable: $!"
- if $force_writeable;
- print "unlink $root\n" if $verbose;
diff --git a/dev-lang/perl/files/perl-5.8.4-NDBM-GDBM-compat.patch b/dev-lang/perl/files/perl-5.8.4-NDBM-GDBM-compat.patch
deleted file mode 100644
index 7973e097e962..000000000000
--- a/dev-lang/perl/files/perl-5.8.4-NDBM-GDBM-compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ext/NDBM_File/hints/linux.pl 2001-07-02 20:22:18 +0000
-+++ ext/NDBM_File/hints/linux.pl 2004-05-21 22:05:18 +0000
-@@ -3,4 +3,6 @@
- # (no null key support)
- # Jonathan Stowe <gellyfish@gellyfish.com>
- use Config;
--$self->{LIBS} = ['-lgdbm'] if $Config{libs} =~ /(?:^|\s)-lgdbm(?:\s|$)/;
-+use ExtUtils::Liblist;
-+($self->{LIBS}) = ExtUtils::Liblist->ext('-lgdbm -lgdbm_compat')
-+ if $Config{libs} =~ /(?:^|\s)-lgdbm(?:\s|$)/;
diff --git a/dev-lang/perl/files/perl-5.8.5-tempfiles.patch b/dev-lang/perl/files/perl-5.8.5-tempfiles.patch
deleted file mode 100644
index be0d64effe09..000000000000
--- a/dev-lang/perl/files/perl-5.8.5-tempfiles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur perl-5.8.5.orig/lib/ExtUtils/instmodsh perl-5.8.5/lib/ExtUtils/instmodsh
---- perl-5.8.5.orig/lib/ExtUtils/instmodsh Tue Sep 30 17:10:47 2003
-+++ perl-5.8.5/lib/ExtUtils/instmodsh Mon Jan 19 20:14:11 2004
-@@ -2,6 +2,7 @@
-
- use strict;
- use IO::File;
-+use File::Temp;
- use ExtUtils::Packlist;
- use ExtUtils::Installed;
-
-@@ -58,16 +59,12 @@
- $reply =~ /^t\s*/ and do
- {
- my $file = (split(' ', $reply))[1];
-- my $tmp = "/tmp/inst.$$";
-- if (my $fh = IO::File->new($tmp, "w"))
-- {
-- $fh->print(join("\n", $Inst->files($module)));
-- $fh->close();
-- system("tar cvf $file -I $tmp");
-- unlink($tmp);
-- last CASE;
-- }
-- else { print("Can't open $file: $!\n"); }
-+ my ($fh, $tmp) = File::Temp::tempfile(UNLINK => 1);
-+ $fh->print(join("\n", $Inst->files($module)));
-+ $fh->close();
-+ # This used to use -I which is wrong for GNU tar.
-+ system("tar cvf $file -T $tmp");
-+ unlink($tmp);
- last CASE;
- };
- $reply eq 'v' and do
-
-diff -ur perl-5.8.5.orig/lib/perl5db.pl perl-5.8.5/lib/perl5db.pl
---- perl-5.8.5.orig/lib/perl5db.pl Mon Jan 19 18:46:25 2004
-+++ perl-5.8.5/lib/perl5db.pl Mon Jan 19 20:14:11 2004
-@@ -206,7 +206,7 @@
- =item * noTTY
-
- if set, goes in NonStop mode. On interrupt, if TTY is not set,
--uses the value of noTTY or "/tmp/perldbtty$$" to find TTY using
-+uses the value of noTTY or "/var/run/perldbtty$$" to find TTY using
- Term::Rendezvous. Current variant is to have the name of TTY in this
- file.
-
-@@ -5689,8 +5689,8 @@
- else {
- eval "require Term::Rendezvous;" or die;
- # See if we have anything to pass to Term::Rendezvous.
-- # Use /tmp/perldbtty$$ if not.
-- my $rv = $ENV{PERLDB_NOTTY} || "/tmp/perldbtty$$";
-+ # Use /var/run/perldbtty$$ if not.
-+ my $rv = $ENV{PERLDB_NOTTY} || "/var/run/perldbtty$$";
-
- # Rendezvous and get the filehandles.
- my $term_rv = new Term::Rendezvous $rv;
-
-
diff --git a/dev-lang/perl/files/perl-5.8.6-tempfiles.patch b/dev-lang/perl/files/perl-5.8.6-tempfiles.patch
deleted file mode 100644
index a9dab03e2979..000000000000
--- a/dev-lang/perl/files/perl-5.8.6-tempfiles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur perl-5.8.6.orig/lib/ExtUtils/instmodsh perl-5.8.6/lib/ExtUtils/instmodsh
---- perl-5.8.6.orig/lib/ExtUtils/instmodsh Tue Sep 30 17:10:47 2003
-+++ perl-5.8.6/lib/ExtUtils/instmodsh Mon Jan 19 20:14:11 2004
-@@ -2,6 +2,7 @@
-
- use strict;
- use IO::File;
-+use File::Temp;
- use ExtUtils::Packlist;
- use ExtUtils::Installed;
-
-@@ -58,16 +59,12 @@
- $reply =~ /^t\s*/ and do
- {
- my $file = (split(' ', $reply))[1];
-- my $tmp = "/tmp/inst.$$";
-- if (my $fh = IO::File->new($tmp, "w"))
-- {
-- $fh->print(join("\n", $Inst->files($module)));
-- $fh->close();
-- system("tar cvf $file -I $tmp");
-- unlink($tmp);
-- last CASE;
-- }
-- else { print("Can't open $file: $!\n"); }
-+ my ($fh, $tmp) = File::Temp::tempfile(UNLINK => 1);
-+ $fh->print(join("\n", $Inst->files($module)));
-+ $fh->close();
-+ # This used to use -I which is wrong for GNU tar.
-+ system("tar cvf $file -T $tmp");
-+ unlink($tmp);
- last CASE;
- };
- $reply eq 'v' and do
-
-diff -ur perl-5.8.6.orig/lib/perl5db.pl perl-5.8.6/lib/perl5db.pl
---- perl-5.8.6.orig/lib/perl5db.pl Mon Jan 19 18:46:25 2004
-+++ perl-5.8.6/lib/perl5db.pl Mon Jan 19 20:14:11 2004
-@@ -206,7 +206,7 @@
- =item * noTTY
-
- if set, goes in NonStop mode. On interrupt, if TTY is not set,
--uses the value of noTTY or F</tmp/perldbtty$$> to find TTY using
-+uses the value of noTTY or F</var/run/perldbtty$$> to find TTY using
- Term::Rendezvous. Current variant is to have the name of TTY in this
- file.
-
-@@ -5689,8 +5689,8 @@
- else {
- eval "require Term::Rendezvous;" or die;
- # See if we have anything to pass to Term::Rendezvous.
-- # Use /tmp/perldbtty$$ if not.
-- my $rv = $ENV{PERLDB_NOTTY} || "/tmp/perldbtty$$";
-+ # Use /var/run/perldbtty$$ if not.
-+ my $rv = $ENV{PERLDB_NOTTY} || "/var/run/perldbtty$$";
-
- # Rendezvous and get the filehandles.
- my $term_rv = new Term::Rendezvous $rv;
-
-
diff --git a/dev-lang/perl/files/perl-tempfiles.patch b/dev-lang/perl/files/perl-tempfiles.patch
deleted file mode 100644
index b229d6c0ca25..000000000000
--- a/dev-lang/perl/files/perl-tempfiles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur lib/ExtUtils/instmodsh.old lib/ExtUtils/instmodsh
---- lib/ExtUtils/instmodsh.old Tue Sep 30 17:10:47 2003
-+++ lib/ExtUtils/instmodsh Mon Jan 19 20:14:11 2004
-@@ -2,6 +2,7 @@
-
- use strict;
- use IO::File;
-+use File::Temp;
- use ExtUtils::Packlist;
- use ExtUtils::Installed;
-
-@@ -58,16 +59,12 @@
- $reply =~ /^t\s*/ and do
- {
- my $file = (split(' ', $reply))[1];
-- my $tmp = "/tmp/inst.$$";
-- if (my $fh = IO::File->new($tmp, "w"))
-- {
-- $fh->print(join("\n", $Inst->files($module)));
-- $fh->close();
-- system("tar cvf $file -I $tmp");
-- unlink($tmp);
-- last CASE;
-- }
-- else { print("Can't open $file: $!\n"); }
-+ my ($fh, $tmp) = File::Temp::tempfile(UNLINK => 1);
-+ $fh->print(join("\n", $Inst->files($module)));
-+ $fh->close();
-+ # This used to use -I which is wrong for GNU tar.
-+ system("tar cvf $file -T $tmp");
-+ unlink($tmp);
- last CASE;
- };
- $reply eq 'v' and do
-
-diff -ur lib/perl5db.pl.old lib/perl5db.pl
---- lib/perl5db.pl.old Mon Jan 19 18:46:25 2004
-+++ lib/perl5db.pl Mon Jan 19 20:14:11 2004
-@@ -206,7 +206,7 @@
- =item * noTTY
-
- if set, goes in NonStop mode. On interrupt, if TTY is not set,
--uses the value of noTTY or F</tmp/perldbtty$$> to find TTY using
-+uses the value of noTTY or F</var/run/perldbtty$$> to find TTY using
- Term::Rendezvous. Current variant is to have the name of TTY in this
- file.
-
-@@ -5689,8 +5689,8 @@
- else {
- eval "require Term::Rendezvous;" or die;
- # See if we have anything to pass to Term::Rendezvous.
-- # Use /tmp/perldbtty$$ if not.
-- my $rv = $ENV{PERLDB_NOTTY} || "/tmp/perldbtty$$";
-+ # Use /var/run/perldbtty$$ if not.
-+ my $rv = $ENV{PERLDB_NOTTY} || "/var/run/perldbtty$$";
-
- # Rendezvous and get the filehandles.
- my $term_rv = new Term::Rendezvous $rv;
-
-
diff --git a/dev-lang/perl/files/perl-uclibc.patch b/dev-lang/perl/files/perl-uclibc.patch
deleted file mode 100644
index 1e086d73879a..000000000000
--- a/dev-lang/perl/files/perl-uclibc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- perl-5.8.2/perlio.c-dist 2003-12-03 14:30:24.000000000 -0700
-+++ perl-5.8.2/perlio.c 2003-12-03 14:32:10.000000000 -0700
-@@ -2824,7 +2824,11 @@
- /* XXX this could use PerlIO_canset_fileno() and
- * PerlIO_set_fileno() support from Configure
- */
--# if defined(__GLIBC__)
-+# if defined(__UCLIBC__)
-+ /* uClibc must come before glibc because it defines __GLIBC__ as well. */
-+ f->__filedes = -1;
-+ return 1;
-+# elif defined(__GLIBC__)
- /* There may be a better way for GLIBC:
- - libio.h defines a flag to not close() on cleanup
- */