X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirfd.c;h=c285370d366ba8782c96126ad5bd42be915ef429;hb=f5e328c1b9481fedbe4134404155b1c89d0aeded;hp=e234063534a5ab6309db70a0c10a391bd86848b5;hpb=95a83f76834ef43456cfb0f558c6761dcd73d9b7;p=gnulib.git

diff --git a/lib/dirfd.c b/lib/dirfd.c
index e23406353..c285370d3 100644
--- a/lib/dirfd.c
+++ b/lib/dirfd.c
@@ -1,10 +1,11 @@
 /* dirfd.c -- return the file descriptor associated with an open DIR*
-   Copyright (C) 2001 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 2001, 2006, 2008-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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,19 +13,20 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering. */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
-#include "dirfd.h"
+#include <dirent.h>
+#include <errno.h>
 
 int
-dirfd (DIR const *dir_p)
+dirfd (DIR *dir_p)
 {
-  return DIR_TO_FD;
+  int fd = DIR_TO_FD (dir_p);
+  if (fd == -1)
+    errno = ENOTSUP;
+  return fd;
 }