projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
autoupdates
[gnulib.git]
/
lib
/
dup-safer.c
diff --git
a/lib/dup-safer.c
b/lib/dup-safer.c
index
a690851
..
33f599b
100644
(file)
--- a/
lib/dup-safer.c
+++ b/
lib/dup-safer.c
@@
-1,6
+1,6
@@
/* Invoke dup, but avoid some glitches.
/* Invoke dup, but avoid some glitches.
- Copyright (C) 2001, 2004
, 2005, 2006
Free Software Foundation, Inc.
+ Copyright (C) 2001, 2004
-2006, 2009-2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-22,11
+22,7
@@
#include "unistd-safer.h"
#include <fcntl.h>
#include "unistd-safer.h"
#include <fcntl.h>
-
#include <unistd.h>
#include <unistd.h>
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
/* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
STDERR_FILENO. */
/* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
STDERR_FILENO. */
@@
-34,11
+30,5
@@
int
dup_safer (int fd)
{
int
dup_safer (int fd)
{
-#if defined F_DUPFD && !defined FCHDIR_REPLACEMENT
return fcntl (fd, F_DUPFD, STDERR_FILENO + 1);
return fcntl (fd, F_DUPFD, STDERR_FILENO + 1);
-#else
- /* fd_safer calls us back, but eventually the recursion unwinds and
- does the right thing. */
- return fd_safer (dup (fd));
-#endif
}
}