X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fchown.c;h=3582b04d67d720930cebb3cc35d598e94bdbc2d0;hb=1f90f54e377196656bb9adc0655f0a830eac7d8a;hp=5c8b32e0272fd8b3749790fe3b0caff7d065c6dd;hpb=0632e115747ff96e93330c88f536d7354a7ce507;p=gnulib.git

diff --git a/lib/chown.c b/lib/chown.c
index 5c8b32e02..3582b04d6 100644
--- a/lib/chown.c
+++ b/lib/chown.c
@@ -1,12 +1,12 @@
 /* provide consistent interface to chown for systems that don't interpret
    an ID of -1 as meaning `don't change the corresponding ID'.
 
-   Copyright (C) 1997, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
@@ -14,26 +14,28 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* written by Jim Meyering */
 
 #include <config.h>
 
-/* Disable the definition of chown to rpl_chown (from config.h) in this
-   file.  Otherwise, we'd get conflicting prototypes for rpl_chown on
-   most systems.  */
-#undef chown
+/* Specification.  */
+#include <unistd.h>
 
 #include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
-#include "stat-macros.h"
+/* Below we refer to the system's chown().  */
+#undef chown
+
+/* The results of open() in this file are not used with fchdir,
+   therefore save some unnecessary work in fchdir.c.  */
+#undef open
+#undef close
 
 /* Provide a more-closely POSIX-conforming version of chown on
    systems with one or both of the following problems: