mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-11-28 12:35:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

dd bug fix: accept e.g., if=/dev/stdin and of=/dev/stdout

Browse Source 
* lib/fd-reopen.c: Work even if FILE is "/dev/stdin".
Problem reported by Geoffrey Lee in <http://bugs.debian.org/290727>.
* tests/dd/misc: Check for this bug.
This commit is contained in:
Paul Eggert 2008-03-31 08:37:36 +02:00 committed by Jim Meyering
parent 72e962c97e
commit e373bb1933
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fd-reopen.c
View File

@ -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;

7
tests/dd/misc
View File

@ -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