X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdirfd.c;h=8272e132d44dc27a9eee06b94d0519a505f17c0b;hb=43593319b31e6b0175b8eec4433bac744959822d;hp=29761bf72f1ae0aa257bf7fcc70cedee283f5f83;hpb=25788a5e0dcc4c2aea947c621d5f3a93b28ca330;p=gnulib.git
diff --git a/lib/dirfd.c b/lib/dirfd.c
index 29761bf72..8272e132d 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-2013 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 . */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
-#include "dirfd.h"
+#include
+#include
int
-dirfd (DIR const *dir_p)
+dirfd (DIR *dir_p)
{
- return DIR_TO_FD (dir_p);
+ int fd = DIR_TO_FD (dir_p);
+ if (fd == -1)
+ errno = ENOTSUP;
+ return fd;
}