2002-12-06 Andrew Cagney <ac131313@redhat.com>

[deliverable/binutils-gdb.git] / binutils / rename.c

diff --git a/binutils/rename.c b/binutils/rename.c
index fdc7263d1fc7fc5ffe6a1a71be12484b7a3c7976..0ccaedc96383b61d9a9754368c117b0f8418a807 100644 (file)
--- a/binutils/rename.c
+++ b/binutils/rename.c
@@ -1,5 +1,5 @@
 /* rename.c -- rename a file, preserving symlinks.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright 1999, 2002 Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
 
@@ -31,7 +31,14 @@
 #endif /* HAVE_UTIMES */
 #endif /* ! HAVE_GOOD_UTIME_H */
 
-static int simple_copy PARAMS ((const char *, const char *));
+/* We need to open the file in binary modes on system where that makes
+   a difference.  */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+static int simple_copy
+  PARAMS ((const char *, const char *));
 
 /* The number of bytes to copy at once.  */
 #define COPY_BUF 8192
@@ -48,10 +55,14 @@ simple_copy (from, to)
   int saved;
   char buf[COPY_BUF];
 
-  fromfd = open (from, O_RDONLY);
+  fromfd = open (from, O_RDONLY | O_BINARY);
   if (fromfd < 0)
     return -1;
+#ifdef O_CREAT
+  tofd = open (to, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0777);
+#else
   tofd = creat (to, 0777);
+#endif
   if (tofd < 0)
     {
       saved = errno;
@@ -139,31 +150,31 @@ smart_rename (from, to, preserve_dates)
      const char *to;
      int preserve_dates;
 {
-  int exists;
+  bfd_boolean exists;
   struct stat s;
   int ret = 0;
 
-  exists = lstat (to, &s);
+  exists = lstat (to, &s) == 0;
 
 #if defined (_WIN32) && !defined (__CYGWIN32__)
   /* Win32, unlike unix, will not erase `to' in `rename(from, to)' but
      fail instead.  Also, chown is not present.  */
 
-  if (exists == 0)
+  if (exists)
     remove (to);
 
   ret = rename (from, to);
   if (ret != 0)
     {
-      /* We have to clean up here. */
-      
+      /* We have to clean up here.  */
+
       non_fatal (_("%s: rename: %s"), to, strerror (errno));
       unlink (from);
     }
 #else
   /* Use rename only if TO is not a symbolic link and has
      only one hard link.  */
-  if (exists < 0 || (!S_ISLNK (s.st_mode) && s.st_nlink == 1))
+  if (! exists || (!S_ISLNK (s.st_mode) && s.st_nlink == 1))
     {
       ret = rename (from, to);
       if (ret == 0)
@@ -189,7 +200,7 @@ smart_rename (from, to, preserve_dates)
        }
       else
        {
-         /* We have to clean up here. */
+         /* We have to clean up here.  */
          non_fatal (_("%s: rename: %s"), to, strerror (errno));
          unlink (from);
        }