From e373bb193357481573913ccf28dc14675f172d5a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 31 Mar 2008 08:37:36 +0200 Subject: dd bug fix: accept e.g., if=/dev/stdin and of=/dev/stdout * lib/fd-reopen.c: Work even if FILE is "/dev/stdin". Problem reported by Geoffrey Lee in . * tests/dd/misc: Check for this bug. --- lib/fd-reopen.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/fd-reopen.c') 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; -- cgit v1.2.3-54-g00ecf