summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/fd-reopen.c8
-rwxr-xr-xtests/dd/misc7
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/fd-reopen.c b/lib/fd-reopen.c
index 2ce467873..c12fef602 100644
--- a/lib/fd-reopen.c
+++ b/lib/fd-reopen.c
@@ -1,6 +1,6 @@
/* Invoke open, but return either a desired file descriptor or -1.
- Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2008 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
@@ -31,15 +31,13 @@
int
fd_reopen (int desired_fd, char const *file, int flags, mode_t mode)
{
- int fd;
+ int fd = open (file, flags, mode);
- close (desired_fd);
- fd = open (file, flags, mode);
if (fd == desired_fd || fd < 0)
return fd;
else
{
- int fd2 = fcntl (fd, F_DUPFD, desired_fd);
+ int fd2 = dup2 (fd, desired_fd);
int saved_errno = errno;
close (fd);
errno = saved_errno;
diff --git a/tests/dd/misc b/tests/dd/misc
index 917258236..2b54cfb36 100755
--- a/tests/dd/misc
+++ b/tests/dd/misc
@@ -46,6 +46,13 @@ if dd oflag=append if=$tmp_in of=$tmp_out 2> /dev/null; then
compare $tmp_in $tmp_out || fail=1
fi
+case $(cat /dev/stdin <$tmp_in 2>/dev/null) in
+(data)
+ rm -f $tmp_out
+ dd if=/dev/stdin of=$tmp_out <$tmp_in || fail=1
+ compare $tmp_in $tmp_out || fail=1
+esac
+
if dd iflag=nofollow if=$tmp_in count=0 2> /dev/null; then
dd iflag=nofollow if=$tmp_sym count=0 2> /dev/null && fail=1
fi