X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frename.c;h=44821c94fc18e73977276317ed8baaff51c1b5ba;hb=c89f48f01f6047b50c1ed3c981901f620ec98f6a;hp=cd291b4905c70914891c8bfa0ebe46226d8aea3c;hpb=68eb0d909e6de636f9af9a621e34eeaafa5fbac9;p=gnulib.git

diff --git a/lib/rename.c b/lib/rename.c
index cd291b490..44821c94f 100644
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -16,35 +16,24 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef HAVE_CONFIG_H
-#if defined (CONFIG_BROKETS)
-/* We use <config.h> instead of "config.h" so that a compilation
-   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
-   (which it would do because it found this file in $srcdir).  */
 #include <config.h>
-#else
-#include "config.h"
-#endif
 #endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#ifndef STDC_HEADERS
+#ifndef errno
 extern int errno;
 #endif
 
-#ifdef	STAT_MACROS_BROKEN
-#ifdef S_ISDIR
+#ifdef STAT_MACROS_BROKEN
 #undef S_ISDIR
-#endif
-#endif	/* STAT_MACROS_BROKEN.  */
+#endif /* STAT_MACROS_BROKEN.  */
 
 #if !defined(S_ISDIR) && defined(S_IFDIR)
 #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
-#include "safe-stat.h"
-
 /* Rename file FROM to file TO.
    Return 0 if successful, -1 if not. */
 
@@ -56,13 +45,13 @@ rename (from, to)
   struct stat from_stats, to_stats;
   int pid, status;
 
-  if (SAFE_STAT (from, &from_stats))
+  if (stat (from, &from_stats))
     return -1;
 
   /* Be careful not to unlink `from' if it happens to be equal to `to' or
      (on filesystems that silently truncate filenames after 14 characters)
      if `from' and `to' share the significant characters. */
-  if (SAFE_STAT (to, &to_stats))
+  if (stat (to, &to_stats))
     {
       if (errno != ENOENT)
         return -1;
@@ -70,7 +59,7 @@ rename (from, to)
   else
     {
       if ((from_stats.st_dev == to_stats.st_dev)
-          && (from_stats.st_ino == to_stats.st_dev))
+          && (from_stats.st_ino == to_stats.st_ino))
         /* `from' and `to' designate the same file on that filesystem. */
         return 0;